aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--COPYING-README2
-rw-r--r--apps/files/ajax/download.php4
-rw-r--r--apps/files/ajax/list.php2
-rw-r--r--apps/files/ajax/newfile.php35
-rw-r--r--apps/files/ajax/rename.php2
-rw-r--r--apps/files/appinfo/app.php16
-rw-r--r--apps/files/appinfo/routes.php2
-rw-r--r--apps/files/css/files.css28
-rw-r--r--apps/files/index.php1
-rw-r--r--apps/files/js/file-upload.js623
-rw-r--r--apps/files/js/fileactions.js14
-rw-r--r--apps/files/js/filelist.js15
-rw-r--r--apps/files/js/files.js30
-rw-r--r--apps/files/js/keyboardshortcuts.js6
-rw-r--r--apps/files/l10n/ar.php15
-rw-r--r--apps/files/l10n/bg_BG.php13
-rw-r--r--apps/files/l10n/bn_BD.php14
-rw-r--r--apps/files/l10n/ca.php16
-rw-r--r--apps/files/l10n/cs_CZ.php16
-rw-r--r--apps/files/l10n/cy_GB.php15
-rw-r--r--apps/files/l10n/da.php16
-rw-r--r--apps/files/l10n/de.php16
-rw-r--r--apps/files/l10n/de_DE.php16
-rw-r--r--apps/files/l10n/el.php15
-rw-r--r--apps/files/l10n/en@pirate.php7
-rw-r--r--apps/files/l10n/eo.php15
-rw-r--r--apps/files/l10n/es.php15
-rw-r--r--apps/files/l10n/es_AR.php15
-rw-r--r--apps/files/l10n/et_EE.php16
-rw-r--r--apps/files/l10n/eu.php15
-rw-r--r--apps/files/l10n/fa.php15
-rw-r--r--apps/files/l10n/fi.php4
-rw-r--r--apps/files/l10n/fi_FI.php14
-rw-r--r--apps/files/l10n/fr.php15
-rw-r--r--apps/files/l10n/gl.php16
-rw-r--r--apps/files/l10n/he.php15
-rw-r--r--apps/files/l10n/hi.php7
-rw-r--r--apps/files/l10n/hr.php10
-rw-r--r--apps/files/l10n/hu_HU.php15
-rw-r--r--apps/files/l10n/hy.php11
-rw-r--r--apps/files/l10n/ia.php9
-rw-r--r--apps/files/l10n/id.php15
-rw-r--r--apps/files/l10n/is.php14
-rw-r--r--apps/files/l10n/it.php15
-rw-r--r--apps/files/l10n/ja_JP.php16
-rw-r--r--apps/files/l10n/ka.php7
-rw-r--r--apps/files/l10n/ka_GE.php15
-rw-r--r--apps/files/l10n/ko.php15
-rw-r--r--apps/files/l10n/ku_IQ.php7
-rw-r--r--apps/files/l10n/lb.php9
-rw-r--r--apps/files/l10n/lt_LT.php15
-rw-r--r--apps/files/l10n/lv.php22
-rw-r--r--apps/files/l10n/mk.php14
-rw-r--r--apps/files/l10n/ms_MY.php9
-rw-r--r--apps/files/l10n/my_MM.php7
-rw-r--r--apps/files/l10n/nb_NO.php25
-rw-r--r--apps/files/l10n/nl.php16
-rw-r--r--apps/files/l10n/nn_NO.php15
-rw-r--r--apps/files/l10n/oc.php10
-rw-r--r--apps/files/l10n/pl.php15
-rw-r--r--apps/files/l10n/pl_PL.php4
-rw-r--r--apps/files/l10n/pt_BR.php15
-rw-r--r--apps/files/l10n/pt_PT.php15
-rw-r--r--apps/files/l10n/ro.php15
-rw-r--r--apps/files/l10n/ru.php15
-rw-r--r--apps/files/l10n/ru_RU.php16
-rw-r--r--apps/files/l10n/si_LK.php12
-rw-r--r--apps/files/l10n/sk_SK.php16
-rw-r--r--apps/files/l10n/sl.php15
-rw-r--r--apps/files/l10n/sq.php15
-rw-r--r--apps/files/l10n/sr.php15
-rw-r--r--apps/files/l10n/sr@latin.php9
-rw-r--r--apps/files/l10n/sv.php16
-rw-r--r--apps/files/l10n/ta_LK.php14
-rw-r--r--apps/files/l10n/te.php11
-rw-r--r--apps/files/l10n/th_TH.php15
-rw-r--r--apps/files/l10n/tr.php15
-rw-r--r--apps/files/l10n/ug.php13
-rw-r--r--apps/files/l10n/uk.php18
-rw-r--r--apps/files/l10n/ur_PK.php7
-rw-r--r--apps/files/l10n/vi.php15
-rw-r--r--apps/files/l10n/zh_CN.GB2312.php15
-rw-r--r--apps/files/l10n/zh_CN.php15
-rw-r--r--apps/files/l10n/zh_HK.php12
-rw-r--r--apps/files/l10n/zh_TW.php15
-rw-r--r--apps/files/lib/app.php2
-rw-r--r--apps/files/lib/capabilities.php2
-rw-r--r--apps/files/templates/index.php1
-rw-r--r--apps/files/tests/ajax_rename.php2
-rw-r--r--apps/files_encryption/ajax/changeRecoveryPassword.php2
-rw-r--r--apps/files_encryption/ajax/updatePrivateKeyPassword.php2
-rw-r--r--apps/files_encryption/ajax/userrecovery.php2
-rw-r--r--apps/files_encryption/appinfo/routes.php2
-rw-r--r--apps/files_encryption/css/settings-personal.css2
-rw-r--r--apps/files_encryption/files/error.php2
-rw-r--r--apps/files_encryption/hooks/hooks.php20
-rw-r--r--apps/files_encryption/js/settings-admin.js2
-rw-r--r--apps/files_encryption/js/settings-personal.js2
-rw-r--r--apps/files_encryption/l10n/ar.php4
-rw-r--r--apps/files_encryption/l10n/bg_BG.php4
-rw-r--r--apps/files_encryption/l10n/bn_BD.php4
-rw-r--r--apps/files_encryption/l10n/ca.php7
-rw-r--r--apps/files_encryption/l10n/cs_CZ.php6
-rw-r--r--apps/files_encryption/l10n/cy_GB.php4
-rw-r--r--apps/files_encryption/l10n/da.php7
-rw-r--r--apps/files_encryption/l10n/de.php6
-rw-r--r--apps/files_encryption/l10n/de_DE.php6
-rw-r--r--apps/files_encryption/l10n/el.php4
-rw-r--r--apps/files_encryption/l10n/eo.php4
-rw-r--r--apps/files_encryption/l10n/es.php5
-rw-r--r--apps/files_encryption/l10n/es_AR.php5
-rw-r--r--apps/files_encryption/l10n/et_EE.php7
-rw-r--r--apps/files_encryption/l10n/eu.php5
-rw-r--r--apps/files_encryption/l10n/fa.php5
-rw-r--r--apps/files_encryption/l10n/fi_FI.php4
-rw-r--r--apps/files_encryption/l10n/fr.php5
-rw-r--r--apps/files_encryption/l10n/gl.php6
-rw-r--r--apps/files_encryption/l10n/he.php4
-rw-r--r--apps/files_encryption/l10n/hr.php4
-rw-r--r--apps/files_encryption/l10n/hu_HU.php4
-rw-r--r--apps/files_encryption/l10n/id.php4
-rw-r--r--apps/files_encryption/l10n/is.php4
-rw-r--r--apps/files_encryption/l10n/it.php6
-rw-r--r--apps/files_encryption/l10n/ja_JP.php7
-rw-r--r--apps/files_encryption/l10n/ka_GE.php4
-rw-r--r--apps/files_encryption/l10n/ko.php4
-rw-r--r--apps/files_encryption/l10n/ku_IQ.php4
-rw-r--r--apps/files_encryption/l10n/lb.php4
-rw-r--r--apps/files_encryption/l10n/lt_LT.php4
-rw-r--r--apps/files_encryption/l10n/lv.php4
-rw-r--r--apps/files_encryption/l10n/mk.php4
-rw-r--r--apps/files_encryption/l10n/ms_MY.php4
-rw-r--r--apps/files_encryption/l10n/nb_NO.php4
-rw-r--r--apps/files_encryption/l10n/nl.php7
-rw-r--r--apps/files_encryption/l10n/nn_NO.php4
-rw-r--r--apps/files_encryption/l10n/oc.php4
-rw-r--r--apps/files_encryption/l10n/pl.php8
-rw-r--r--apps/files_encryption/l10n/pt_BR.php6
-rw-r--r--apps/files_encryption/l10n/pt_PT.php5
-rw-r--r--apps/files_encryption/l10n/ro.php4
-rw-r--r--apps/files_encryption/l10n/ru.php7
-rw-r--r--apps/files_encryption/l10n/ru_RU.php3
-rw-r--r--apps/files_encryption/l10n/si_LK.php4
-rw-r--r--apps/files_encryption/l10n/sk_SK.php4
-rw-r--r--apps/files_encryption/l10n/sl.php7
-rw-r--r--apps/files_encryption/l10n/sr.php4
-rw-r--r--apps/files_encryption/l10n/sv.php6
-rw-r--r--apps/files_encryption/l10n/ta_LK.php4
-rw-r--r--apps/files_encryption/l10n/th_TH.php4
-rw-r--r--apps/files_encryption/l10n/tr.php4
-rw-r--r--apps/files_encryption/l10n/ug.php4
-rw-r--r--apps/files_encryption/l10n/uk.php4
-rw-r--r--apps/files_encryption/l10n/vi.php4
-rw-r--r--apps/files_encryption/l10n/zh_CN.GB2312.php4
-rw-r--r--apps/files_encryption/l10n/zh_CN.php4
-rw-r--r--apps/files_encryption/l10n/zh_HK.php4
-rw-r--r--apps/files_encryption/l10n/zh_TW.php5
-rw-r--r--apps/files_encryption/lib/capabilities.php2
-rwxr-xr-xapps/files_encryption/lib/crypt.php123
-rwxr-xr-xapps/files_encryption/lib/helper.php42
-rwxr-xr-xapps/files_encryption/lib/keymanager.php2
-rw-r--r--apps/files_encryption/lib/proxy.php11
-rw-r--r--apps/files_encryption/lib/stream.php102
-rw-r--r--apps/files_encryption/lib/util.php374
-rw-r--r--apps/files_encryption/settings-personal.php2
-rwxr-xr-xapps/files_encryption/tests/crypt.php324
-rw-r--r--apps/files_encryption/tests/keymanager.php46
-rwxr-xr-xapps/files_encryption/tests/share.php55
-rw-r--r--apps/files_encryption/tests/stream.php18
-rwxr-xr-xapps/files_encryption/tests/trashbin.php24
-rwxr-xr-xapps/files_encryption/tests/util.php24
-rwxr-xr-xapps/files_encryption/tests/webdav.php20
-rw-r--r--apps/files_external/ajax/addMountPoint.php2
-rw-r--r--apps/files_external/ajax/google.php2
-rw-r--r--apps/files_external/js/google.js2
-rw-r--r--apps/files_external/l10n/af_ZA.php4
-rw-r--r--apps/files_external/l10n/ar.php4
-rw-r--r--apps/files_external/l10n/bg_BG.php4
-rw-r--r--apps/files_external/l10n/bn_BD.php4
-rw-r--r--apps/files_external/l10n/ca.php4
-rw-r--r--apps/files_external/l10n/cs_CZ.php4
-rw-r--r--apps/files_external/l10n/cy_GB.php4
-rw-r--r--apps/files_external/l10n/da.php4
-rw-r--r--apps/files_external/l10n/de.php4
-rw-r--r--apps/files_external/l10n/de_DE.php4
-rw-r--r--apps/files_external/l10n/el.php4
-rw-r--r--apps/files_external/l10n/eo.php4
-rw-r--r--apps/files_external/l10n/es.php4
-rw-r--r--apps/files_external/l10n/es_AR.php4
-rw-r--r--apps/files_external/l10n/et_EE.php4
-rw-r--r--apps/files_external/l10n/eu.php4
-rw-r--r--apps/files_external/l10n/fa.php4
-rw-r--r--apps/files_external/l10n/fi_FI.php4
-rw-r--r--apps/files_external/l10n/fr.php4
-rw-r--r--apps/files_external/l10n/gl.php4
-rw-r--r--apps/files_external/l10n/he.php4
-rw-r--r--apps/files_external/l10n/hi.php4
-rw-r--r--apps/files_external/l10n/hr.php4
-rw-r--r--apps/files_external/l10n/hu_HU.php4
-rw-r--r--apps/files_external/l10n/hy.php4
-rw-r--r--apps/files_external/l10n/ia.php4
-rw-r--r--apps/files_external/l10n/id.php4
-rw-r--r--apps/files_external/l10n/is.php4
-rw-r--r--apps/files_external/l10n/it.php4
-rw-r--r--apps/files_external/l10n/ja_JP.php4
-rw-r--r--apps/files_external/l10n/ka.php4
-rw-r--r--apps/files_external/l10n/ka_GE.php4
-rw-r--r--apps/files_external/l10n/ko.php4
-rw-r--r--apps/files_external/l10n/ku_IQ.php4
-rw-r--r--apps/files_external/l10n/lb.php4
-rw-r--r--apps/files_external/l10n/lt_LT.php4
-rw-r--r--apps/files_external/l10n/lv.php5
-rw-r--r--apps/files_external/l10n/mk.php4
-rw-r--r--apps/files_external/l10n/ms_MY.php4
-rw-r--r--apps/files_external/l10n/my_MM.php4
-rw-r--r--apps/files_external/l10n/nb_NO.php4
-rw-r--r--apps/files_external/l10n/nl.php4
-rw-r--r--apps/files_external/l10n/nn_NO.php4
-rw-r--r--apps/files_external/l10n/oc.php4
-rw-r--r--apps/files_external/l10n/pl.php4
-rw-r--r--apps/files_external/l10n/pt_BR.php4
-rw-r--r--apps/files_external/l10n/pt_PT.php4
-rw-r--r--apps/files_external/l10n/ro.php4
-rw-r--r--apps/files_external/l10n/ru.php4
-rw-r--r--apps/files_external/l10n/ru_RU.php4
-rw-r--r--apps/files_external/l10n/si_LK.php4
-rw-r--r--apps/files_external/l10n/sk_SK.php4
-rw-r--r--apps/files_external/l10n/sl.php4
-rw-r--r--apps/files_external/l10n/sq.php4
-rw-r--r--apps/files_external/l10n/sr.php4
-rw-r--r--apps/files_external/l10n/sr@latin.php4
-rw-r--r--apps/files_external/l10n/sv.php4
-rw-r--r--apps/files_external/l10n/ta_LK.php4
-rw-r--r--apps/files_external/l10n/te.php4
-rw-r--r--apps/files_external/l10n/th_TH.php4
-rw-r--r--apps/files_external/l10n/tr.php4
-rw-r--r--apps/files_external/l10n/ug.php4
-rw-r--r--apps/files_external/l10n/uk.php4
-rw-r--r--apps/files_external/l10n/ur_PK.php4
-rw-r--r--apps/files_external/l10n/vi.php4
-rw-r--r--apps/files_external/l10n/zh_CN.GB2312.php4
-rw-r--r--apps/files_external/l10n/zh_CN.php4
-rw-r--r--apps/files_external/l10n/zh_HK.php4
-rw-r--r--apps/files_external/l10n/zh_TW.php4
-rw-r--r--apps/files_external/lib/amazons3.php6
-rwxr-xr-xapps/files_external/lib/config.php38
-rw-r--r--apps/files_external/lib/google.php6
-rw-r--r--apps/files_external/lib/irods.php2
-rw-r--r--apps/files_external/lib/sftp.php2
-rw-r--r--apps/files_external/lib/smb.php2
-rw-r--r--apps/files_external/lib/webdav.php7
-rw-r--r--apps/files_external/tests/google.php2
-rw-r--r--apps/files_sharing/appinfo/app.php2
-rw-r--r--apps/files_sharing/js/public.js6
-rw-r--r--apps/files_sharing/js/share.js5
-rw-r--r--apps/files_sharing/l10n/af_ZA.php4
-rw-r--r--apps/files_sharing/l10n/ar.php4
-rw-r--r--apps/files_sharing/l10n/bg_BG.php4
-rw-r--r--apps/files_sharing/l10n/bn_BD.php4
-rw-r--r--apps/files_sharing/l10n/ca.php4
-rw-r--r--apps/files_sharing/l10n/cs_CZ.php4
-rw-r--r--apps/files_sharing/l10n/cy_GB.php4
-rw-r--r--apps/files_sharing/l10n/da.php4
-rw-r--r--apps/files_sharing/l10n/de.php4
-rw-r--r--apps/files_sharing/l10n/de_DE.php4
-rw-r--r--apps/files_sharing/l10n/el.php4
-rw-r--r--apps/files_sharing/l10n/en@pirate.php4
-rw-r--r--apps/files_sharing/l10n/eo.php4
-rw-r--r--apps/files_sharing/l10n/es.php4
-rw-r--r--apps/files_sharing/l10n/es_AR.php4
-rw-r--r--apps/files_sharing/l10n/et_EE.php10
-rw-r--r--apps/files_sharing/l10n/eu.php4
-rw-r--r--apps/files_sharing/l10n/fa.php4
-rw-r--r--apps/files_sharing/l10n/fi_FI.php4
-rw-r--r--apps/files_sharing/l10n/fr.php4
-rw-r--r--apps/files_sharing/l10n/gl.php4
-rw-r--r--apps/files_sharing/l10n/he.php4
-rw-r--r--apps/files_sharing/l10n/hi.php4
-rw-r--r--apps/files_sharing/l10n/hr.php4
-rw-r--r--apps/files_sharing/l10n/hu_HU.php10
-rw-r--r--apps/files_sharing/l10n/hy.php4
-rw-r--r--apps/files_sharing/l10n/ia.php4
-rw-r--r--apps/files_sharing/l10n/id.php4
-rw-r--r--apps/files_sharing/l10n/is.php4
-rw-r--r--apps/files_sharing/l10n/it.php4
-rw-r--r--apps/files_sharing/l10n/ja_JP.php10
-rw-r--r--apps/files_sharing/l10n/ka.php4
-rw-r--r--apps/files_sharing/l10n/ka_GE.php4
-rw-r--r--apps/files_sharing/l10n/ko.php4
-rw-r--r--apps/files_sharing/l10n/ku_IQ.php4
-rw-r--r--apps/files_sharing/l10n/lb.php4
-rw-r--r--apps/files_sharing/l10n/lt_LT.php4
-rw-r--r--apps/files_sharing/l10n/lv.php4
-rw-r--r--apps/files_sharing/l10n/mk.php4
-rw-r--r--apps/files_sharing/l10n/ms_MY.php4
-rw-r--r--apps/files_sharing/l10n/my_MM.php4
-rw-r--r--apps/files_sharing/l10n/nb_NO.php4
-rw-r--r--apps/files_sharing/l10n/nl.php10
-rw-r--r--apps/files_sharing/l10n/nn_NO.php4
-rw-r--r--apps/files_sharing/l10n/oc.php4
-rw-r--r--apps/files_sharing/l10n/pl.php4
-rw-r--r--apps/files_sharing/l10n/pt_BR.php4
-rw-r--r--apps/files_sharing/l10n/pt_PT.php10
-rw-r--r--apps/files_sharing/l10n/ro.php4
-rw-r--r--apps/files_sharing/l10n/ru.php4
-rw-r--r--apps/files_sharing/l10n/ru_RU.php3
-rw-r--r--apps/files_sharing/l10n/si_LK.php4
-rw-r--r--apps/files_sharing/l10n/sk_SK.php11
-rw-r--r--apps/files_sharing/l10n/sl.php4
-rw-r--r--apps/files_sharing/l10n/sq.php4
-rw-r--r--apps/files_sharing/l10n/sr.php4
-rw-r--r--apps/files_sharing/l10n/sr@latin.php4
-rw-r--r--apps/files_sharing/l10n/sv.php4
-rw-r--r--apps/files_sharing/l10n/ta_LK.php4
-rw-r--r--apps/files_sharing/l10n/te.php4
-rw-r--r--apps/files_sharing/l10n/th_TH.php4
-rw-r--r--apps/files_sharing/l10n/tr.php4
-rw-r--r--apps/files_sharing/l10n/ug.php4
-rw-r--r--apps/files_sharing/l10n/uk.php4
-rw-r--r--apps/files_sharing/l10n/ur_PK.php4
-rw-r--r--apps/files_sharing/l10n/vi.php4
-rw-r--r--apps/files_sharing/l10n/zh_CN.GB2312.php11
-rw-r--r--apps/files_sharing/l10n/zh_CN.php11
-rw-r--r--apps/files_sharing/l10n/zh_HK.php4
-rw-r--r--apps/files_sharing/l10n/zh_TW.php4
-rw-r--r--apps/files_sharing/lib/cache.php2
-rw-r--r--apps/files_sharing/lib/permissions.php2
-rw-r--r--apps/files_sharing/lib/sharedstorage.php2
-rw-r--r--apps/files_sharing/lib/watcher.php2
-rw-r--r--apps/files_sharing/public.php6
-rw-r--r--apps/files_sharing/templates/part.404.php2
-rw-r--r--apps/files_trashbin/appinfo/app.php2
-rw-r--r--apps/files_trashbin/appinfo/update.php2
-rw-r--r--apps/files_trashbin/index.php2
-rw-r--r--apps/files_trashbin/js/disableDefaultActions.js2
-rw-r--r--apps/files_trashbin/js/trash.js12
-rw-r--r--apps/files_trashbin/l10n/ar.php10
-rw-r--r--apps/files_trashbin/l10n/bg_BG.php10
-rw-r--r--apps/files_trashbin/l10n/bn_BD.php10
-rw-r--r--apps/files_trashbin/l10n/ca.php10
-rw-r--r--apps/files_trashbin/l10n/cs_CZ.php10
-rw-r--r--apps/files_trashbin/l10n/cy_GB.php10
-rw-r--r--apps/files_trashbin/l10n/da.php10
-rw-r--r--apps/files_trashbin/l10n/de.php10
-rw-r--r--apps/files_trashbin/l10n/de_DE.php10
-rw-r--r--apps/files_trashbin/l10n/el.php10
-rw-r--r--apps/files_trashbin/l10n/eo.php10
-rw-r--r--apps/files_trashbin/l10n/es.php10
-rw-r--r--apps/files_trashbin/l10n/es_AR.php10
-rw-r--r--apps/files_trashbin/l10n/et_EE.php11
-rw-r--r--apps/files_trashbin/l10n/eu.php10
-rw-r--r--apps/files_trashbin/l10n/fa.php10
-rw-r--r--apps/files_trashbin/l10n/fi_FI.php10
-rw-r--r--apps/files_trashbin/l10n/fr.php10
-rw-r--r--apps/files_trashbin/l10n/gl.php10
-rw-r--r--apps/files_trashbin/l10n/he.php10
-rw-r--r--apps/files_trashbin/l10n/hr.php6
-rw-r--r--apps/files_trashbin/l10n/hu_HU.php11
-rw-r--r--apps/files_trashbin/l10n/hy.php6
-rw-r--r--apps/files_trashbin/l10n/ia.php6
-rw-r--r--apps/files_trashbin/l10n/id.php10
-rw-r--r--apps/files_trashbin/l10n/is.php10
-rw-r--r--apps/files_trashbin/l10n/it.php10
-rw-r--r--apps/files_trashbin/l10n/ja_JP.php11
-rw-r--r--apps/files_trashbin/l10n/ka_GE.php10
-rw-r--r--apps/files_trashbin/l10n/ko.php10
-rw-r--r--apps/files_trashbin/l10n/ku_IQ.php8
-rw-r--r--apps/files_trashbin/l10n/lb.php6
-rw-r--r--apps/files_trashbin/l10n/lt_LT.php10
-rw-r--r--apps/files_trashbin/l10n/lv.php11
-rw-r--r--apps/files_trashbin/l10n/mk.php10
-rw-r--r--apps/files_trashbin/l10n/ms_MY.php6
-rw-r--r--apps/files_trashbin/l10n/nb_NO.php10
-rw-r--r--apps/files_trashbin/l10n/nl.php10
-rw-r--r--apps/files_trashbin/l10n/nn_NO.php10
-rw-r--r--apps/files_trashbin/l10n/oc.php6
-rw-r--r--apps/files_trashbin/l10n/pl.php10
-rw-r--r--apps/files_trashbin/l10n/pt_BR.php10
-rw-r--r--apps/files_trashbin/l10n/pt_PT.php10
-rw-r--r--apps/files_trashbin/l10n/ro.php10
-rw-r--r--apps/files_trashbin/l10n/ru.php10
-rw-r--r--apps/files_trashbin/l10n/ru_RU.php5
-rw-r--r--apps/files_trashbin/l10n/si_LK.php8
-rw-r--r--apps/files_trashbin/l10n/sk_SK.php11
-rw-r--r--apps/files_trashbin/l10n/sl.php10
-rw-r--r--apps/files_trashbin/l10n/sq.php10
-rw-r--r--apps/files_trashbin/l10n/sr.php10
-rw-r--r--apps/files_trashbin/l10n/sr@latin.php6
-rw-r--r--apps/files_trashbin/l10n/sv.php10
-rw-r--r--apps/files_trashbin/l10n/ta_LK.php10
-rw-r--r--apps/files_trashbin/l10n/te.php6
-rw-r--r--apps/files_trashbin/l10n/th_TH.php10
-rw-r--r--apps/files_trashbin/l10n/tr.php11
-rw-r--r--apps/files_trashbin/l10n/ug.php9
-rw-r--r--apps/files_trashbin/l10n/uk.php10
-rw-r--r--apps/files_trashbin/l10n/ur_PK.php8
-rw-r--r--apps/files_trashbin/l10n/vi.php10
-rw-r--r--apps/files_trashbin/l10n/zh_CN.GB2312.php14
-rw-r--r--apps/files_trashbin/l10n/zh_CN.php11
-rw-r--r--apps/files_trashbin/l10n/zh_HK.php7
-rw-r--r--apps/files_trashbin/l10n/zh_TW.php10
-rw-r--r--apps/files_trashbin/lib/trash.php2
-rw-r--r--apps/files_versions/appinfo/routes.php2
-rw-r--r--apps/files_versions/css/versions.css7
-rw-r--r--apps/files_versions/js/versions.js18
-rw-r--r--apps/files_versions/l10n/ar.php4
-rw-r--r--apps/files_versions/l10n/bg_BG.php4
-rw-r--r--apps/files_versions/l10n/bn_BD.php4
-rw-r--r--apps/files_versions/l10n/ca.php4
-rw-r--r--apps/files_versions/l10n/cs_CZ.php8
-rw-r--r--apps/files_versions/l10n/da.php4
-rw-r--r--apps/files_versions/l10n/de.php4
-rw-r--r--apps/files_versions/l10n/de_DE.php4
-rw-r--r--apps/files_versions/l10n/el.php4
-rw-r--r--apps/files_versions/l10n/eo.php4
-rw-r--r--apps/files_versions/l10n/es.php7
-rw-r--r--apps/files_versions/l10n/es_AR.php4
-rw-r--r--apps/files_versions/l10n/et_EE.php7
-rw-r--r--apps/files_versions/l10n/eu.php4
-rw-r--r--apps/files_versions/l10n/fa.php4
-rw-r--r--apps/files_versions/l10n/fi_FI.php4
-rw-r--r--apps/files_versions/l10n/fr.php4
-rw-r--r--apps/files_versions/l10n/gl.php4
-rw-r--r--apps/files_versions/l10n/he.php4
-rw-r--r--apps/files_versions/l10n/hu_HU.php7
-rw-r--r--apps/files_versions/l10n/id.php4
-rw-r--r--apps/files_versions/l10n/is.php4
-rw-r--r--apps/files_versions/l10n/it.php4
-rw-r--r--apps/files_versions/l10n/ja_JP.php4
-rw-r--r--apps/files_versions/l10n/ka_GE.php4
-rw-r--r--apps/files_versions/l10n/ko.php4
-rw-r--r--apps/files_versions/l10n/ku_IQ.php4
-rw-r--r--apps/files_versions/l10n/lt_LT.php4
-rw-r--r--apps/files_versions/l10n/lv.php4
-rw-r--r--apps/files_versions/l10n/mk.php4
-rw-r--r--apps/files_versions/l10n/nb_NO.php4
-rw-r--r--apps/files_versions/l10n/nl.php4
-rw-r--r--apps/files_versions/l10n/nn_NO.php4
-rw-r--r--apps/files_versions/l10n/pl.php4
-rw-r--r--apps/files_versions/l10n/pt_BR.php4
-rw-r--r--apps/files_versions/l10n/pt_PT.php4
-rw-r--r--apps/files_versions/l10n/ro.php4
-rw-r--r--apps/files_versions/l10n/ru.php4
-rw-r--r--apps/files_versions/l10n/ru_RU.php5
-rw-r--r--apps/files_versions/l10n/si_LK.php4
-rw-r--r--apps/files_versions/l10n/sk_SK.php7
-rw-r--r--apps/files_versions/l10n/sl.php4
-rw-r--r--apps/files_versions/l10n/sr.php4
-rw-r--r--apps/files_versions/l10n/sv.php4
-rw-r--r--apps/files_versions/l10n/ta_LK.php4
-rw-r--r--apps/files_versions/l10n/th_TH.php4
-rw-r--r--apps/files_versions/l10n/tr.php4
-rw-r--r--apps/files_versions/l10n/ug.php4
-rw-r--r--apps/files_versions/l10n/uk.php4
-rw-r--r--apps/files_versions/l10n/vi.php4
-rw-r--r--apps/files_versions/l10n/zh_CN.GB2312.php10
-rw-r--r--apps/files_versions/l10n/zh_CN.php4
-rw-r--r--apps/files_versions/l10n/zh_HK.php4
-rw-r--r--apps/files_versions/l10n/zh_TW.php4
-rw-r--r--apps/files_versions/lib/capabilities.php2
-rw-r--r--apps/files_versions/lib/hooks.php15
-rw-r--r--apps/files_versions/lib/versions.php52
-rw-r--r--apps/user_ldap/ajax/clearMappings.php2
-rw-r--r--apps/user_ldap/ajax/getConfiguration.php2
-rw-r--r--apps/user_ldap/ajax/getNewServerConfigPrefix.php2
-rw-r--r--apps/user_ldap/ajax/setConfiguration.php2
-rw-r--r--apps/user_ldap/css/settings.css10
-rw-r--r--apps/user_ldap/group_proxy.php2
-rw-r--r--apps/user_ldap/js/settings.js11
-rw-r--r--apps/user_ldap/l10n/af_ZA.php4
-rw-r--r--apps/user_ldap/l10n/ar.php4
-rw-r--r--apps/user_ldap/l10n/bg_BG.php4
-rw-r--r--apps/user_ldap/l10n/bn_BD.php11
-rw-r--r--apps/user_ldap/l10n/ca.php12
-rw-r--r--apps/user_ldap/l10n/cs_CZ.php48
-rw-r--r--apps/user_ldap/l10n/cy_GB.php4
-rw-r--r--apps/user_ldap/l10n/da.php9
-rw-r--r--apps/user_ldap/l10n/de.php16
-rw-r--r--apps/user_ldap/l10n/de_DE.php16
-rw-r--r--apps/user_ldap/l10n/el.php11
-rw-r--r--apps/user_ldap/l10n/en@pirate.php4
-rw-r--r--apps/user_ldap/l10n/eo.php11
-rw-r--r--apps/user_ldap/l10n/es.php15
-rw-r--r--apps/user_ldap/l10n/es_AR.php11
-rw-r--r--apps/user_ldap/l10n/et_EE.php22
-rw-r--r--apps/user_ldap/l10n/eu.php11
-rw-r--r--apps/user_ldap/l10n/fa.php6
-rw-r--r--apps/user_ldap/l10n/fi_FI.php11
-rw-r--r--apps/user_ldap/l10n/fr.php11
-rw-r--r--apps/user_ldap/l10n/gl.php16
-rw-r--r--apps/user_ldap/l10n/he.php4
-rw-r--r--apps/user_ldap/l10n/hi.php4
-rw-r--r--apps/user_ldap/l10n/hr.php4
-rw-r--r--apps/user_ldap/l10n/hu_HU.php11
-rw-r--r--apps/user_ldap/l10n/ia.php4
-rw-r--r--apps/user_ldap/l10n/id.php11
-rw-r--r--apps/user_ldap/l10n/is.php4
-rw-r--r--apps/user_ldap/l10n/it.php12
-rw-r--r--apps/user_ldap/l10n/ja_JP.php22
-rw-r--r--apps/user_ldap/l10n/ka.php4
-rw-r--r--apps/user_ldap/l10n/ka_GE.php11
-rw-r--r--apps/user_ldap/l10n/ko.php11
-rw-r--r--apps/user_ldap/l10n/ku_IQ.php4
-rw-r--r--apps/user_ldap/l10n/lb.php4
-rw-r--r--apps/user_ldap/l10n/lt_LT.php5
-rw-r--r--apps/user_ldap/l10n/lv.php11
-rw-r--r--apps/user_ldap/l10n/mk.php4
-rw-r--r--apps/user_ldap/l10n/ms_MY.php4
-rw-r--r--apps/user_ldap/l10n/my_MM.php4
-rw-r--r--apps/user_ldap/l10n/nb_NO.php11
-rw-r--r--apps/user_ldap/l10n/nl.php16
-rw-r--r--apps/user_ldap/l10n/nn_NO.php4
-rw-r--r--apps/user_ldap/l10n/oc.php4
-rw-r--r--apps/user_ldap/l10n/pl.php11
-rw-r--r--apps/user_ldap/l10n/pt_BR.php12
-rw-r--r--apps/user_ldap/l10n/pt_PT.php11
-rw-r--r--apps/user_ldap/l10n/ro.php11
-rw-r--r--apps/user_ldap/l10n/ru.php11
-rw-r--r--apps/user_ldap/l10n/ru_RU.php4
-rw-r--r--apps/user_ldap/l10n/si_LK.php6
-rw-r--r--apps/user_ldap/l10n/sk_SK.php18
-rw-r--r--apps/user_ldap/l10n/sl.php11
-rw-r--r--apps/user_ldap/l10n/sq.php4
-rw-r--r--apps/user_ldap/l10n/sr.php11
-rw-r--r--apps/user_ldap/l10n/sr@latin.php4
-rw-r--r--apps/user_ldap/l10n/sv.php12
-rw-r--r--apps/user_ldap/l10n/ta_LK.php6
-rw-r--r--apps/user_ldap/l10n/te.php4
-rw-r--r--apps/user_ldap/l10n/th_TH.php11
-rw-r--r--apps/user_ldap/l10n/tr.php11
-rw-r--r--apps/user_ldap/l10n/ug.php4
-rw-r--r--apps/user_ldap/l10n/uk.php11
-rw-r--r--apps/user_ldap/l10n/ur_PK.php4
-rw-r--r--apps/user_ldap/l10n/vi.php11
-rw-r--r--apps/user_ldap/l10n/zh_CN.GB2312.php11
-rw-r--r--apps/user_ldap/l10n/zh_CN.php11
-rw-r--r--apps/user_ldap/l10n/zh_HK.php4
-rw-r--r--apps/user_ldap/l10n/zh_TW.php11
-rw-r--r--apps/user_ldap/lib/connection.php21
-rw-r--r--apps/user_ldap/lib/helper.php28
-rw-r--r--apps/user_ldap/lib/jobs.php2
-rw-r--r--apps/user_ldap/lib/proxy.php2
-rw-r--r--apps/user_ldap/settings.php2
-rw-r--r--apps/user_ldap/templates/settings.php13
-rw-r--r--apps/user_ldap/user_ldap.php10
-rw-r--r--apps/user_ldap/user_proxy.php2
-rw-r--r--apps/user_webdavauth/l10n/ar.php4
-rw-r--r--apps/user_webdavauth/l10n/bg_BG.php4
-rw-r--r--apps/user_webdavauth/l10n/ca.php4
-rw-r--r--apps/user_webdavauth/l10n/cs_CZ.php4
-rw-r--r--apps/user_webdavauth/l10n/da.php4
-rw-r--r--apps/user_webdavauth/l10n/de.php4
-rw-r--r--apps/user_webdavauth/l10n/de_DE.php4
-rw-r--r--apps/user_webdavauth/l10n/el.php4
-rw-r--r--apps/user_webdavauth/l10n/eo.php4
-rw-r--r--apps/user_webdavauth/l10n/es.php8
-rw-r--r--apps/user_webdavauth/l10n/es_AR.php4
-rw-r--r--apps/user_webdavauth/l10n/et_EE.php8
-rw-r--r--apps/user_webdavauth/l10n/eu.php4
-rw-r--r--apps/user_webdavauth/l10n/fi_FI.php4
-rw-r--r--apps/user_webdavauth/l10n/fr.php4
-rw-r--r--apps/user_webdavauth/l10n/gl.php4
-rw-r--r--apps/user_webdavauth/l10n/he.php4
-rw-r--r--apps/user_webdavauth/l10n/hu_HU.php4
-rw-r--r--apps/user_webdavauth/l10n/id.php4
-rw-r--r--apps/user_webdavauth/l10n/is.php4
-rw-r--r--apps/user_webdavauth/l10n/it.php4
-rw-r--r--apps/user_webdavauth/l10n/ja_JP.php4
-rw-r--r--apps/user_webdavauth/l10n/ka_GE.php4
-rw-r--r--apps/user_webdavauth/l10n/ko.php4
-rw-r--r--apps/user_webdavauth/l10n/lt_LT.php4
-rw-r--r--apps/user_webdavauth/l10n/lv.php4
-rw-r--r--apps/user_webdavauth/l10n/nl.php4
-rw-r--r--apps/user_webdavauth/l10n/nn_NO.php4
-rw-r--r--apps/user_webdavauth/l10n/pl.php4
-rw-r--r--apps/user_webdavauth/l10n/pt_BR.php4
-rw-r--r--apps/user_webdavauth/l10n/pt_PT.php4
-rw-r--r--apps/user_webdavauth/l10n/ro.php4
-rw-r--r--apps/user_webdavauth/l10n/ru.php4
-rw-r--r--apps/user_webdavauth/l10n/ru_RU.php4
-rw-r--r--apps/user_webdavauth/l10n/sk_SK.php8
-rw-r--r--apps/user_webdavauth/l10n/sl.php4
-rw-r--r--apps/user_webdavauth/l10n/sr.php4
-rw-r--r--apps/user_webdavauth/l10n/sv.php4
-rw-r--r--apps/user_webdavauth/l10n/th_TH.php4
-rw-r--r--apps/user_webdavauth/l10n/tr.php4
-rw-r--r--apps/user_webdavauth/l10n/ug.php4
-rw-r--r--apps/user_webdavauth/l10n/uk.php4
-rw-r--r--apps/user_webdavauth/l10n/vi.php4
-rw-r--r--apps/user_webdavauth/l10n/zh_CN.php4
-rw-r--r--apps/user_webdavauth/l10n/zh_TW.php8
-rw-r--r--core/ajax/translations.php2
-rw-r--r--core/css/auth.css2
-rw-r--r--core/css/styles.css211
-rw-r--r--core/doc/admin/index.html (renamed from core/doc/admin/index.php)0
-rw-r--r--core/doc/user/index.html (renamed from core/doc/user/index.php)0
-rw-r--r--core/img/actions/delete-hover.pngbin0 -> 295 bytes
-rw-r--r--core/img/actions/delete-hover.svg12
-rw-r--r--core/img/actions/delete.pngbin295 -> 254 bytes
-rw-r--r--core/img/actions/delete.svg14
-rw-r--r--core/img/actions/more.pngbin0 -> 195 bytes
-rw-r--r--core/img/actions/more.svg5
-rw-r--r--core/img/actions/password.pngbin195 -> 248 bytes
-rw-r--r--core/img/actions/password.svg6
-rw-r--r--core/js/compatibility.js2
-rw-r--r--core/js/config.js4
-rw-r--r--core/js/jquery.infieldlabel.js2
-rw-r--r--core/js/jquery.inview.js2
-rw-r--r--core/js/jquery.ocdialog.js10
-rw-r--r--core/js/js.js139
-rw-r--r--core/js/listview.js4
-rw-r--r--core/js/multiselect.js4
-rw-r--r--core/js/oc-dialogs.js44
-rw-r--r--core/js/oc-requesttoken.js2
-rw-r--r--core/js/oc-vcategories.js2
-rw-r--r--core/js/router.js2
-rw-r--r--core/js/share.js32
-rw-r--r--core/js/visitortimezone.js2
-rw-r--r--core/l10n/af_ZA.php12
-rw-r--r--core/l10n/ar.php18
-rw-r--r--core/l10n/be.php12
-rw-r--r--core/l10n/bg_BG.php15
-rw-r--r--core/l10n/bn_BD.php18
-rw-r--r--core/l10n/bs.php8
-rw-r--r--core/l10n/ca.php20
-rw-r--r--core/l10n/cs_CZ.php20
-rw-r--r--core/l10n/cy_GB.php18
-rw-r--r--core/l10n/da.php24
-rw-r--r--core/l10n/de.php20
-rw-r--r--core/l10n/de_AT.php9
-rw-r--r--core/l10n/de_CH.php139
-rw-r--r--core/l10n/de_DE.php20
-rw-r--r--core/l10n/el.php18
-rw-r--r--core/l10n/en@pirate.php8
-rw-r--r--core/l10n/eo.php18
-rw-r--r--core/l10n/es.php20
-rw-r--r--core/l10n/es_AR.php18
-rw-r--r--core/l10n/et_EE.php20
-rw-r--r--core/l10n/eu.php18
-rw-r--r--core/l10n/fa.php18
-rw-r--r--core/l10n/fi.php4
-rw-r--r--core/l10n/fi_FI.php20
-rw-r--r--core/l10n/fr.php18
-rw-r--r--core/l10n/gl.php20
-rw-r--r--core/l10n/he.php18
-rw-r--r--core/l10n/hi.php12
-rw-r--r--core/l10n/hr.php14
-rw-r--r--core/l10n/hu_HU.php18
-rw-r--r--core/l10n/hy.php10
-rw-r--r--core/l10n/ia.php14
-rw-r--r--core/l10n/id.php18
-rw-r--r--core/l10n/is.php18
-rw-r--r--core/l10n/it.php18
-rw-r--r--core/l10n/ja_JP.php22
-rw-r--r--core/l10n/ka.php10
-rw-r--r--core/l10n/ka_GE.php18
-rw-r--r--core/l10n/kn.php8
-rw-r--r--core/l10n/ko.php18
-rw-r--r--core/l10n/ku_IQ.php12
-rw-r--r--core/l10n/lb.php18
-rw-r--r--core/l10n/lt_LT.php18
-rw-r--r--core/l10n/lv.php33
-rw-r--r--core/l10n/mk.php20
-rw-r--r--core/l10n/ml_IN.php8
-rw-r--r--core/l10n/ms_MY.php14
-rw-r--r--core/l10n/my_MM.php15
-rw-r--r--core/l10n/nb_NO.php18
-rw-r--r--core/l10n/ne.php8
-rw-r--r--core/l10n/nl.php22
-rw-r--r--core/l10n/nn_NO.php18
-rw-r--r--core/l10n/oc.php15
-rw-r--r--core/l10n/pl.php19
-rw-r--r--core/l10n/pl_PL.php4
-rw-r--r--core/l10n/pt_BR.php20
-rw-r--r--core/l10n/pt_PT.php18
-rw-r--r--core/l10n/ro.php18
-rw-r--r--core/l10n/ru.php20
-rw-r--r--core/l10n/ru_RU.php7
-rw-r--r--core/l10n/si_LK.php15
-rw-r--r--core/l10n/sk.php8
-rw-r--r--core/l10n/sk_SK.php22
-rw-r--r--core/l10n/sl.php18
-rw-r--r--core/l10n/sq.php18
-rw-r--r--core/l10n/sr.php18
-rw-r--r--core/l10n/sr@latin.php13
-rw-r--r--core/l10n/sv.php20
-rw-r--r--core/l10n/sw_KE.php8
-rw-r--r--core/l10n/ta_LK.php20
-rw-r--r--core/l10n/te.php15
-rw-r--r--core/l10n/th_TH.php18
-rw-r--r--core/l10n/tr.php24
-rw-r--r--core/l10n/ug.php12
-rw-r--r--core/l10n/uk.php18
-rw-r--r--core/l10n/ur_PK.php14
-rw-r--r--core/l10n/vi.php18
-rw-r--r--core/l10n/zh_CN.GB2312.php20
-rw-r--r--core/l10n/zh_CN.php18
-rw-r--r--core/l10n/zh_HK.php11
-rw-r--r--core/l10n/zh_TW.php18
-rw-r--r--core/lostpassword/controller.php3
-rw-r--r--core/lostpassword/templates/email.php2
-rw-r--r--core/routes.php2
-rw-r--r--core/templates/error.php2
-rw-r--r--core/templates/filetemplates/template.html9
-rw-r--r--core/templates/filetemplates/template.odpbin0 -> 12910 bytes
-rw-r--r--core/templates/filetemplates/template.odsbin0 -> 7130 bytes
-rw-r--r--core/templates/filetemplates/template.odtbin0 -> 8381 bytes
-rw-r--r--core/templates/installation.php2
-rw-r--r--core/templates/layout.user.php13
-rw-r--r--core/templates/part.pagenavi.php22
-rw-r--r--cron.php2
-rw-r--r--db_structure.xml2
-rw-r--r--l10n/af_ZA/core.po89
-rw-r--r--l10n/af_ZA/files.po96
-rw-r--r--l10n/af_ZA/files_encryption.po10
-rw-r--r--l10n/af_ZA/files_trashbin.po28
-rw-r--r--l10n/af_ZA/lib.po58
-rw-r--r--l10n/af_ZA/settings.po76
-rw-r--r--l10n/af_ZA/user_ldap.po137
-rw-r--r--l10n/ar/core.po115
-rw-r--r--l10n/ar/files.po94
-rw-r--r--l10n/ar/files_encryption.po16
-rw-r--r--l10n/ar/files_sharing.po4
-rw-r--r--l10n/ar/files_trashbin.po38
-rw-r--r--l10n/ar/lib.po78
-rw-r--r--l10n/ar/settings.po88
-rw-r--r--l10n/ar/user_ldap.po137
-rw-r--r--l10n/be/core.po113
-rw-r--r--l10n/be/files.po102
-rw-r--r--l10n/be/files_encryption.po10
-rw-r--r--l10n/be/files_trashbin.po34
-rw-r--r--l10n/be/lib.po70
-rw-r--r--l10n/be/settings.po76
-rw-r--r--l10n/be/user_ldap.po137
-rw-r--r--l10n/bg_BG/core.po89
-rw-r--r--l10n/bg_BG/files.po78
-rw-r--r--l10n/bg_BG/files_encryption.po16
-rw-r--r--l10n/bg_BG/files_sharing.po4
-rw-r--r--l10n/bg_BG/files_trashbin.po30
-rw-r--r--l10n/bg_BG/lib.po62
-rw-r--r--l10n/bg_BG/settings.po88
-rw-r--r--l10n/bg_BG/user_ldap.po137
-rw-r--r--l10n/bn_BD/core.po91
-rw-r--r--l10n/bn_BD/files.po78
-rw-r--r--l10n/bn_BD/files_encryption.po16
-rw-r--r--l10n/bn_BD/files_sharing.po4
-rw-r--r--l10n/bn_BD/files_trashbin.po30
-rw-r--r--l10n/bn_BD/lib.po62
-rw-r--r--l10n/bn_BD/settings.po88
-rw-r--r--l10n/bn_BD/user_ldap.po143
-rw-r--r--l10n/bs/core.po93
-rw-r--r--l10n/bs/files.po81
-rw-r--r--l10n/bs/files_encryption.po10
-rw-r--r--l10n/bs/files_trashbin.po30
-rw-r--r--l10n/bs/lib.po66
-rw-r--r--l10n/bs/settings.po76
-rw-r--r--l10n/bs/user_ldap.po137
-rw-r--r--l10n/ca/core.po93
-rw-r--r--l10n/ca/files.po82
-rw-r--r--l10n/ca/files_encryption.po22
-rw-r--r--l10n/ca/files_sharing.po4
-rw-r--r--l10n/ca/files_trashbin.po32
-rw-r--r--l10n/ca/lib.po62
-rw-r--r--l10n/ca/settings.po88
-rw-r--r--l10n/ca/user_ldap.po147
-rw-r--r--l10n/cs_CZ/core.po102
-rw-r--r--l10n/cs_CZ/files.po86
-rw-r--r--l10n/cs_CZ/files_encryption.po19
-rw-r--r--l10n/cs_CZ/files_sharing.po4
-rw-r--r--l10n/cs_CZ/files_trashbin.po35
-rw-r--r--l10n/cs_CZ/files_versions.po11
-rw-r--r--l10n/cs_CZ/lib.po68
-rw-r--r--l10n/cs_CZ/settings.po91
-rw-r--r--l10n/cs_CZ/user_ldap.po181
-rw-r--r--l10n/cy_GB/core.po103
-rw-r--r--l10n/cy_GB/files.po86
-rw-r--r--l10n/cy_GB/files_encryption.po16
-rw-r--r--l10n/cy_GB/files_sharing.po4
-rw-r--r--l10n/cy_GB/files_trashbin.po34
-rw-r--r--l10n/cy_GB/lib.po70
-rw-r--r--l10n/cy_GB/settings.po88
-rw-r--r--l10n/cy_GB/user_ldap.po137
-rw-r--r--l10n/da/core.po102
-rw-r--r--l10n/da/files.po81
-rw-r--r--l10n/da/files_encryption.po23
-rw-r--r--l10n/da/files_sharing.po4
-rw-r--r--l10n/da/files_trashbin.po33
-rw-r--r--l10n/da/lib.po65
-rw-r--r--l10n/da/settings.po88
-rw-r--r--l10n/da/user_ldap.po143
-rw-r--r--l10n/de/core.po94
-rw-r--r--l10n/de/files.po84
-rw-r--r--l10n/de/files_encryption.po21
-rw-r--r--l10n/de/files_sharing.po4
-rw-r--r--l10n/de/files_trashbin.po32
-rw-r--r--l10n/de/lib.po64
-rw-r--r--l10n/de/settings.po88
-rw-r--r--l10n/de/user_ldap.po145
-rw-r--r--l10n/de_AT/core.po90
-rw-r--r--l10n/de_AT/files.po78
-rw-r--r--l10n/de_AT/files_encryption.po10
-rw-r--r--l10n/de_AT/files_trashbin.po28
-rw-r--r--l10n/de_AT/lib.po58
-rw-r--r--l10n/de_AT/settings.po76
-rw-r--r--l10n/de_AT/user_ldap.po137
-rw-r--r--l10n/de_CH/core.po357
-rw-r--r--l10n/de_CH/files.po228
-rw-r--r--l10n/de_CH/files_encryption.po89
-rw-r--r--l10n/de_CH/files_external.po55
-rw-r--r--l10n/de_CH/files_sharing.po39
-rw-r--r--l10n/de_CH/files_trashbin.po56
-rw-r--r--l10n/de_CH/files_versions.po20
-rw-r--r--l10n/de_CH/lib.po155
-rw-r--r--l10n/de_CH/settings.po319
-rw-r--r--l10n/de_CH/user_ldap.po302
-rw-r--r--l10n/de_CH/user_webdavauth.po18
-rw-r--r--l10n/de_DE/core.po95
-rw-r--r--l10n/de_DE/files.po83
-rw-r--r--l10n/de_DE/files_encryption.po18
-rw-r--r--l10n/de_DE/files_sharing.po4
-rw-r--r--l10n/de_DE/files_trashbin.po33
-rw-r--r--l10n/de_DE/lib.po65
-rw-r--r--l10n/de_DE/settings.po88
-rw-r--r--l10n/de_DE/user_ldap.po148
-rw-r--r--l10n/el/core.po93
-rw-r--r--l10n/el/files.po80
-rw-r--r--l10n/el/files_encryption.po16
-rw-r--r--l10n/el/files_sharing.po4
-rw-r--r--l10n/el/files_trashbin.po32
-rw-r--r--l10n/el/lib.po64
-rw-r--r--l10n/el/settings.po88
-rw-r--r--l10n/el/user_ldap.po143
-rw-r--r--l10n/en@pirate/core.po89
-rw-r--r--l10n/en@pirate/files.po78
-rw-r--r--l10n/en@pirate/files_encryption.po10
-rw-r--r--l10n/en@pirate/files_sharing.po4
-rw-r--r--l10n/en@pirate/files_trashbin.po28
-rw-r--r--l10n/en@pirate/lib.po62
-rw-r--r--l10n/en@pirate/settings.po76
-rw-r--r--l10n/en@pirate/user_ldap.po137
-rw-r--r--l10n/eo/core.po91
-rw-r--r--l10n/eo/files.po78
-rw-r--r--l10n/eo/files_encryption.po16
-rw-r--r--l10n/eo/files_sharing.po4
-rw-r--r--l10n/eo/files_trashbin.po30
-rw-r--r--l10n/eo/lib.po62
-rw-r--r--l10n/eo/settings.po88
-rw-r--r--l10n/eo/user_ldap.po143
-rw-r--r--l10n/es/core.po96
-rw-r--r--l10n/es/files.po78
-rw-r--r--l10n/es/files_encryption.po18
-rw-r--r--l10n/es/files_sharing.po4
-rw-r--r--l10n/es/files_trashbin.po32
-rw-r--r--l10n/es/files_versions.po13
-rw-r--r--l10n/es/lib.po64
-rw-r--r--l10n/es/settings.po90
-rw-r--r--l10n/es/user_ldap.po148
-rw-r--r--l10n/es/user_webdavauth.po11
-rw-r--r--l10n/es_AR/core.po91
-rw-r--r--l10n/es_AR/files.po78
-rw-r--r--l10n/es_AR/files_encryption.po18
-rw-r--r--l10n/es_AR/files_sharing.po4
-rw-r--r--l10n/es_AR/files_trashbin.po30
-rw-r--r--l10n/es_AR/lib.po64
-rw-r--r--l10n/es_AR/settings.po88
-rw-r--r--l10n/es_AR/user_ldap.po143
-rw-r--r--l10n/et_EE/core.po93
-rw-r--r--l10n/et_EE/files.po82
-rw-r--r--l10n/et_EE/files_encryption.po22
-rw-r--r--l10n/et_EE/files_sharing.po19
-rw-r--r--l10n/et_EE/files_trashbin.po33
-rw-r--r--l10n/et_EE/files_versions.po13
-rw-r--r--l10n/et_EE/lib.po64
-rw-r--r--l10n/et_EE/settings.po88
-rw-r--r--l10n/et_EE/user_ldap.po161
-rw-r--r--l10n/et_EE/user_webdavauth.po10
-rw-r--r--l10n/eu/core.po93
-rw-r--r--l10n/eu/files.po78
-rw-r--r--l10n/eu/files_encryption.po18
-rw-r--r--l10n/eu/files_sharing.po4
-rw-r--r--l10n/eu/files_trashbin.po30
-rw-r--r--l10n/eu/lib.po64
-rw-r--r--l10n/eu/settings.po90
-rw-r--r--l10n/eu/user_ldap.po145
-rw-r--r--l10n/fa/core.po87
-rw-r--r--l10n/fa/files.po75
-rw-r--r--l10n/fa/files_encryption.po18
-rw-r--r--l10n/fa/files_sharing.po4
-rw-r--r--l10n/fa/files_trashbin.po26
-rw-r--r--l10n/fa/lib.po58
-rw-r--r--l10n/fa/settings.po88
-rw-r--r--l10n/fa/user_ldap.po137
-rw-r--r--l10n/fi_FI/core.po95
-rw-r--r--l10n/fi_FI/files.po78
-rw-r--r--l10n/fi_FI/files_encryption.po16
-rw-r--r--l10n/fi_FI/files_sharing.po4
-rw-r--r--l10n/fi_FI/files_trashbin.po30
-rw-r--r--l10n/fi_FI/lib.po64
-rw-r--r--l10n/fi_FI/settings.po90
-rw-r--r--l10n/fi_FI/user_ldap.po143
-rw-r--r--l10n/fr/core.po91
-rw-r--r--l10n/fr/files.po78
-rw-r--r--l10n/fr/files_encryption.po18
-rw-r--r--l10n/fr/files_sharing.po4
-rw-r--r--l10n/fr/files_trashbin.po30
-rw-r--r--l10n/fr/lib.po62
-rw-r--r--l10n/fr/settings.po88
-rw-r--r--l10n/fr/user_ldap.po143
-rw-r--r--l10n/gl/core.po93
-rw-r--r--l10n/gl/files.po82
-rw-r--r--l10n/gl/files_encryption.po18
-rw-r--r--l10n/gl/files_sharing.po4
-rw-r--r--l10n/gl/files_trashbin.po30
-rw-r--r--l10n/gl/lib.po64
-rw-r--r--l10n/gl/settings.po88
-rw-r--r--l10n/gl/user_ldap.po145
-rw-r--r--l10n/he/core.po91
-rw-r--r--l10n/he/files.po78
-rw-r--r--l10n/he/files_encryption.po16
-rw-r--r--l10n/he/files_sharing.po4
-rw-r--r--l10n/he/files_trashbin.po30
-rw-r--r--l10n/he/lib.po62
-rw-r--r--l10n/he/settings.po88
-rw-r--r--l10n/he/user_ldap.po137
-rw-r--r--l10n/hi/core.po89
-rw-r--r--l10n/hi/files.po96
-rw-r--r--l10n/hi/files_encryption.po10
-rw-r--r--l10n/hi/files_trashbin.po28
-rw-r--r--l10n/hi/lib.po58
-rw-r--r--l10n/hi/settings.po76
-rw-r--r--l10n/hi/user_ldap.po137
-rw-r--r--l10n/hr/core.po99
-rw-r--r--l10n/hr/files.po81
-rw-r--r--l10n/hr/files_encryption.po10
-rw-r--r--l10n/hr/files_sharing.po4
-rw-r--r--l10n/hr/files_trashbin.po32
-rw-r--r--l10n/hr/lib.po66
-rw-r--r--l10n/hr/settings.po76
-rw-r--r--l10n/hr/user_ldap.po137
-rw-r--r--l10n/hu_HU/core.po93
-rw-r--r--l10n/hu_HU/files.po78
-rw-r--r--l10n/hu_HU/files_encryption.po16
-rw-r--r--l10n/hu_HU/files_sharing.po18
-rw-r--r--l10n/hu_HU/files_trashbin.po31
-rw-r--r--l10n/hu_HU/files_versions.po13
-rw-r--r--l10n/hu_HU/lib.po64
-rw-r--r--l10n/hu_HU/settings.po90
-rw-r--r--l10n/hu_HU/user_ldap.po143
-rw-r--r--l10n/hy/core.po105
-rw-r--r--l10n/hy/files.po78
-rw-r--r--l10n/hy/files_encryption.po10
-rw-r--r--l10n/hy/files_sharing.po4
-rw-r--r--l10n/hy/files_trashbin.po28
-rw-r--r--l10n/hy/lib.po62
-rw-r--r--l10n/hy/settings.po76
-rw-r--r--l10n/hy/user_ldap.po137
-rw-r--r--l10n/ia/core.po91
-rw-r--r--l10n/ia/files.po78
-rw-r--r--l10n/ia/files_encryption.po10
-rw-r--r--l10n/ia/files_sharing.po4
-rw-r--r--l10n/ia/files_trashbin.po30
-rw-r--r--l10n/ia/lib.po58
-rw-r--r--l10n/ia/settings.po76
-rw-r--r--l10n/ia/user_ldap.po137
-rw-r--r--l10n/id/core.po87
-rw-r--r--l10n/id/files.po75
-rw-r--r--l10n/id/files_encryption.po16
-rw-r--r--l10n/id/files_sharing.po4
-rw-r--r--l10n/id/files_trashbin.po26
-rw-r--r--l10n/id/lib.po58
-rw-r--r--l10n/id/settings.po88
-rw-r--r--l10n/id/user_ldap.po143
-rw-r--r--l10n/is/core.po91
-rw-r--r--l10n/is/files.po78
-rw-r--r--l10n/is/files_encryption.po16
-rw-r--r--l10n/is/files_sharing.po4
-rw-r--r--l10n/is/files_trashbin.po30
-rw-r--r--l10n/is/lib.po62
-rw-r--r--l10n/is/settings.po88
-rw-r--r--l10n/is/user_ldap.po137
-rw-r--r--l10n/it/core.po93
-rw-r--r--l10n/it/files.po78
-rw-r--r--l10n/it/files_encryption.po16
-rw-r--r--l10n/it/files_sharing.po4
-rw-r--r--l10n/it/files_trashbin.po32
-rw-r--r--l10n/it/lib.po64
-rw-r--r--l10n/it/settings.po90
-rw-r--r--l10n/it/user_ldap.po147
-rw-r--r--l10n/ja_JP/core.po93
-rw-r--r--l10n/ja_JP/files.po80
-rw-r--r--l10n/ja_JP/files_encryption.po22
-rw-r--r--l10n/ja_JP/files_sharing.po18
-rw-r--r--l10n/ja_JP/files_trashbin.po32
-rw-r--r--l10n/ja_JP/lib.po67
-rw-r--r--l10n/ja_JP/settings.po90
-rw-r--r--l10n/ja_JP/user_ldap.po162
-rw-r--r--l10n/ka/core.po85
-rw-r--r--l10n/ka/files.po75
-rw-r--r--l10n/ka/files_encryption.po10
-rw-r--r--l10n/ka/files_sharing.po4
-rw-r--r--l10n/ka/files_trashbin.po26
-rw-r--r--l10n/ka/lib.po58
-rw-r--r--l10n/ka/settings.po76
-rw-r--r--l10n/ka/user_ldap.po137
-rw-r--r--l10n/ka_GE/core.po87
-rw-r--r--l10n/ka_GE/files.po75
-rw-r--r--l10n/ka_GE/files_encryption.po16
-rw-r--r--l10n/ka_GE/files_sharing.po4
-rw-r--r--l10n/ka_GE/files_trashbin.po26
-rw-r--r--l10n/ka_GE/lib.po58
-rw-r--r--l10n/ka_GE/settings.po88
-rw-r--r--l10n/ka_GE/user_ldap.po143
-rw-r--r--l10n/kn/core.po101
-rw-r--r--l10n/kn/files.po93
-rw-r--r--l10n/kn/files_encryption.po10
-rw-r--r--l10n/kn/files_trashbin.po26
-rw-r--r--l10n/kn/lib.po58
-rw-r--r--l10n/kn/settings.po76
-rw-r--r--l10n/kn/user_ldap.po137
-rw-r--r--l10n/ko/core.po87
-rw-r--r--l10n/ko/files.po75
-rw-r--r--l10n/ko/files_encryption.po16
-rw-r--r--l10n/ko/files_sharing.po4
-rw-r--r--l10n/ko/files_trashbin.po26
-rw-r--r--l10n/ko/lib.po58
-rw-r--r--l10n/ko/settings.po88
-rw-r--r--l10n/ko/user_ldap.po143
-rw-r--r--l10n/ku_IQ/core.po89
-rw-r--r--l10n/ku_IQ/files.po78
-rw-r--r--l10n/ku_IQ/files_encryption.po16
-rw-r--r--l10n/ku_IQ/files_sharing.po4
-rw-r--r--l10n/ku_IQ/files_trashbin.po28
-rw-r--r--l10n/ku_IQ/lib.po58
-rw-r--r--l10n/ku_IQ/settings.po88
-rw-r--r--l10n/ku_IQ/user_ldap.po137
-rw-r--r--l10n/l10n.pl54
-rw-r--r--l10n/lb/core.po91
-rw-r--r--l10n/lb/files.po78
-rw-r--r--l10n/lb/files_encryption.po10
-rw-r--r--l10n/lb/files_sharing.po4
-rw-r--r--l10n/lb/files_trashbin.po30
-rw-r--r--l10n/lb/lib.po62
-rw-r--r--l10n/lb/settings.po76
-rw-r--r--l10n/lb/user_ldap.po137
-rw-r--r--l10n/lt_LT/core.po99
-rw-r--r--l10n/lt_LT/files.po81
-rw-r--r--l10n/lt_LT/files_encryption.po16
-rw-r--r--l10n/lt_LT/files_sharing.po4
-rw-r--r--l10n/lt_LT/files_trashbin.po32
-rw-r--r--l10n/lt_LT/lib.po66
-rw-r--r--l10n/lt_LT/settings.po88
-rw-r--r--l10n/lt_LT/user_ldap.po137
-rw-r--r--l10n/lv/core.po126
-rw-r--r--l10n/lv/files.po96
-rw-r--r--l10n/lv/files_encryption.po16
-rw-r--r--l10n/lv/files_external.po21
-rw-r--r--l10n/lv/files_sharing.po4
-rw-r--r--l10n/lv/files_trashbin.po35
-rw-r--r--l10n/lv/lib.po77
-rw-r--r--l10n/lv/settings.po115
-rw-r--r--l10n/lv/user_ldap.po143
-rw-r--r--l10n/mk/core.po91
-rw-r--r--l10n/mk/files.po78
-rw-r--r--l10n/mk/files_encryption.po16
-rw-r--r--l10n/mk/files_sharing.po4
-rw-r--r--l10n/mk/files_trashbin.po30
-rw-r--r--l10n/mk/lib.po62
-rw-r--r--l10n/mk/settings.po88
-rw-r--r--l10n/mk/user_ldap.po137
-rw-r--r--l10n/ml_IN/core.po105
-rw-r--r--l10n/ml_IN/files.po96
-rw-r--r--l10n/ml_IN/files_encryption.po10
-rw-r--r--l10n/ml_IN/files_trashbin.po28
-rw-r--r--l10n/ml_IN/lib.po62
-rw-r--r--l10n/ml_IN/settings.po76
-rw-r--r--l10n/ml_IN/user_ldap.po137
-rw-r--r--l10n/ms_MY/core.po87
-rw-r--r--l10n/ms_MY/files.po75
-rw-r--r--l10n/ms_MY/files_encryption.po10
-rw-r--r--l10n/ms_MY/files_sharing.po4
-rw-r--r--l10n/ms_MY/files_trashbin.po26
-rw-r--r--l10n/ms_MY/lib.po54
-rw-r--r--l10n/ms_MY/settings.po76
-rw-r--r--l10n/ms_MY/user_ldap.po137
-rw-r--r--l10n/my_MM/core.po85
-rw-r--r--l10n/my_MM/files.po75
-rw-r--r--l10n/my_MM/files_encryption.po10
-rw-r--r--l10n/my_MM/files_sharing.po4
-rw-r--r--l10n/my_MM/files_trashbin.po26
-rw-r--r--l10n/my_MM/lib.po58
-rw-r--r--l10n/my_MM/settings.po76
-rw-r--r--l10n/my_MM/user_ldap.po137
-rw-r--r--l10n/nb_NO/core.po91
-rw-r--r--l10n/nb_NO/files.po91
-rw-r--r--l10n/nb_NO/files_encryption.po16
-rw-r--r--l10n/nb_NO/files_sharing.po4
-rw-r--r--l10n/nb_NO/files_trashbin.po30
-rw-r--r--l10n/nb_NO/lib.po62
-rw-r--r--l10n/nb_NO/settings.po88
-rw-r--r--l10n/nb_NO/user_ldap.po143
-rw-r--r--l10n/ne/core.po105
-rw-r--r--l10n/ne/files.po96
-rw-r--r--l10n/ne/files_encryption.po10
-rw-r--r--l10n/ne/files_trashbin.po28
-rw-r--r--l10n/ne/lib.po62
-rw-r--r--l10n/ne/settings.po76
-rw-r--r--l10n/ne/user_ldap.po137
-rw-r--r--l10n/nl/core.po96
-rw-r--r--l10n/nl/files.po83
-rw-r--r--l10n/nl/files_encryption.po20
-rw-r--r--l10n/nl/files_sharing.po19
-rw-r--r--l10n/nl/files_trashbin.po30
-rw-r--r--l10n/nl/lib.po64
-rw-r--r--l10n/nl/settings.po109
-rw-r--r--l10n/nl/user_ldap.po156
-rw-r--r--l10n/nn_NO/core.po91
-rw-r--r--l10n/nn_NO/files.po78
-rw-r--r--l10n/nn_NO/files_encryption.po10
-rw-r--r--l10n/nn_NO/files_sharing.po4
-rw-r--r--l10n/nn_NO/files_trashbin.po30
-rw-r--r--l10n/nn_NO/lib.po62
-rw-r--r--l10n/nn_NO/settings.po76
-rw-r--r--l10n/nn_NO/user_ldap.po137
-rw-r--r--l10n/oc/core.po91
-rw-r--r--l10n/oc/files.po78
-rw-r--r--l10n/oc/files_encryption.po10
-rw-r--r--l10n/oc/files_sharing.po4
-rw-r--r--l10n/oc/files_trashbin.po30
-rw-r--r--l10n/oc/lib.po62
-rw-r--r--l10n/oc/settings.po76
-rw-r--r--l10n/oc/user_ldap.po137
-rw-r--r--l10n/pl/core.po101
-rw-r--r--l10n/pl/files.po81
-rw-r--r--l10n/pl/files_encryption.po26
-rw-r--r--l10n/pl/files_sharing.po4
-rw-r--r--l10n/pl/files_trashbin.po34
-rw-r--r--l10n/pl/lib.po68
-rw-r--r--l10n/pl/settings.po94
-rw-r--r--l10n/pl/user_ldap.po143
-rw-r--r--l10n/pt_BR/core.po93
-rw-r--r--l10n/pt_BR/files.po78
-rw-r--r--l10n/pt_BR/files_encryption.po20
-rw-r--r--l10n/pt_BR/files_sharing.po4
-rw-r--r--l10n/pt_BR/files_trashbin.po32
-rw-r--r--l10n/pt_BR/lib.po64
-rw-r--r--l10n/pt_BR/settings.po88
-rw-r--r--l10n/pt_BR/user_ldap.po147
-rw-r--r--l10n/pt_PT/core.po93
-rw-r--r--l10n/pt_PT/files.po78
-rw-r--r--l10n/pt_PT/files_encryption.po18
-rw-r--r--l10n/pt_PT/files_sharing.po19
-rw-r--r--l10n/pt_PT/files_trashbin.po32
-rw-r--r--l10n/pt_PT/lib.po64
-rw-r--r--l10n/pt_PT/settings.po90
-rw-r--r--l10n/pt_PT/user_ldap.po143
-rw-r--r--l10n/ro/core.po101
-rw-r--r--l10n/ro/files.po81
-rw-r--r--l10n/ro/files_encryption.po16
-rw-r--r--l10n/ro/files_sharing.po4
-rw-r--r--l10n/ro/files_trashbin.po32
-rw-r--r--l10n/ro/lib.po69
-rw-r--r--l10n/ro/settings.po88
-rw-r--r--l10n/ro/user_ldap.po143
-rw-r--r--l10n/ru/core.po102
-rw-r--r--l10n/ru/files.po82
-rw-r--r--l10n/ru/files_encryption.po23
-rw-r--r--l10n/ru/files_sharing.po4
-rw-r--r--l10n/ru/files_trashbin.po34
-rw-r--r--l10n/ru/lib.po69
-rw-r--r--l10n/ru/settings.po92
-rw-r--r--l10n/ru/user_ldap.po145
-rw-r--r--l10n/ru_RU/core.po617
-rw-r--r--l10n/ru_RU/files.po322
-rw-r--r--l10n/ru_RU/files_encryption.po103
-rw-r--r--l10n/ru_RU/files_external.po123
-rw-r--r--l10n/ru_RU/files_sharing.po48
-rw-r--r--l10n/ru_RU/files_trashbin.po84
-rw-r--r--l10n/ru_RU/files_versions.po57
-rw-r--r--l10n/ru_RU/lib.po245
-rw-r--r--l10n/ru_RU/settings.po496
-rw-r--r--l10n/ru_RU/user_ldap.po419
-rw-r--r--l10n/ru_RU/user_webdavauth.po36
-rw-r--r--l10n/si_LK/core.po91
-rw-r--r--l10n/si_LK/files.po78
-rw-r--r--l10n/si_LK/files_encryption.po16
-rw-r--r--l10n/si_LK/files_sharing.po4
-rw-r--r--l10n/si_LK/files_trashbin.po30
-rw-r--r--l10n/si_LK/lib.po62
-rw-r--r--l10n/si_LK/settings.po88
-rw-r--r--l10n/si_LK/user_ldap.po137
-rw-r--r--l10n/sk/core.po109
-rw-r--r--l10n/sk/files.po99
-rw-r--r--l10n/sk/files_encryption.po10
-rw-r--r--l10n/sk/files_trashbin.po30
-rw-r--r--l10n/sk/lib.po66
-rw-r--r--l10n/sk/settings.po76
-rw-r--r--l10n/sk/user_ldap.po137
-rw-r--r--l10n/sk_SK/core.po107
-rw-r--r--l10n/sk_SK/files.po85
-rw-r--r--l10n/sk_SK/files_encryption.po16
-rw-r--r--l10n/sk_SK/files_sharing.po21
-rw-r--r--l10n/sk_SK/files_trashbin.po35
-rw-r--r--l10n/sk_SK/files_versions.po13
-rw-r--r--l10n/sk_SK/lib.po74
-rw-r--r--l10n/sk_SK/settings.po110
-rw-r--r--l10n/sk_SK/user_ldap.po157
-rw-r--r--l10n/sk_SK/user_webdavauth.po10
-rw-r--r--l10n/sl/core.po105
-rw-r--r--l10n/sl/files.po86
-rw-r--r--l10n/sl/files_encryption.po22
-rw-r--r--l10n/sl/files_sharing.po4
-rw-r--r--l10n/sl/files_trashbin.po34
-rw-r--r--l10n/sl/lib.po70
-rw-r--r--l10n/sl/settings.po88
-rw-r--r--l10n/sl/user_ldap.po143
-rw-r--r--l10n/sq/core.po93
-rw-r--r--l10n/sq/files.po78
-rw-r--r--l10n/sq/files_encryption.po10
-rw-r--r--l10n/sq/files_sharing.po4
-rw-r--r--l10n/sq/files_trashbin.po30
-rw-r--r--l10n/sq/lib.po62
-rw-r--r--l10n/sq/settings.po76
-rw-r--r--l10n/sq/user_ldap.po137
-rw-r--r--l10n/sr/core.po99
-rw-r--r--l10n/sr/files.po81
-rw-r--r--l10n/sr/files_encryption.po16
-rw-r--r--l10n/sr/files_sharing.po4
-rw-r--r--l10n/sr/files_trashbin.po32
-rw-r--r--l10n/sr/lib.po66
-rw-r--r--l10n/sr/settings.po88
-rw-r--r--l10n/sr/user_ldap.po143
-rw-r--r--l10n/sr@latin/core.po93
-rw-r--r--l10n/sr@latin/files.po81
-rw-r--r--l10n/sr@latin/files_encryption.po10
-rw-r--r--l10n/sr@latin/files_sharing.po4
-rw-r--r--l10n/sr@latin/files_trashbin.po30
-rw-r--r--l10n/sr@latin/lib.po62
-rw-r--r--l10n/sr@latin/settings.po76
-rw-r--r--l10n/sr@latin/user_ldap.po137
-rw-r--r--l10n/sv/core.po93
-rw-r--r--l10n/sv/files.po82
-rw-r--r--l10n/sv/files_encryption.po18
-rw-r--r--l10n/sv/files_sharing.po4
-rw-r--r--l10n/sv/files_trashbin.po33
-rw-r--r--l10n/sv/lib.po64
-rw-r--r--l10n/sv/settings.po90
-rw-r--r--l10n/sv/user_ldap.po147
-rw-r--r--l10n/sw_KE/core.po105
-rw-r--r--l10n/sw_KE/files.po96
-rw-r--r--l10n/sw_KE/files_encryption.po10
-rw-r--r--l10n/sw_KE/files_trashbin.po28
-rw-r--r--l10n/sw_KE/lib.po62
-rw-r--r--l10n/sw_KE/settings.po76
-rw-r--r--l10n/sw_KE/user_ldap.po137
-rw-r--r--l10n/ta_LK/core.po91
-rw-r--r--l10n/ta_LK/files.po78
-rw-r--r--l10n/ta_LK/files_encryption.po16
-rw-r--r--l10n/ta_LK/files_sharing.po4
-rw-r--r--l10n/ta_LK/files_trashbin.po30
-rw-r--r--l10n/ta_LK/lib.po62
-rw-r--r--l10n/ta_LK/settings.po88
-rw-r--r--l10n/ta_LK/user_ldap.po137
-rw-r--r--l10n/te/core.po89
-rw-r--r--l10n/te/files.po78
-rw-r--r--l10n/te/files_encryption.po10
-rw-r--r--l10n/te/files_trashbin.po30
-rw-r--r--l10n/te/lib.po62
-rw-r--r--l10n/te/settings.po76
-rw-r--r--l10n/te/user_ldap.po137
-rw-r--r--l10n/templates/core.pot90
-rw-r--r--l10n/templates/files.pot79
-rw-r--r--l10n/templates/files_encryption.pot14
-rw-r--r--l10n/templates/files_external.pot8
-rw-r--r--l10n/templates/files_sharing.pot2
-rw-r--r--l10n/templates/files_trashbin.pot27
-rw-r--r--l10n/templates/files_versions.pot4
-rw-r--r--l10n/templates/lib.pot57
-rw-r--r--l10n/templates/settings.pot86
-rw-r--r--l10n/templates/user_ldap.pot135
-rw-r--r--l10n/templates/user_webdavauth.pot2
-rw-r--r--l10n/th_TH/core.po87
-rw-r--r--l10n/th_TH/files.po75
-rw-r--r--l10n/th_TH/files_encryption.po16
-rw-r--r--l10n/th_TH/files_sharing.po4
-rw-r--r--l10n/th_TH/files_trashbin.po26
-rw-r--r--l10n/th_TH/lib.po58
-rw-r--r--l10n/th_TH/settings.po88
-rw-r--r--l10n/th_TH/user_ldap.po143
-rw-r--r--l10n/tr/core.po98
-rw-r--r--l10n/tr/files.po79
-rw-r--r--l10n/tr/files_encryption.po16
-rw-r--r--l10n/tr/files_sharing.po4
-rw-r--r--l10n/tr/files_trashbin.po33
-rw-r--r--l10n/tr/lib.po71
-rw-r--r--l10n/tr/settings.po107
-rw-r--r--l10n/tr/user_ldap.po143
-rw-r--r--l10n/ug/core.po87
-rw-r--r--l10n/ug/files.po75
-rw-r--r--l10n/ug/files_encryption.po16
-rw-r--r--l10n/ug/files_sharing.po4
-rw-r--r--l10n/ug/files_trashbin.po26
-rw-r--r--l10n/ug/lib.po58
-rw-r--r--l10n/ug/settings.po88
-rw-r--r--l10n/ug/user_ldap.po137
-rw-r--r--l10n/uk/core.po99
-rw-r--r--l10n/uk/files.po88
-rw-r--r--l10n/uk/files_encryption.po16
-rw-r--r--l10n/uk/files_sharing.po4
-rw-r--r--l10n/uk/files_trashbin.po34
-rw-r--r--l10n/uk/lib.po66
-rw-r--r--l10n/uk/settings.po88
-rw-r--r--l10n/uk/user_ldap.po143
-rw-r--r--l10n/ur_PK/core.po91
-rw-r--r--l10n/ur_PK/files.po96
-rw-r--r--l10n/ur_PK/files_encryption.po10
-rw-r--r--l10n/ur_PK/files_trashbin.po28
-rw-r--r--l10n/ur_PK/lib.po58
-rw-r--r--l10n/ur_PK/settings.po76
-rw-r--r--l10n/ur_PK/user_ldap.po137
-rw-r--r--l10n/vi/core.po87
-rw-r--r--l10n/vi/files.po75
-rw-r--r--l10n/vi/files_encryption.po16
-rw-r--r--l10n/vi/files_sharing.po4
-rw-r--r--l10n/vi/files_trashbin.po26
-rw-r--r--l10n/vi/lib.po58
-rw-r--r--l10n/vi/settings.po88
-rw-r--r--l10n/vi/user_ldap.po143
-rw-r--r--l10n/zh_CN.GB2312/core.po90
-rw-r--r--l10n/zh_CN.GB2312/files.po76
-rw-r--r--l10n/zh_CN.GB2312/files_encryption.po16
-rw-r--r--l10n/zh_CN.GB2312/files_sharing.po21
-rw-r--r--l10n/zh_CN.GB2312/files_trashbin.po30
-rw-r--r--l10n/zh_CN.GB2312/files_versions.po15
-rw-r--r--l10n/zh_CN.GB2312/lib.po58
-rw-r--r--l10n/zh_CN.GB2312/settings.po90
-rw-r--r--l10n/zh_CN.GB2312/user_ldap.po143
-rw-r--r--l10n/zh_CN.GB2312/user_webdavauth.po11
-rw-r--r--l10n/zh_CN/core.po87
-rw-r--r--l10n/zh_CN/files.po75
-rw-r--r--l10n/zh_CN/files_encryption.po16
-rw-r--r--l10n/zh_CN/files_sharing.po21
-rw-r--r--l10n/zh_CN/files_trashbin.po31
-rw-r--r--l10n/zh_CN/lib.po59
-rw-r--r--l10n/zh_CN/settings.po109
-rw-r--r--l10n/zh_CN/user_ldap.po143
-rw-r--r--l10n/zh_HK/core.po85
-rw-r--r--l10n/zh_HK/files.po75
-rw-r--r--l10n/zh_HK/files_encryption.po16
-rw-r--r--l10n/zh_HK/files_sharing.po4
-rw-r--r--l10n/zh_HK/files_trashbin.po26
-rw-r--r--l10n/zh_HK/lib.po58
-rw-r--r--l10n/zh_HK/settings.po88
-rw-r--r--l10n/zh_HK/user_ldap.po137
-rw-r--r--l10n/zh_TW/core.po89
-rw-r--r--l10n/zh_TW/files.po75
-rw-r--r--l10n/zh_TW/files_encryption.po18
-rw-r--r--l10n/zh_TW/files_sharing.po4
-rw-r--r--l10n/zh_TW/files_trashbin.po26
-rw-r--r--l10n/zh_TW/lib.po58
-rw-r--r--l10n/zh_TW/settings.po90
-rw-r--r--l10n/zh_TW/user_ldap.po143
-rw-r--r--l10n/zh_TW/user_webdavauth.po11
-rw-r--r--lib/app.php12
-rw-r--r--lib/archive.php2
-rw-r--r--lib/autoloader.php26
-rw-r--r--lib/base.php35
-rw-r--r--lib/cache/file.php20
-rw-r--r--lib/cache/fileglobal.php4
-rw-r--r--lib/connector/sabre/file.php12
-rw-r--r--lib/connector/sabre/objecttree.php2
-rw-r--r--lib/connector/sabre/principal.php14
-rw-r--r--lib/connector/sabre/quotaplugin.php2
-rw-r--r--lib/db.php403
-rw-r--r--lib/db/adapter.php72
-rw-r--r--lib/db/adapteroci8.php28
-rw-r--r--lib/db/adapterpgsql.php23
-rw-r--r--lib/db/adaptersqlite.php60
-rw-r--r--lib/db/adaptersqlsrv.php28
-rw-r--r--lib/db/connection.php197
-rw-r--r--lib/db/mdb2schemamanager.php8
-rw-r--r--lib/db/statementwrapper.php4
-rw-r--r--lib/fileproxy/quota.php114
-rw-r--r--lib/files/cache/scanner.php4
-rw-r--r--lib/files/filesystem.php17
-rw-r--r--lib/files/mount/manager.php7
-rw-r--r--lib/files/mount/mount.php7
-rw-r--r--lib/files/storage/common.php8
-rw-r--r--lib/files/storage/commontest.php2
-rw-r--r--lib/files/storage/local.php2
-rw-r--r--lib/files/storage/mappedlocal.php2
-rw-r--r--lib/files/storage/wrapper/quota.php104
-rw-r--r--lib/files/storage/wrapper/wrapper.php2
-rw-r--r--lib/files/stream/quota.php128
-rw-r--r--lib/files/type/detection.php121
-rw-r--r--lib/files/type/templatemanager.php46
-rw-r--r--lib/files/view.php2
-rw-r--r--lib/geo.php2
-rw-r--r--lib/group.php2
-rw-r--r--lib/helper.php444
-rw-r--r--lib/installer.php2
-rw-r--r--lib/l10n.php167
-rw-r--r--lib/l10n/af_ZA.php11
-rw-r--r--lib/l10n/ar.php16
-rw-r--r--lib/l10n/be.php8
-rw-r--r--lib/l10n/bg_BG.php16
-rw-r--r--lib/l10n/bn_BD.php13
-rw-r--r--lib/l10n/bs.php8
-rw-r--r--lib/l10n/ca.php16
-rw-r--r--lib/l10n/cs_CZ.php16
-rw-r--r--lib/l10n/cy_GB.php16
-rw-r--r--lib/l10n/da.php16
-rw-r--r--lib/l10n/de.php16
-rw-r--r--lib/l10n/de_AT.php8
-rw-r--r--lib/l10n/de_CH.php55
-rw-r--r--lib/l10n/de_DE.php16
-rw-r--r--lib/l10n/el.php16
-rw-r--r--lib/l10n/en@pirate.php10
-rw-r--r--lib/l10n/eo.php15
-rw-r--r--lib/l10n/es.php16
-rw-r--r--lib/l10n/es_AR.php16
-rw-r--r--lib/l10n/et_EE.php16
-rw-r--r--lib/l10n/eu.php16
-rw-r--r--lib/l10n/fa.php16
-rw-r--r--lib/l10n/fi.php4
-rw-r--r--lib/l10n/fi_FI.php17
-rw-r--r--lib/l10n/fr.php16
-rw-r--r--lib/l10n/gl.php16
-rw-r--r--lib/l10n/he.php15
-rw-r--r--lib/l10n/hi.php9
-rw-r--r--lib/l10n/hr.php9
-rw-r--r--lib/l10n/hu_HU.php16
-rw-r--r--lib/l10n/hy.php8
-rw-r--r--lib/l10n/ia.php11
-rw-r--r--lib/l10n/id.php16
-rw-r--r--lib/l10n/is.php15
-rw-r--r--lib/l10n/it.php16
-rw-r--r--lib/l10n/ja_JP.php20
-rw-r--r--lib/l10n/ka.php12
-rw-r--r--lib/l10n/ka_GE.php16
-rw-r--r--lib/l10n/kn.php8
-rw-r--r--lib/l10n/ko.php16
-rw-r--r--lib/l10n/ku_IQ.php11
-rw-r--r--lib/l10n/lb.php11
-rw-r--r--lib/l10n/lt_LT.php15
-rw-r--r--lib/l10n/lv.php21
-rw-r--r--lib/l10n/mk.php15
-rw-r--r--lib/l10n/ml_IN.php8
-rw-r--r--lib/l10n/ms_MY.php11
-rw-r--r--lib/l10n/my_MM.php16
-rw-r--r--lib/l10n/nb_NO.php15
-rw-r--r--lib/l10n/ne.php8
-rw-r--r--lib/l10n/nl.php16
-rw-r--r--lib/l10n/nn_NO.php11
-rw-r--r--lib/l10n/oc.php12
-rw-r--r--lib/l10n/pl.php16
-rw-r--r--lib/l10n/pl_PL.php4
-rw-r--r--lib/l10n/pt_BR.php16
-rw-r--r--lib/l10n/pt_PT.php16
-rw-r--r--lib/l10n/ro.php18
-rw-r--r--lib/l10n/ru.php16
-rw-r--r--lib/l10n/ru_RU.php4
-rw-r--r--lib/l10n/si_LK.php12
-rw-r--r--lib/l10n/sk.php8
-rw-r--r--lib/l10n/sk_SK.php20
-rw-r--r--lib/l10n/sl.php16
-rw-r--r--lib/l10n/sq.php16
-rw-r--r--lib/l10n/sr.php16
-rw-r--r--lib/l10n/sr@latin.php11
-rw-r--r--lib/l10n/string.php39
-rw-r--r--lib/l10n/sv.php16
-rw-r--r--lib/l10n/sw_KE.php8
-rw-r--r--lib/l10n/ta_LK.php15
-rw-r--r--lib/l10n/te.php10
-rw-r--r--lib/l10n/th_TH.php16
-rw-r--r--lib/l10n/tr.php20
-rw-r--r--lib/l10n/ug.php15
-rw-r--r--lib/l10n/uk.php16
-rw-r--r--lib/l10n/ur_PK.php11
-rw-r--r--lib/l10n/vi.php16
-rw-r--r--lib/l10n/zh_CN.GB2312.php13
-rw-r--r--lib/l10n/zh_CN.php16
-rw-r--r--lib/l10n/zh_HK.php11
-rw-r--r--lib/l10n/zh_TW.php16
-rw-r--r--lib/memcache/factory.php29
-rw-r--r--lib/ocs/result.php2
-rw-r--r--lib/public/groupinterface.php2
-rw-r--r--lib/public/share.php16
-rw-r--r--lib/public/userinterface.php2
-rw-r--r--lib/public/util.php8
-rw-r--r--lib/template/functions.php10
-rw-r--r--lib/user.php1
-rw-r--r--lib/user/http.php2
-rw-r--r--lib/user/interface.php2
-rwxr-xr-xlib/util.php48
-rw-r--r--lib/vobject/compoundproperty.php2
-rw-r--r--lib/vobject/stringproperty.php2
-rw-r--r--ocs/routes.php2
-rw-r--r--public.php2
-rw-r--r--remote.php2
-rw-r--r--search/css/results.css2
-rwxr-xr-xsettings/admin.php2
-rw-r--r--settings/ajax/createuser.php2
-rw-r--r--settings/ajax/decryptall.php25
-rw-r--r--settings/ajax/getlog.php2
-rw-r--r--settings/ajax/setsecurity.php2
-rw-r--r--settings/ajax/updateapp.php2
-rw-r--r--settings/css/settings.css4
-rw-r--r--settings/help.php4
-rw-r--r--settings/img/apps.pngbin196 -> 259 bytes
-rw-r--r--settings/img/apps.svg22
-rw-r--r--settings/js/apps-custom.php2
-rw-r--r--settings/js/apps.js10
-rw-r--r--settings/js/isadmin.php2
-rw-r--r--settings/js/log.js3
-rw-r--r--settings/js/personal.js56
-rw-r--r--settings/js/users.js38
-rw-r--r--settings/l10n/af_ZA.php4
-rw-r--r--settings/l10n/ar.php5
-rw-r--r--settings/l10n/bg_BG.php5
-rw-r--r--settings/l10n/bn_BD.php5
-rw-r--r--settings/l10n/bs.php4
-rw-r--r--settings/l10n/ca.php9
-rw-r--r--settings/l10n/cs_CZ.php9
-rw-r--r--settings/l10n/cy_GB.php5
-rw-r--r--settings/l10n/da.php9
-rw-r--r--settings/l10n/de.php9
-rw-r--r--settings/l10n/de_CH.php119
-rw-r--r--settings/l10n/de_DE.php9
-rw-r--r--settings/l10n/el.php5
-rw-r--r--settings/l10n/en@pirate.php4
-rw-r--r--settings/l10n/eo.php5
-rw-r--r--settings/l10n/es.php5
-rw-r--r--settings/l10n/es_AR.php5
-rw-r--r--settings/l10n/et_EE.php9
-rw-r--r--settings/l10n/eu.php5
-rw-r--r--settings/l10n/fa.php5
-rw-r--r--settings/l10n/fi_FI.php8
-rw-r--r--settings/l10n/fr.php5
-rw-r--r--settings/l10n/gl.php9
-rw-r--r--settings/l10n/he.php5
-rw-r--r--settings/l10n/hi.php4
-rw-r--r--settings/l10n/hr.php4
-rw-r--r--settings/l10n/hu_HU.php5
-rw-r--r--settings/l10n/hy.php4
-rw-r--r--settings/l10n/ia.php4
-rw-r--r--settings/l10n/id.php5
-rw-r--r--settings/l10n/is.php5
-rw-r--r--settings/l10n/it.php5
-rw-r--r--settings/l10n/ja_JP.php9
-rw-r--r--settings/l10n/ka.php4
-rw-r--r--settings/l10n/ka_GE.php5
-rw-r--r--settings/l10n/ko.php5
-rw-r--r--settings/l10n/ku_IQ.php5
-rw-r--r--settings/l10n/lb.php4
-rw-r--r--settings/l10n/lt_LT.php5
-rw-r--r--settings/l10n/lv.php19
-rw-r--r--settings/l10n/mk.php5
-rw-r--r--settings/l10n/ms_MY.php4
-rw-r--r--settings/l10n/my_MM.php4
-rw-r--r--settings/l10n/nb_NO.php5
-rw-r--r--settings/l10n/nl.php18
-rw-r--r--settings/l10n/nn_NO.php4
-rw-r--r--settings/l10n/oc.php4
-rw-r--r--settings/l10n/pl.php7
-rw-r--r--settings/l10n/pl_PL.php4
-rw-r--r--settings/l10n/pt_BR.php9
-rw-r--r--settings/l10n/pt_PT.php5
-rw-r--r--settings/l10n/ro.php5
-rw-r--r--settings/l10n/ru.php5
-rw-r--r--settings/l10n/ru_RU.php9
-rw-r--r--settings/l10n/si_LK.php5
-rw-r--r--settings/l10n/sk_SK.php18
-rw-r--r--settings/l10n/sl.php5
-rw-r--r--settings/l10n/sq.php4
-rw-r--r--settings/l10n/sr.php5
-rw-r--r--settings/l10n/sr@latin.php4
-rw-r--r--settings/l10n/sv.php9
-rw-r--r--settings/l10n/ta_LK.php5
-rw-r--r--settings/l10n/te.php4
-rw-r--r--settings/l10n/th_TH.php5
-rw-r--r--settings/l10n/tr.php14
-rw-r--r--settings/l10n/ug.php5
-rw-r--r--settings/l10n/uk.php5
-rw-r--r--settings/l10n/ur_PK.php4
-rw-r--r--settings/l10n/vi.php5
-rw-r--r--settings/l10n/zh_CN.GB2312.php5
-rw-r--r--settings/l10n/zh_CN.php16
-rw-r--r--settings/l10n/zh_HK.php5
-rw-r--r--settings/l10n/zh_TW.php5
-rw-r--r--settings/languageCodes.php1
-rw-r--r--settings/personal.php4
-rw-r--r--settings/routes.php2
-rw-r--r--settings/templates/admin.php20
-rw-r--r--settings/templates/personal.php30
-rw-r--r--settings/templates/users.php6
-rw-r--r--settings/users.php15
-rw-r--r--status.php2
-rw-r--r--tests/data/l10n/cs.php5
-rw-r--r--tests/data/l10n/de.php5
-rw-r--r--tests/data/l10n/ru.php5
-rw-r--r--tests/lib/app.php2
-rw-r--r--tests/lib/archive/zip.php2
-rw-r--r--tests/lib/db.php2
-rw-r--r--tests/lib/files/cache/scanner.php18
-rw-r--r--tests/lib/files/storage/wrapper/quota.php61
-rw-r--r--tests/lib/files/storage/wrapper/wrapper.php (renamed from tests/lib/files/storage/wrapper.php)4
-rw-r--r--tests/lib/files/stream/quota.php78
-rw-r--r--tests/lib/files/utils/scanner.php74
-rw-r--r--tests/lib/geo.php2
-rw-r--r--tests/lib/l10n.php67
-rw-r--r--tests/lib/preferences.php11
-rw-r--r--tests/lib/vobject.php2
1613 files changed, 28175 insertions, 29093 deletions
diff --git a/AUTHORS b/AUTHORS
index c30a6bf426b..7e0d8f6587b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,4 +28,4 @@ With help from many libraries and frameworks including:
"Lock” symbol from thenounproject.com collection
-"Clock” symbol by Brandon Hopkins, from thenounproject.com collection \ No newline at end of file
+"Clock” symbol by Brandon Hopkins, from thenounproject.com collection
diff --git a/COPYING-README b/COPYING-README
index 49e035186ed..8c26709d767 100644
--- a/COPYING-README
+++ b/COPYING-README
@@ -12,4 +12,4 @@ Licensing of components:
All unmodified files from these and other sources retain their original copyright
and license notices: see the relevant individual files.
-Attribution information for ownCloud is contained in the AUTHORS file. \ No newline at end of file
+Attribution information for ownCloud is contained in the AUTHORS file.
diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php
index 7c8dcb372e2..6a34cbe4ef1 100644
--- a/apps/files/ajax/download.php
+++ b/apps/files/ajax/download.php
@@ -35,8 +35,8 @@ $dir = $_GET["dir"];
$files_list = json_decode($files);
// in case we get only a single file
-if ($files_list === NULL ) {
+if (!is_array($files_list)) {
$files_list = array($files);
}
-OC_Files::get($dir, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+OC_Files::get($dir, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD');
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index 878e4cb2159..c50e96b2429 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -10,7 +10,7 @@ OCP\JSON::checkLoggedIn();
// Load the files
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
-$doBreadcrumb = isset( $_GET['breadcrumb'] ) ? true : false;
+$doBreadcrumb = isset($_GET['breadcrumb']);
$data = array();
// Make breadcrumb
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 8548fc95ddf..d224e79d01b 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -54,6 +54,8 @@ function progress($notification_code, $severity, $message, $message_code, $bytes
}
}
+$target = $dir.'/'.$filename;
+
if($source) {
if(substr($source, 0, 8)!='https://' and substr($source, 0, 7)!='http://') {
OCP\JSON::error(array("data" => array( "message" => "Not a valid source" )));
@@ -62,7 +64,6 @@ if($source) {
$ctx = stream_context_create(null, array('notification' =>'progress'));
$sourceStream=fopen($source, 'rb', false, $ctx);
- $target=$dir.'/'.$filename;
$result=\OC\Files\Filesystem::file_put_contents($target, $sourceStream);
if($result) {
$meta = \OC\Files\Filesystem::getFileInfo($target);
@@ -75,20 +76,32 @@ if($source) {
$eventSource->close();
exit();
} else {
+ $success = false;
+ if (!$content) {
+ $templateManager = OC_Helper::getFileTemplateManager();
+ $mimeType = OC_Helper::getMimeType($target);
+ $content = $templateManager->getTemplate($mimeType);
+ }
+
if($content) {
- if(\OC\Files\Filesystem::file_put_contents($dir.'/'.$filename, $content)) {
- $meta = \OC\Files\Filesystem::getFileInfo($dir.'/'.$filename);
- $id = $meta['fileid'];
- OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id)));
- exit();
- }
- }elseif(\OC\Files\Filesystem::touch($dir . '/' . $filename)) {
- $meta = \OC\Files\Filesystem::getFileInfo($dir.'/'.$filename);
+ $success = \OC\Files\Filesystem::file_put_contents($target, $content);
+ } else {
+ $success = \OC\Files\Filesystem::touch($target);
+ }
+
+ if($success) {
+ $meta = \OC\Files\Filesystem::getFileInfo($target);
$id = $meta['fileid'];
- OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id, 'mime' => $meta['mimetype'])));
+ $mime = $meta['mimetype'];
+ $size = $meta['size'];
+ OCP\JSON::success(array('data' => array(
+ 'id' => $id,
+ 'mime' => $mime,
+ 'size' => $size,
+ 'content' => $content,
+ )));
exit();
}
}
-
OCP\JSON::error(array("data" => array( "message" => "Error when creating the file" )));
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php
index f4551858283..5b07c306af8 100644
--- a/apps/files/ajax/rename.php
+++ b/apps/files/ajax/rename.php
@@ -38,4 +38,4 @@ if($result['success'] === true){
OCP\JSON::success(array('data' => $result['data']));
} else {
OCP\JSON::error(array('data' => $result['data']));
-} \ No newline at end of file
+}
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 99739cb4cee..bd3245ded3f 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -5,11 +5,11 @@ $l = OC_L10N::get('files');
OCP\App::registerAdmin('files', 'admin');
-OCP\App::addNavigationEntry( array( "id" => "files_index",
- "order" => 0,
- "href" => OCP\Util::linkTo( "files", "index.php" ),
- "icon" => OCP\Util::imagePath( "core", "places/files.svg" ),
- "name" => $l->t("Files") ));
+OCP\App::addNavigationEntry(array("id" => "files_index",
+ "order" => 0,
+ "href" => OCP\Util::linkTo("files", "index.php"),
+ "icon" => OCP\Util::imagePath("core", "places/files.svg"),
+ "name" => $l->t("Files")));
OC_Search::registerProvider('OC_Search_Provider_File');
@@ -21,3 +21,9 @@ OC_Search::registerProvider('OC_Search_Provider_File');
\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
\OCP\BackgroundJob::addRegularTask('\OC\Files\Cache\BackgroundWatcher', 'checkNext');
+
+$templateManager = OC_Helper::getFileTemplateManager();
+$templateManager->registerTemplate('text/html', 'core/templates/filetemplates/template.html');
+$templateManager->registerTemplate('application/vnd.oasis.opendocument.presentation', 'core/templates/filetemplates/template.odp');
+$templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
+$templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php
index fcd5f4b2608..f3d8e9a4f4d 100644
--- a/apps/files/appinfo/routes.php
+++ b/apps/files/appinfo/routes.php
@@ -11,4 +11,4 @@ $this->create('download', 'download{file}')
->actionInclude('files/download.php');
// Register with the capabilities API
-OC_API::register('get', '/cloud/capabilities', array('OCA\Files\Capabilities', 'getCapabilities'), 'files', OC_API::USER_AUTH); \ No newline at end of file
+OC_API::register('get', '/cloud/capabilities', array('OCA\Files\Capabilities', 'getCapabilities'), 'files', OC_API::USER_AUTH);
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 117aac4c93e..a2cf8398c27 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -46,12 +46,22 @@
z-index:20; position:relative; cursor:pointer; overflow:hidden;
}
-#uploadprogresswrapper { float: right; position: relative; }
-#uploadprogresswrapper #uploadprogressbar {
- position:relative; float: right;
- margin-left: 12px; width:10em; height:1.5em; top:.4em;
+#uploadprogresswrapper {
+ position: relative;
+ display: inline;
+}
+#uploadprogressbar {
+ position:relative;
+ float: left;
+ margin-left: 12px;
+ width: 130px;
+ height: 26px;
display:inline-block;
}
+#uploadprogressbar + stop {
+ font-size: 13px;
+}
+
/* FILE TABLE */
@@ -114,7 +124,7 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
position:relative; width:100%;
-webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms;
}
-#select_all { float:left; margin:.3em 0.6em 0 .5em; }
+#select_all { float:left; margin:.4em 0.6em 0 .5em; }
#uploadsize-message,#delete-confirm { display:none; }
/* File actions */
@@ -147,14 +157,14 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
display:none;
}
#fileList tr:hover a.action, #fileList a.action.permanent {
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=.5)";
- filter: alpha(opacity=.5);
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+ filter: alpha(opacity=50);
opacity: .5;
display:inline;
}
#fileList tr:hover a.action:hover {
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=1)";
- filter: alpha(opacity=1);
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+ filter: alpha(opacity=100);
opacity: 1;
display:inline;
}
diff --git a/apps/files/index.php b/apps/files/index.php
index 4f9e881eb2d..94c792303da 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -150,5 +150,6 @@ if ($needUpgrade) {
$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
$tmpl->assign('isPublic', false);
$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
+ $tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
$tmpl->printPage();
}
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 942a07dfccc..49e464b810a 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -1,343 +1,344 @@
$(document).ready(function() {
- file_upload_param = {
- dropZone: $('#content'), // restrict dropZone to content div
- //singleFileUploads is on by default, so the data.files array will always have length 1
- add: function(e, data) {
+ var file_upload_param = {
+ dropZone: $('#content'), // restrict dropZone to content div
+ //singleFileUploads is on by default, so the data.files array will always have length 1
+ add: function(e, data) {
- if(data.files[0].type === '' && data.files[0].size == 4096)
- {
- data.textStatus = 'dirorzero';
- data.errorThrown = t('files','Unable to upload your file as it is a directory or has 0 bytes');
- var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
- fu._trigger('fail', e, data);
- return true; //don't upload this file but go on with next in queue
- }
+ if(data.files[0].type === '' && data.files[0].size == 4096)
+ {
+ data.textStatus = 'dirorzero';
+ data.errorThrown = t('files','Unable to upload your file as it is a directory or has 0 bytes');
+ var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+ fu._trigger('fail', e, data);
+ return true; //don't upload this file but go on with next in queue
+ }
- var totalSize=0;
- $.each(data.originalFiles, function(i,file){
- totalSize+=file.size;
- });
+ var totalSize=0;
+ $.each(data.originalFiles, function(i,file){
+ totalSize+=file.size;
+ });
- if(totalSize>$('#max_upload').val()){
- data.textStatus = 'notenoughspace';
- data.errorThrown = t('files','Not enough space available');
- var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
- fu._trigger('fail', e, data);
- return false; //don't upload anything
- }
+ if(totalSize>$('#max_upload').val()){
+ data.textStatus = 'notenoughspace';
+ data.errorThrown = t('files','Not enough space available');
+ var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+ fu._trigger('fail', e, data);
+ return false; //don't upload anything
+ }
- // start the actual file upload
- var jqXHR = data.submit();
+ // start the actual file upload
+ var jqXHR = data.submit();
- // remember jqXHR to show warning to user when he navigates away but an upload is still in progress
- if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
- var dirName = data.context.data('file');
- if(typeof uploadingFiles[dirName] === 'undefined') {
- uploadingFiles[dirName] = {};
- }
- uploadingFiles[dirName][data.files[0].name] = jqXHR;
- } else {
- uploadingFiles[data.files[0].name] = jqXHR;
- }
+ // remember jqXHR to show warning to user when he navigates away but an upload is still in progress
+ if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
+ var dirName = data.context.data('file');
+ if(typeof uploadingFiles[dirName] === 'undefined') {
+ uploadingFiles[dirName] = {};
+ }
+ uploadingFiles[dirName][data.files[0].name] = jqXHR;
+ } else {
+ uploadingFiles[data.files[0].name] = jqXHR;
+ }
- //show cancel button
- if($('html.lte9').length === 0 && data.dataType !== 'iframe') {
- $('#uploadprogresswrapper input.stop').show();
- }
- },
- /**
- * called after the first add, does NOT have the data param
- * @param e
- */
- start: function(e) {
- //IE < 10 does not fire the necessary events for the progress bar.
- if($('html.lte9').length > 0) {
- return;
- }
- $('#uploadprogressbar').progressbar({value:0});
- $('#uploadprogressbar').fadeIn();
- },
- fail: function(e, data) {
- if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
- if (data.textStatus === 'abort') {
- $('#notification').text(t('files', 'Upload cancelled.'));
- } else {
- // HTTP connection problem
- $('#notification').text(data.errorThrown);
- }
- $('#notification').fadeIn();
- //hide notification after 5 sec
- setTimeout(function() {
- $('#notification').fadeOut();
- }, 5000);
- }
- delete uploadingFiles[data.files[0].name];
- },
- progress: function(e, data) {
- // TODO: show nice progress bar in file row
- },
- progressall: function(e, data) {
- //IE < 10 does not fire the necessary events for the progress bar.
- if($('html.lte9').length > 0) {
- return;
- }
- var progress = (data.loaded/data.total)*100;
- $('#uploadprogressbar').progressbar('value',progress);
- },
- /**
- * called for every successful upload
- * @param e
- * @param data
- */
- done:function(e, data) {
- // handle different responses (json or body from iframe for ie)
- var response;
- if (typeof data.result === 'string') {
- response = data.result;
- } else {
- //fetch response from iframe
- response = data.result[0].body.innerText;
- }
- var result=$.parseJSON(response);
+ //show cancel button
+ if($('html.lte9').length === 0 && data.dataType !== 'iframe') {
+ $('#uploadprogresswrapper input.stop').show();
+ }
+ },
+ /**
+ * called after the first add, does NOT have the data param
+ * @param e
+ */
+ start: function(e) {
+ //IE < 10 does not fire the necessary events for the progress bar.
+ if($('html.lte9').length > 0) {
+ return;
+ }
+ $('#uploadprogressbar').progressbar({value:0});
+ $('#uploadprogressbar').fadeIn();
+ },
+ fail: function(e, data) {
+ if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
+ if (data.textStatus === 'abort') {
+ $('#notification').text(t('files', 'Upload cancelled.'));
+ } else {
+ // HTTP connection problem
+ $('#notification').text(data.errorThrown);
+ }
+ $('#notification').fadeIn();
+ //hide notification after 5 sec
+ setTimeout(function() {
+ $('#notification').fadeOut();
+ }, 5000);
+ }
+ delete uploadingFiles[data.files[0].name];
+ },
+ progress: function(e, data) {
+ // TODO: show nice progress bar in file row
+ },
+ progressall: function(e, data) {
+ //IE < 10 does not fire the necessary events for the progress bar.
+ if($('html.lte9').length > 0) {
+ return;
+ }
+ var progress = (data.loaded/data.total)*100;
+ $('#uploadprogressbar').progressbar('value',progress);
+ },
+ /**
+ * called for every successful upload
+ * @param e
+ * @param data
+ */
+ done:function(e, data) {
+ // handle different responses (json or body from iframe for ie)
+ var response;
+ if (typeof data.result === 'string') {
+ response = data.result;
+ } else {
+ //fetch response from iframe
+ response = data.result[0].body.innerText;
+ }
+ var result=$.parseJSON(response);
- if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
- var file = result[0];
- } else {
- data.textStatus = 'servererror';
- data.errorThrown = t('files', result.data.message);
- var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
- fu._trigger('fail', e, data);
- }
+ if(typeof result[0] !== 'undefined' && result[0].status === 'success') {
+ var file = result[0];
+ } else {
+ data.textStatus = 'servererror';
+ data.errorThrown = t('files', result.data.message);
+ var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+ fu._trigger('fail', e, data);
+ }
- var filename = result[0].originalname;
+ var filename = result[0].originalname;
- // delete jqXHR reference
- if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
- var dirName = data.context.data('file');
- delete uploadingFiles[dirName][filename];
- if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
- delete uploadingFiles[dirName];
- }
- } else {
- delete uploadingFiles[filename];
- }
+ // delete jqXHR reference
+ if (typeof data.context !== 'undefined' && data.context.data('type') === 'dir') {
+ var dirName = data.context.data('file');
+ delete uploadingFiles[dirName][filename];
+ if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
+ delete uploadingFiles[dirName];
+ }
+ } else {
+ delete uploadingFiles[filename];
+ }
- },
- /**
- * called after last upload
- * @param e
- * @param data
- */
- stop: function(e, data) {
- if(data.dataType !== 'iframe') {
- $('#uploadprogresswrapper input.stop').hide();
- }
+ },
+ /**
+ * called after last upload
+ * @param e
+ * @param data
+ */
+ stop: function(e, data) {
+ if(data.dataType !== 'iframe') {
+ $('#uploadprogresswrapper input.stop').hide();
+ }
- //IE < 10 does not fire the necessary events for the progress bar.
- if($('html.lte9').length > 0) {
- return;
- }
+ //IE < 10 does not fire the necessary events for the progress bar.
+ if($('html.lte9').length > 0) {
+ return;
+ }
- $('#uploadprogressbar').progressbar('value',100);
- $('#uploadprogressbar').fadeOut();
- }
- }
- var file_upload_handler = function() {
- $('#file_upload_start').fileupload(file_upload_param);
- };
+ $('#uploadprogressbar').progressbar('value',100);
+ $('#uploadprogressbar').fadeOut();
+ }
+ };
+ var file_upload_handler = function() {
+ $('#file_upload_start').fileupload(file_upload_param);
+ };
- if ( document.getElementById('data-upload-form') ) {
- $(file_upload_handler);
- }
- $.assocArraySize = function(obj) {
- // http://stackoverflow.com/a/6700/11236
- var size = 0, key;
- for (key in obj) {
- if (obj.hasOwnProperty(key)) size++;
+ if ( document.getElementById('data-upload-form') ) {
+ $(file_upload_handler);
}
- return size;
- };
-
- // warn user not to leave the page while upload is in progress
- $(window).bind('beforeunload', function(e) {
- if ($.assocArraySize(uploadingFiles) > 0)
- return t('files','File upload is in progress. Leaving the page now will cancel the upload.');
- });
+ $.assocArraySize = function(obj) {
+ // http://stackoverflow.com/a/6700/11236
+ var size = 0, key;
+ for (key in obj) {
+ if (obj.hasOwnProperty(key)) size++;
+ }
+ return size;
+ };
- //add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
- if(navigator.userAgent.search(/konqueror/i)==-1){
- $('#file_upload_start').attr('multiple','multiple')
- }
+ // warn user not to leave the page while upload is in progress
+ $(window).bind('beforeunload', function(e) {
+ if ($.assocArraySize(uploadingFiles) > 0) {
+ return t('files','File upload is in progress. Leaving the page now will cancel the upload.');
+ }
+ });
- //if the breadcrumb is to long, start by replacing foldernames with '...' except for the current folder
- var crumb=$('div.crumb').first();
- while($('div.controls').height()>40 && crumb.next('div.crumb').length>0){
- crumb.children('a').text('...');
- crumb=crumb.next('div.crumb');
- }
- //if that isn't enough, start removing items from the breacrumb except for the current folder and it's parent
- var crumb=$('div.crumb').first();
- var next=crumb.next('div.crumb');
- while($('div.controls').height()>40 && next.next('div.crumb').length>0){
- crumb.remove();
- crumb=next;
- next=crumb.next('div.crumb');
- }
- //still not enough, start shorting down the current folder name
- var crumb=$('div.crumb>a').last();
- while($('div.controls').height()>40 && crumb.text().length>6){
- var text=crumb.text()
- text=text.substr(0,text.length-6)+'...';
- crumb.text(text);
- }
+ //add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
+ if(navigator.userAgent.search(/konqueror/i)==-1){
+ $('#file_upload_start').attr('multiple','multiple');
+ }
- $(document).click(function(){
- $('#new>ul').hide();
- $('#new').removeClass('active');
- $('#new li').each(function(i,element){
- if($(element).children('p').length==0){
- $(element).children('form').remove();
- $(element).append('<p>'+$(element).data('text')+'</p>');
- }
- });
- });
- $('#new li').click(function(){
- if($(this).children('p').length==0){
- return;
+ //if the breadcrumb is to long, start by replacing foldernames with '...' except for the current folder
+ var crumb=$('div.crumb').first();
+ while($('div.controls').height()>40 && crumb.next('div.crumb').length>0){
+ crumb.children('a').text('...');
+ crumb=crumb.next('div.crumb');
+ }
+ //if that isn't enough, start removing items from the breacrumb except for the current folder and it's parent
+ var crumb=$('div.crumb').first();
+ var next=crumb.next('div.crumb');
+ while($('div.controls').height()>40 && next.next('div.crumb').length>0){
+ crumb.remove();
+ crumb=next;
+ next=crumb.next('div.crumb');
+ }
+ //still not enough, start shorting down the current folder name
+ var crumb=$('div.crumb>a').last();
+ while($('div.controls').height()>40 && crumb.text().length>6){
+ var text=crumb.text()
+ text=text.substr(0,text.length-6)+'...';
+ crumb.text(text);
}
- $('#new li').each(function(i,element){
- if($(element).children('p').length==0){
- $(element).children('form').remove();
- $(element).append('<p>'+$(element).data('text')+'</p>');
- }
+ $(document).click(function(){
+ $('#new>ul').hide();
+ $('#new').removeClass('active');
+ $('#new li').each(function(i,element){
+ if($(element).children('p').length==0){
+ $(element).children('form').remove();
+ $(element).append('<p>'+$(element).data('text')+'</p>');
+ }
+ });
});
+ $('#new li').click(function(){
+ if($(this).children('p').length==0){
+ return;
+ }
- var type=$(this).data('type');
- var text=$(this).children('p').text();
- $(this).data('text',text);
- $(this).children('p').remove();
- var form=$('<form></form>');
- var input=$('<input>');
- form.append(input);
- $(this).append(form);
- input.focus();
- form.submit(function(event){
- event.stopPropagation();
- event.preventDefault();
- var newname=input.val();
- if(type == 'web' && newname.length == 0) {
- OC.Notification.show(t('files', 'URL cannot be empty.'));
- return false;
- } else if (type != 'web' && !Files.isFileNameValid(newname)) {
- return false;
- } else if( type == 'folder' && $('#dir').val() == '/' && newname == 'Shared') {
- OC.Notification.show(t('files','Invalid folder name. Usage of \'Shared\' is reserved by ownCloud'));
- return false;
- }
- if (FileList.lastAction) {
- FileList.lastAction();
- }
- var name = getUniqueName(newname);
- if (newname != name) {
- FileList.checkName(name, newname, true);
- var hidden = true;
- } else {
- var hidden = false;
- }
- switch(type){
- case 'file':
- $.post(
- OC.filePath('files','ajax','newfile.php'),
- {dir:$('#dir').val(),filename:name},
- function(result){
- if (result.status == 'success') {
- var date=new Date();
- FileList.addFile(name,0,date,false,hidden);
- var tr=$('tr').filterAttr('data-file',name);
- tr.attr('data-mime',result.data.mime);
- tr.attr('data-id', result.data.id);
- getMimeIcon(result.data.mime,function(path){
- tr.find('td.filename').attr('style','background-image:url('+path+')');
- });
- } else {
- OC.dialogs.alert(result.data.message, t('core', 'Error'));
+ $('#new li').each(function(i,element){
+ if($(element).children('p').length==0){
+ $(element).children('form').remove();
+ $(element).append('<p>'+$(element).data('text')+'</p>');
}
- }
- );
- break;
- case 'folder':
- $.post(
- OC.filePath('files','ajax','newfolder.php'),
- {dir:$('#dir').val(),foldername:name},
- function(result){
- if (result.status == 'success') {
- var date=new Date();
- FileList.addDir(name,0,date,hidden);
- var tr=$('tr').filterAttr('data-file',name);
- tr.attr('data-id', result.data.id);
+ });
+
+ var type=$(this).data('type');
+ var text=$(this).children('p').text();
+ $(this).data('text',text);
+ $(this).children('p').remove();
+ var form=$('<form></form>');
+ var input=$('<input>');
+ form.append(input);
+ $(this).append(form);
+ input.focus();
+ form.submit(function(event){
+ event.stopPropagation();
+ event.preventDefault();
+ var newname=input.val();
+ if(type == 'web' && newname.length == 0) {
+ OC.Notification.show(t('files', 'URL cannot be empty.'));
+ return false;
+ } else if (type != 'web' && !Files.isFileNameValid(newname)) {
+ return false;
+ } else if( type == 'folder' && $('#dir').val() == '/' && newname == 'Shared') {
+ OC.Notification.show(t('files','Invalid folder name. Usage of \'Shared\' is reserved by ownCloud'));
+ return false;
+ }
+ if (FileList.lastAction) {
+ FileList.lastAction();
+ }
+ var name = getUniqueName(newname);
+ if (newname != name) {
+ FileList.checkName(name, newname, true);
+ var hidden = true;
} else {
- OC.dialogs.alert(result.data.message, t('core', 'Error'));
+ var hidden = false;
}
- }
- );
- break;
- case 'web':
- if(name.substr(0,8)!='https://' && name.substr(0,7)!='http://'){
- name='http://'+name;
- }
- var localName=name;
- if(localName.substr(localName.length-1,1)=='/'){//strip /
- localName=localName.substr(0,localName.length-1)
- }
- if(localName.indexOf('/')){//use last part of url
- localName=localName.split('/').pop();
- } else { //or the domain
- localName=(localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.','');
- }
- localName = getUniqueName(localName);
- //IE < 10 does not fire the necessary events for the progress bar.
- if($('html.lte9').length > 0) {
- } else {
- $('#uploadprogressbar').progressbar({value:0});
- $('#uploadprogressbar').fadeIn();
- }
+ switch(type){
+ case 'file':
+ $.post(
+ OC.filePath('files','ajax','newfile.php'),
+ {dir:$('#dir').val(),filename:name},
+ function(result){
+ if (result.status == 'success') {
+ var date=new Date();
+ FileList.addFile(name,0,date,false,hidden);
+ var tr=$('tr').filterAttr('data-file',name);
+ tr.attr('data-size',result.data.size);
+ tr.attr('data-mime',result.data.mime);
+ tr.attr('data-id', result.data.id);
+ tr.find('.filesize').text(humanFileSize(result.data.size));
+ getMimeIcon(result.data.mime,function(path){
+ tr.find('td.filename').attr('style','background-image:url('+path+')');
+ });
+ } else {
+ OC.dialogs.alert(result.data.message, t('core', 'Error'));
+ }
+ }
+ );
+ break;
+ case 'folder':
+ $.post(
+ OC.filePath('files','ajax','newfolder.php'),
+ {dir:$('#dir').val(),foldername:name},
+ function(result){
+ if (result.status == 'success') {
+ var date=new Date();
+ FileList.addDir(name,0,date,hidden);
+ var tr=$('tr').filterAttr('data-file',name);
+ tr.attr('data-id', result.data.id);
+ } else {
+ OC.dialogs.alert(result.data.message, t('core', 'Error'));
+ }
+ }
+ );
+ break;
+ case 'web':
+ if(name.substr(0,8)!='https://' && name.substr(0,7)!='http://'){
+ name='http://'+name;
+ }
+ var localName=name;
+ if(localName.substr(localName.length-1,1)=='/'){//strip /
+ localName=localName.substr(0,localName.length-1)
+ }
+ if(localName.indexOf('/')){//use last part of url
+ localName=localName.split('/').pop();
+ } else { //or the domain
+ localName=(localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.','');
+ }
+ localName = getUniqueName(localName);
+ //IE < 10 does not fire the necessary events for the progress bar.
+ if($('html.lte9').length === 0) {
+ $('#uploadprogressbar').progressbar({value:0});
+ $('#uploadprogressbar').fadeIn();
+ }
- var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
- eventSource.listen('progress',function(progress){
- //IE < 10 does not fire the necessary events for the progress bar.
- if($('html.lte9').length > 0) {
- } else {
- $('#uploadprogressbar').progressbar('value',progress);
- }
- });
- eventSource.listen('success',function(data){
- var mime=data.mime;
- var size=data.size;
- var id=data.id;
- $('#uploadprogressbar').fadeOut();
- var date=new Date();
- FileList.addFile(localName,size,date,false,hidden);
- var tr=$('tr').filterAttr('data-file',localName);
- tr.data('mime',mime).data('id',id);
- tr.attr('data-id', id);
- getMimeIcon(mime,function(path){
- tr.find('td.filename').attr('style','background-image:url('+path+')');
- });
- });
- eventSource.listen('error',function(error){
- $('#uploadprogressbar').fadeOut();
- alert(error);
+ var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
+ eventSource.listen('progress',function(progress){
+ //IE < 10 does not fire the necessary events for the progress bar.
+ if($('html.lte9').length === 0) {
+ $('#uploadprogressbar').progressbar('value',progress);
+ }
+ });
+ eventSource.listen('success',function(data){
+ var mime=data.mime;
+ var size=data.size;
+ var id=data.id;
+ $('#uploadprogressbar').fadeOut();
+ var date=new Date();
+ FileList.addFile(localName,size,date,false,hidden);
+ var tr=$('tr').filterAttr('data-file',localName);
+ tr.data('mime',mime).data('id',id);
+ tr.attr('data-id', id);
+ getMimeIcon(mime,function(path){
+ tr.find('td.filename').attr('style','background-image:url('+path+')');
+ });
+ });
+ eventSource.listen('error',function(error){
+ $('#uploadprogressbar').fadeOut();
+ alert(error);
+ });
+ break;
+ }
+ var li=form.parent();
+ form.remove();
+ li.append('<p>'+li.data('text')+'</p>');
+ $('#new>a').click();
});
- break;
- }
- var li=form.parent();
- form.remove();
- li.append('<p>'+li.data('text')+'</p>');
- $('#new>a').click();
});
- });
});
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index aa66a57a7b5..097fe521aa6 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -65,7 +65,7 @@ var FileActions = {
FileActions.currentFile = parent;
var actions = FileActions.get(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
var file = FileActions.getCurrentFile();
- if ($('tr').filterAttr('data-file', file).data('renaming')) {
+ if ($('tr[data-file="'+file+'"]').data('renaming')) {
return;
}
parent.children('a.name').append('<span class="fileactions" />');
@@ -123,14 +123,11 @@ var FileActions = {
img = img(file);
}
if (typeof trashBinApp !== 'undefined' && trashBinApp) {
- var html = '<a href="#" original-title="' + t('files', 'Delete permanently') + '" class="action delete" />';
+ var html = '<a href="#" original-title="' + t('files', 'Delete permanently') + '" class="action delete delete-icon" />';
} else {
- var html = '<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" />';
+ var html = '<a href="#" class="action delete delete-icon" />';
}
var element = $(html);
- if (img) {
- element.append($('<img class ="svg" src="' + img + '"/>'));
- }
element.data('action', actions['Delete']);
element.on('click', {a: null, elem: parent, actionFunc: actions['Delete']}, actionHandler);
parent.parent().children().last().append(element);
@@ -164,10 +161,11 @@ $(document).ready(function () {
window.location = OC.filePath('files', 'ajax', 'download.php') + '?files=' + encodeURIComponent(filename) + '&dir=' + encodeURIComponent($('#dir').val());
});
}
-
$('#fileList tr').each(function () {
FileActions.display($(this).children('td.filename'));
});
+
+ $('#fileList').trigger(jQuery.Event("fileActionsReady"));
});
@@ -200,7 +198,7 @@ FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
- var dir = $('#dir').val()
+ var dir = $('#dir').val();
if (dir !== '/') {
dir = dir + '/';
}
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index b858e2580ee..10801af3ead 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -15,7 +15,7 @@ var FileList={
// filename td
td = $('<td></td>').attr({
"class": "filename",
- "style": 'background-image:url('+iconurl+')'
+ "style": 'background-image:url('+iconurl+'); background-size: 16px;'
});
td.append('<input type="checkbox" />');
var link_elem = $('<a></a>').attr({
@@ -371,9 +371,7 @@ var FileList={
}
for (var i=0; i<files.length; i++) {
var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
- var oldHTML = deleteAction.html();
- var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'perform delete operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
- deleteAction.html(newHTML);
+ deleteAction.removeClass('delete-icon').addClass('progress-icon');
}
// Finish any existing actions
if (FileList.lastAction) {
@@ -395,8 +393,8 @@ var FileList={
checkTrashStatus();
} else {
$.each(files,function(index,file) {
- var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash");
- deleteAction.html(oldHTML);
+ var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
+ deleteAction.removeClass('progress-icon').addClass('delete-icon');
});
}
});
@@ -452,13 +450,14 @@ $(document).ready(function(){
var currentUploads = parseInt(uploadtext.attr('currentUploads'));
currentUploads += 1;
uploadtext.attr('currentUploads', currentUploads);
+ var translatedText = n('files', 'Uploading %n file', 'Uploading %n files', currentUploads);
if(currentUploads === 1) {
var img = OC.imagePath('core', 'loading.gif');
data.context.find('td.filename').attr('style','background-image:url('+img+')');
- uploadtext.text(t('files', '1 file uploading'));
+ uploadtext.text(translatedText);
uploadtext.show();
} else {
- uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
+ uploadtext.text(translatedText);
}
} else {
// add as stand-alone row to filelist
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 3fad3fae7d3..4eb949c2eef 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -81,9 +81,23 @@ Files={
if (usedSpacePercent > 90) {
OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)', {usedSpacePercent: usedSpacePercent}));
}
+ },
+
+ displayEncryptionWarning: function() {
+
+ if (!OC.Notification.isHidden()) {
+ return;
+ }
+
+ var encryptedFiles = $('#encryptedFiles').val();
+ if (encryptedFiles === '1') {
+ OC.Notification.show(t('files_encryption', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
+ return;
+ }
}
};
$(document).ready(function() {
+ Files.displayEncryptionWarning();
Files.bindKeyboardShortcuts(document, jQuery);
$('#fileList tr').each(function(){
//little hack to set unescape filenames in attribute
@@ -365,7 +379,9 @@ $(document).ready(function() {
FileList.addFile(name,0,date,false,hidden);
var tr=$('tr').filterAttr('data-file',name);
tr.attr('data-mime',result.data.mime);
+ tr.attr('data-size',result.data.size);
tr.attr('data-id', result.data.id);
+ tr.find('.filesize').text(humanFileSize(result.data.size));
getMimeIcon(result.data.mime,function(path){
tr.find('td.filename').attr('style','background-image:url('+path+')');
});
@@ -759,21 +775,13 @@ function procesSelection(){
$('#headerSize').text(humanFileSize(totalSize));
var selection='';
if(selectedFolders.length>0){
- if(selectedFolders.length==1){
- selection+=t('files','1 folder');
- }else{
- selection+=t('files','{count} folders',{count: selectedFolders.length});
- }
+ selection += n('files', '%n folder', '%n folders', selectedFolders.length);
if(selectedFiles.length>0){
selection+=' & ';
}
}
if(selectedFiles.length>0){
- if(selectedFiles.length==1){
- selection+=t('files','1 file');
- }else{
- selection+=t('files','{count} files',{count: selectedFiles.length});
- }
+ selection += n('files', '%n file', '%n files', selectedFiles.length);
}
$('#headerName>span.name').text(selection);
$('#modified').text('');
@@ -852,4 +860,4 @@ function checkTrashStatus() {
$("input[type=button][id=trash]").removeAttr("disabled");
}
});
-} \ No newline at end of file
+}
diff --git a/apps/files/js/keyboardshortcuts.js b/apps/files/js/keyboardshortcuts.js
index cc2b5d42139..9d6c3ae8c33 100644
--- a/apps/files/js/keyboardshortcuts.js
+++ b/apps/files/js/keyboardshortcuts.js
@@ -131,7 +131,9 @@ var Files = Files || {};
return;
}
var preventDefault = false;
- if ($.inArray(event.keyCode, keys) === -1) keys.push(event.keyCode);
+ if ($.inArray(event.keyCode, keys) === -1) {
+ keys.push(event.keyCode);
+ }
if (
$.inArray(keyCodes.n, keys) !== -1 && ($.inArray(keyCodes.cmdFirefox, keys) !== -1 || $.inArray(keyCodes.cmdOpera, keys) !== -1 || $.inArray(keyCodes.leftCmdWebKit, keys) !== -1 || $.inArray(keyCodes.rightCmdWebKit, keys) !== -1 || $.inArray(keyCodes.ctrl, keys) !== -1 || event.ctrlKey)) {
preventDefault = true; //new file/folder prevent browser from responding
@@ -165,4 +167,4 @@ var Files = Files || {};
removeA(keys, event.keyCode);
});
};
-})(Files); \ No newline at end of file
+})(Files);
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index e000bc966c1..7161e49a968 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم",
"Could not move %s" => "فشل في نقل %s",
"No file was uploaded. Unknown error" => "لم يتم رفع أي ملف , خطأ غير معروف",
@@ -19,7 +20,6 @@
"Error" => "خطأ",
"Share" => "شارك",
"Delete permanently" => "حذف بشكل دائم",
-"Delete" => "إلغاء",
"Rename" => "إعادة تسميه",
"Pending" => "قيد الانتظار",
"{new_name} already exists" => "{new_name} موجود مسبقا",
@@ -28,8 +28,7 @@
"cancel" => "إلغاء",
"replaced {new_name} with {old_name}" => "استبدل {new_name} بـ {old_name}",
"undo" => "تراجع",
-"perform delete operation" => "جاري تنفيذ عملية الحذف",
-"1 file uploading" => "جاري رفع 1 ملف",
+"_Uploading %n file_::_Uploading %n files_" => array("","","","","",""),
"'.' is an invalid file name." => "\".\" اسم ملف غير صحيح.",
"File name cannot be empty." => "اسم الملف لا يجوز أن يكون فارغا",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "اسم غير صحيح , الرموز '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها",
@@ -40,10 +39,8 @@
"Name" => "اسم",
"Size" => "حجم",
"Modified" => "معدل",
-"1 folder" => "مجلد عدد 1",
-"{count} folders" => "{count} مجلدات",
-"1 file" => "ملف واحد",
-"{count} files" => "{count} ملفات",
+"_%n folder_::_%n folders_" => array("","","","","",""),
+"_%n file_::_%n files_" => array("","","","","",""),
"Upload" => "رفع",
"File handling" => "التعامل مع الملف",
"Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
@@ -63,9 +60,11 @@
"Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرفع بعض الملفات!",
"Download" => "تحميل",
"Unshare" => "إلغاء مشاركة",
+"Delete" => "إلغاء",
"Upload too large" => "حجم الترفيع أعلى من المسموح",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم.",
"Files are being scanned, please wait." => "يرجى الانتظار , جاري فحص الملفات .",
"Current scanning" => "الفحص الحالي",
"Upgrading filesystem cache..." => "تحديث ذاكرة التخزين المؤقت(الكاش) الخاصة بملفات النظام ..."
);
+$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;";
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index f4424f92577..1e2104370ba 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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" => "Файлът е качен частично",
@@ -11,19 +12,17 @@
"Error" => "Грешка",
"Share" => "Споделяне",
"Delete permanently" => "Изтриване завинаги",
-"Delete" => "Изтриване",
"Rename" => "Преименуване",
"Pending" => "Чакащо",
"replace" => "препокриване",
"cancel" => "отказ",
"undo" => "възтановяване",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Name" => "Име",
"Size" => "Размер",
"Modified" => "Променено",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папки",
-"1 file" => "1 файл",
-"{count} files" => "{count} файла",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Upload" => "Качване",
"Maximum upload size" => "Максимален размер за качване",
"0 is unlimited" => "Ползвайте 0 за без ограничения",
@@ -34,8 +33,10 @@
"Cancel upload" => "Спри качването",
"Nothing in here. Upload something!" => "Няма нищо тук. Качете нещо.",
"Download" => "Изтегляне",
+"Delete" => "Изтриване",
"Upload too large" => "Файлът който сте избрали за качване е прекалено голям",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра.",
"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте.",
"file" => "файл"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index 6d755bccc8a..2f05a3eccf8 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s কে স্থানান্তর করা সম্ভব হলো না - এই নামের ফাইল বিদ্যমান",
"Could not move %s" => "%s কে স্থানান্তর করা সম্ভব হলো না",
"No file was uploaded. Unknown error" => "কোন ফাইল আপলোড করা হয় নি। সমস্যার কারণটি অজ্ঞাত।",
@@ -18,7 +19,6 @@
"URL cannot be empty." => "URL ফাঁকা রাখা যাবে না।",
"Error" => "সমস্যা",
"Share" => "ভাগাভাগি কর",
-"Delete" => "মুছে",
"Rename" => "পূনঃনামকরণ",
"Pending" => "মুলতুবি",
"{new_name} already exists" => "{new_name} টি বিদ্যমান",
@@ -27,7 +27,7 @@
"cancel" => "বাতিল",
"replaced {new_name} with {old_name}" => "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে",
"undo" => "ক্রিয়া প্রত্যাহার",
-"1 file uploading" => "১টি ফাইল আপলোড করা হচ্ছে",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"'.' is an invalid file name." => "টি একটি অননুমোদিত নাম।",
"File name cannot be empty." => "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "নামটি সঠিক নয়, '\\', '/', '<', '>', ':', '\"', '|', '?' এবং '*' অনুমোদিত নয়।",
@@ -35,10 +35,8 @@
"Name" => "রাম",
"Size" => "আকার",
"Modified" => "পরিবর্তিত",
-"1 folder" => "১টি ফোল্ডার",
-"{count} folders" => "{count} টি ফোল্ডার",
-"1 file" => "১টি ফাইল",
-"{count} files" => "{count} টি ফাইল",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Upload" => "আপলোড",
"File handling" => "ফাইল হ্যার্ডলিং",
"Maximum upload size" => "আপলোডের সর্বোচ্চ আকার",
@@ -56,8 +54,10 @@
"Nothing in here. Upload something!" => "এখানে কিছুই নেই। কিছু আপলোড করুন !",
"Download" => "ডাউনলোড",
"Unshare" => "ভাগাভাগি বাতিল ",
+"Delete" => "মুছে",
"Upload too large" => "আপলোডের আকারটি অনেক বড়",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন ",
"Files are being scanned, please wait." => "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।",
"Current scanning" => "বর্তমান স্ক্যানিং"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 8d5f69f3318..3429f572fd2 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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 set upload directory." => "No es pot establir la carpeta de pujada.",
@@ -23,7 +24,6 @@
"Error" => "Error",
"Share" => "Comparteix",
"Delete permanently" => "Esborra permanentment",
-"Delete" => "Esborra",
"Rename" => "Reanomena",
"Pending" => "Pendent",
"{new_name} already exists" => "{new_name} ja existeix",
@@ -32,23 +32,21 @@
"cancel" => "cancel·la",
"replaced {new_name} with {old_name}" => "s'ha substituït {old_name} per {new_name}",
"undo" => "desfés",
-"perform delete operation" => "executa d'operació d'esborrar",
-"1 file uploading" => "1 fitxer pujant",
+"_Uploading %n file_::_Uploading %n files_" => array("Pujant %n fitxer","Pujant %n fitxers"),
"files uploading" => "fitxers pujant",
"'.' 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.",
"Your storage is full, files can not be updated or synced anymore!" => "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden actualitzar o sincronitzar!",
"Your storage is almost full ({usedSpacePercent}%)" => "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers.",
"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.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud",
"Name" => "Nom",
"Size" => "Mida",
"Modified" => "Modificat",
-"1 folder" => "1 carpeta",
-"{count} folders" => "{count} carpetes",
-"1 file" => "1 fitxer",
-"{count} files" => "{count} fitxers",
+"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
+"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"),
"%s could not be renamed" => "%s no es pot canviar el nom",
"Upload" => "Puja",
"File handling" => "Gestió de fitxers",
@@ -69,6 +67,7 @@
"Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
"Download" => "Baixa",
"Unshare" => "Deixa de compartir",
+"Delete" => "Esborra",
"Upload too large" => "La pujada és massa gran",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
"Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu",
@@ -79,3 +78,4 @@
"files" => "fitxers",
"Upgrading filesystem cache..." => "Actualitzant la memòria de cau del sistema de fitxers..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index e87872a4a09..1f766de7cf6 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Nelze přesunout %s - již existuje soubor se stejným názvem",
"Could not move %s" => "Nelze přesunout %s",
"Unable to set upload directory." => "Nelze nastavit adresář pro nahrané soubory.",
@@ -23,7 +24,6 @@
"Error" => "Chyba",
"Share" => "Sdílet",
"Delete permanently" => "Trvale odstranit",
-"Delete" => "Smazat",
"Rename" => "Přejmenovat",
"Pending" => "Nevyřízené",
"{new_name} already exists" => "{new_name} již existuje",
@@ -32,23 +32,21 @@
"cancel" => "zrušit",
"replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
"undo" => "vrátit zpět",
-"perform delete operation" => "provést smazání",
-"1 file uploading" => "odesílá se 1 soubor",
+"_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"),
"files uploading" => "soubory se odesílají",
"'.' 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.",
"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrování bylo zrušeno, soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde si složky odšifrujete.",
"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.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatný název složky. Pojmenování 'Shared' je rezervováno pro vnitřní potřeby ownCloud",
"Name" => "Název",
"Size" => "Velikost",
"Modified" => "Upraveno",
-"1 folder" => "1 složka",
-"{count} folders" => "{count} složek",
-"1 file" => "1 soubor",
-"{count} files" => "{count} souborů",
+"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"),
+"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
"%s could not be renamed" => "%s nemůže být přejmenován",
"Upload" => "Odeslat",
"File handling" => "Zacházení se soubory",
@@ -69,6 +67,7 @@
"Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
"Download" => "Stáhnout",
"Unshare" => "Zrušit sdílení",
+"Delete" => "Smazat",
"Upload too large" => "Odesílaný soubor je příliš velký",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
"Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
@@ -79,3 +78,4 @@
"files" => "soubory",
"Upgrading filesystem cache..." => "Aktualizuji mezipaměť souborového systému..."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php
index 0aab1a18bc5..01c4613a8ce 100644
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli",
"Could not move %s" => "Methwyd symud %s",
"No file was uploaded. Unknown error" => "Ni lwythwyd ffeil i fyny. Gwall anhysbys.",
@@ -20,7 +21,6 @@
"Error" => "Gwall",
"Share" => "Rhannu",
"Delete permanently" => "Dileu'n barhaol",
-"Delete" => "Dileu",
"Rename" => "Ailenwi",
"Pending" => "I ddod",
"{new_name} already exists" => "{new_name} yn bodoli'n barod",
@@ -29,8 +29,7 @@
"cancel" => "diddymu",
"replaced {new_name} with {old_name}" => "newidiwyd {new_name} yn lle {old_name}",
"undo" => "dadwneud",
-"perform delete operation" => "cyflawni gweithred dileu",
-"1 file uploading" => "1 ffeil yn llwytho i fyny",
+"_Uploading %n file_::_Uploading %n files_" => array("","","",""),
"files uploading" => "ffeiliau'n llwytho i fyny",
"'.' is an invalid file name." => "Mae '.' yn enw ffeil annilys.",
"File name cannot be empty." => "Does dim hawl cael enw ffeil gwag.",
@@ -42,10 +41,8 @@
"Name" => "Enw",
"Size" => "Maint",
"Modified" => "Addaswyd",
-"1 folder" => "1 blygell",
-"{count} folders" => "{count} plygell",
-"1 file" => "1 ffeil",
-"{count} files" => "{count} ffeil",
+"_%n folder_::_%n folders_" => array("","","",""),
+"_%n file_::_%n files_" => array("","","",""),
"Upload" => "Llwytho i fyny",
"File handling" => "Trafod ffeiliau",
"Maximum upload size" => "Maint mwyaf llwytho i fyny",
@@ -65,9 +62,11 @@
"Nothing in here. Upload something!" => "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!",
"Download" => "Llwytho i lawr",
"Unshare" => "Dad-rannu",
+"Delete" => "Dileu",
"Upload too large" => "Maint llwytho i fyny'n rhy fawr",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.",
"Files are being scanned, please wait." => "Arhoswch, mae ffeiliau'n cael eu sganio.",
"Current scanning" => "Sganio cyfredol",
"Upgrading filesystem cache..." => "Uwchraddio storfa system ffeiliau..."
);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 3dd82fadba5..22ca4b0d7b4 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Kunne ikke flytte %s - der findes allerede en fil med dette navn",
"Could not move %s" => "Kunne ikke flytte %s",
"Unable to set upload directory." => "Ude af stand til at vælge upload mappe.",
@@ -23,7 +24,6 @@
"Error" => "Fejl",
"Share" => "Del",
"Delete permanently" => "Slet permanent",
-"Delete" => "Slet",
"Rename" => "Omdøb",
"Pending" => "Afventer",
"{new_name} already exists" => "{new_name} eksisterer allerede",
@@ -32,23 +32,21 @@
"cancel" => "fortryd",
"replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}",
"undo" => "fortryd",
-"perform delete operation" => "udfør slet operation",
-"1 file uploading" => "1 fil uploades",
+"_Uploading %n file_::_Uploading %n files_" => array("Uploader %n fil","Uploader %n filer"),
"files uploading" => "uploader filer",
"'.' is an invalid file name." => "'.' er et ugyldigt filnavn.",
"File name cannot be empty." => "Filnavnet kan ikke stå tomt.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
"Your storage is full, files can not be updated or synced anymore!" => "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!",
"Your storage is almost full ({usedSpacePercent}%)" => "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ",
"Your download is being prepared. This might take some time if the files are big." => "Dit download forberedes. Dette kan tage lidt tid ved større filer.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud",
"Name" => "Navn",
"Size" => "Størrelse",
"Modified" => "Ændret",
-"1 folder" => "1 mappe",
-"{count} folders" => "{count} mapper",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
"%s could not be renamed" => "%s kunne ikke omdøbes",
"Upload" => "Upload",
"File handling" => "Filhåndtering",
@@ -69,6 +67,7 @@
"Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
"Download" => "Download",
"Unshare" => "Fjern deling",
+"Delete" => "Slet",
"Upload too large" => "Upload er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
"Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
@@ -79,3 +78,4 @@
"files" => "filer",
"Upgrading filesystem cache..." => "Opgraderer filsystems cachen..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 33430795ddd..c41d2fb5c16 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
"Could not move %s" => "Konnte %s nicht verschieben",
"Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
@@ -23,7 +24,6 @@
"Error" => "Fehler",
"Share" => "Teilen",
"Delete permanently" => "Endgültig löschen",
-"Delete" => "Löschen",
"Rename" => "Umbenennen",
"Pending" => "Ausstehend",
"{new_name} already exists" => "{new_name} existiert bereits",
@@ -32,23 +32,21 @@
"cancel" => "abbrechen",
"replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
"undo" => "rückgängig machen",
-"perform delete operation" => "Löschvorgang ausführen",
-"1 file uploading" => "1 Datei wird hochgeladen",
+"_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"),
"files uploading" => "Dateien werden hoch geladen",
"'.' 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.",
"Your storage is full, files can not be updated or synced anymore!" => "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
"Your storage is almost full ({usedSpacePercent}%)" => "Dein Speicher ist fast voll ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind deine Dateien nach wie vor verschlüsselt. Bitte gehe zu deinen persönlichen Einstellungen, um deine Dateien zu entschlüsseln.",
"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.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten.",
"Name" => "Name",
"Size" => "Größe",
"Modified" => "Geändert",
-"1 folder" => "1 Ordner",
-"{count} folders" => "{count} Ordner",
-"1 file" => "1 Datei",
-"{count} files" => "{count} Dateien",
+"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
+"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
"%s could not be renamed" => "%s konnte nicht umbenannt werden",
"Upload" => "Hochladen",
"File handling" => "Dateibehandlung",
@@ -69,6 +67,7 @@
"Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
"Download" => "Herunterladen",
"Unshare" => "Freigabe aufheben",
+"Delete" => "Löschen",
"Upload too large" => "Der Upload ist zu groß",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
@@ -79,3 +78,4 @@
"files" => "Dateien",
"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 3ce3b2a7fb5..6d4bf8a4e72 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.",
"Could not move %s" => "Konnte %s nicht verschieben",
"Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
@@ -23,7 +24,6 @@
"Error" => "Fehler",
"Share" => "Teilen",
"Delete permanently" => "Endgültig löschen",
-"Delete" => "Löschen",
"Rename" => "Umbenennen",
"Pending" => "Ausstehend",
"{new_name} already exists" => "{new_name} existiert bereits",
@@ -32,23 +32,21 @@
"cancel" => "abbrechen",
"replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
"undo" => "rückgängig machen",
-"perform delete operation" => "Löschvorgang ausführen",
-"1 file uploading" => "1 Datei wird hochgeladen",
+"_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hoch geladen","%n Dateien werden hoch geladen"),
"files uploading" => "Dateien werden hoch geladen",
"'.' 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.",
"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
"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 etwas dauern.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten",
"Name" => "Name",
"Size" => "Größe",
"Modified" => "Geändert",
-"1 folder" => "1 Ordner",
-"{count} folders" => "{count} Ordner",
-"1 file" => "1 Datei",
-"{count} files" => "{count} Dateien",
+"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
+"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
"%s could not be renamed" => "%s konnte nicht umbenannt werden",
"Upload" => "Hochladen",
"File handling" => "Dateibehandlung",
@@ -69,6 +67,7 @@
"Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
"Download" => "Herunterladen",
"Unshare" => "Freigabe aufheben",
+"Delete" => "Löschen",
"Upload too large" => "Der Upload ist zu groß",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
@@ -79,3 +78,4 @@
"files" => "Dateien",
"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 219cf87c33d..e1d0052bc0b 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Αδυναμία μετακίνησης του %s - υπάρχει ήδη αρχείο με αυτό το όνομα",
"Could not move %s" => "Αδυναμία μετακίνησης του %s",
"Unable to set upload directory." => "Αδυναμία ορισμού καταλόγου αποστολής.",
@@ -23,7 +24,6 @@
"Error" => "Σφάλμα",
"Share" => "Διαμοιρασμός",
"Delete permanently" => "Μόνιμη διαγραφή",
-"Delete" => "Διαγραφή",
"Rename" => "Μετονομασία",
"Pending" => "Εκκρεμεί",
"{new_name} already exists" => "{new_name} υπάρχει ήδη",
@@ -32,8 +32,7 @@
"cancel" => "ακύρωση",
"replaced {new_name} with {old_name}" => "αντικαταστάθηκε το {new_name} με {old_name}",
"undo" => "αναίρεση",
-"perform delete operation" => "εκτέλεση της διαδικασίας διαγραφής",
-"1 file uploading" => "1 αρχείο ανεβαίνει",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"files uploading" => "αρχεία ανεβαίνουν",
"'.' is an invalid file name." => "'.' είναι μη έγκυρο όνομα αρχείου.",
"File name cannot be empty." => "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
@@ -45,10 +44,8 @@
"Name" => "Όνομα",
"Size" => "Μέγεθος",
"Modified" => "Τροποποιήθηκε",
-"1 folder" => "1 φάκελος",
-"{count} folders" => "{count} φάκελοι",
-"1 file" => "1 αρχείο",
-"{count} files" => "{count} αρχεία",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "Αδυναμία μετονομασίας του %s",
"Upload" => "Μεταφόρτωση",
"File handling" => "Διαχείριση αρχείων",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!",
"Download" => "Λήψη",
"Unshare" => "Σταμάτημα διαμοιρασμού",
+"Delete" => "Διαγραφή",
"Upload too large" => "Πολύ μεγάλο αρχείο προς αποστολή",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
"Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
@@ -79,3 +77,4 @@
"files" => "αρχεία",
"Upgrading filesystem cache..." => "Ενημέρωση της μνήμης cache του συστήματος αρχείων..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/en@pirate.php b/apps/files/l10n/en@pirate.php
index fdd1850da90..83351f265f0 100644
--- a/apps/files/l10n/en@pirate.php
+++ b/apps/files/l10n/en@pirate.php
@@ -1,3 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Download" => "Download"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 561545ec6ae..0f404fa29fa 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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",
"No file was uploaded. Unknown error" => "Neniu dosiero alŝutiĝis. Nekonata eraro.",
@@ -21,7 +22,6 @@
"Error" => "Eraro",
"Share" => "Kunhavigi",
"Delete permanently" => "Forigi por ĉiam",
-"Delete" => "Forigi",
"Rename" => "Alinomigi",
"Pending" => "Traktotaj",
"{new_name} already exists" => "{new_name} jam ekzistas",
@@ -30,8 +30,7 @@
"cancel" => "nuligi",
"replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
"undo" => "malfari",
-"perform delete operation" => "plenumi forigan operacion",
-"1 file uploading" => "1 dosiero estas alŝutata",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"files uploading" => "dosieroj estas alŝutataj",
"'.' is an invalid file name." => "'.' ne estas valida dosiernomo.",
"File name cannot be empty." => "Dosiernomo devas ne malpleni.",
@@ -43,10 +42,8 @@
"Name" => "Nomo",
"Size" => "Grando",
"Modified" => "Modifita",
-"1 folder" => "1 dosierujo",
-"{count} folders" => "{count} dosierujoj",
-"1 file" => "1 dosiero",
-"{count} files" => "{count} dosierujoj",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Upload" => "Alŝuti",
"File handling" => "Dosieradministro",
"Maximum upload size" => "Maksimuma alŝutogrando",
@@ -66,6 +63,7 @@
"Nothing in here. Upload something!" => "Nenio estas ĉi tie. Alŝutu ion!",
"Download" => "Elŝuti",
"Unshare" => "Malkunhavigi",
+"Delete" => "Forigi",
"Upload too large" => "Alŝuto tro larĝa",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
"Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
@@ -74,3 +72,4 @@
"files" => "dosieroj",
"Upgrading filesystem cache..." => "Ĝisdatiĝas dosiersistema kaŝmemoro..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 78740d51507..2672b169549 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "No se pudo mover %s - Un archivo con ese nombre ya existe.",
"Could not move %s" => "No se pudo mover %s",
"Unable to set upload directory." => "Incapaz de crear directorio de subida.",
@@ -23,7 +24,6 @@
"Error" => "Error",
"Share" => "Compartir",
"Delete permanently" => "Eliminar permanentemente",
-"Delete" => "Eliminar",
"Rename" => "Renombrar",
"Pending" => "Pendiente",
"{new_name} already exists" => "{new_name} ya existe",
@@ -32,8 +32,7 @@
"cancel" => "cancelar",
"replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
"undo" => "deshacer",
-"perform delete operation" => "Realizar operación de borrado",
-"1 file uploading" => "subiendo 1 archivo",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"files uploading" => "subiendo archivos",
"'.' is an invalid file name." => "'.' no es un nombre de archivo válido.",
"File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
@@ -45,10 +44,8 @@
"Name" => "Nombre",
"Size" => "Tamaño",
"Modified" => "Modificado",
-"1 folder" => "1 carpeta",
-"{count} folders" => "{count} carpetas",
-"1 file" => "1 archivo",
-"{count} files" => "{count} archivos",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "%s no se pudo renombrar",
"Upload" => "Subir",
"File handling" => "Manejo de archivos",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "No hay nada aquí. ¡Suba algo!",
"Download" => "Descargar",
"Unshare" => "Dejar de compartir",
+"Delete" => "Eliminar",
"Upload too large" => "Subida demasido grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
"Files are being scanned, please wait." => "Los archivos están siendo escaneados, por favor espere.",
@@ -79,3 +77,4 @@
"files" => "archivos",
"Upgrading filesystem cache..." => "Actualizando caché del sistema de archivos"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 3fc3be17982..5e94da3c437 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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 set upload directory." => "No fue posible crear el directorio de subida.",
@@ -23,7 +24,6 @@
"Error" => "Error",
"Share" => "Compartir",
"Delete permanently" => "Borrar permanentemente",
-"Delete" => "Borrar",
"Rename" => "Cambiar nombre",
"Pending" => "Pendientes",
"{new_name} already exists" => "{new_name} ya existe",
@@ -32,8 +32,7 @@
"cancel" => "cancelar",
"replaced {new_name} with {old_name}" => "se reemplazó {new_name} con {old_name}",
"undo" => "deshacer",
-"perform delete operation" => "Llevar a cabo borrado",
-"1 file uploading" => "Subiendo 1 archivo",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"files uploading" => "Subiendo archivos",
"'.' 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.",
@@ -45,10 +44,8 @@
"Name" => "Nombre",
"Size" => "Tamaño",
"Modified" => "Modificado",
-"1 folder" => "1 directorio",
-"{count} folders" => "{count} directorios",
-"1 file" => "1 archivo",
-"{count} files" => "{count} archivos",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "No se pudo renombrar %s",
"Upload" => "Subir",
"File handling" => "Tratamiento de archivos",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
"Download" => "Descargar",
"Unshare" => "Dejar de compartir",
+"Delete" => "Borrar",
"Upload too large" => "El tamaño del archivo que querés subir es demasiado grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
"Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
@@ -79,3 +77,4 @@
"files" => "archivos",
"Upgrading filesystem cache..." => "Actualizando el cache del sistema de archivos"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index c58b066e287..2a5016f3807 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Ei saa liigutada faili %s - samanimeline fail on juba olemas",
"Could not move %s" => "%s liigutamine ebaõnnestus",
"Unable to set upload directory." => "Üleslaadimiste kausta määramine ebaõnnestus.",
@@ -23,7 +24,6 @@
"Error" => "Viga",
"Share" => "Jaga",
"Delete permanently" => "Kustuta jäädavalt",
-"Delete" => "Kustuta",
"Rename" => "Nimeta ümber",
"Pending" => "Ootel",
"{new_name} already exists" => "{new_name} on juba olemas",
@@ -32,23 +32,21 @@
"cancel" => "loobu",
"replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
"undo" => "tagasi",
-"perform delete operation" => "teosta kustutamine",
-"1 file uploading" => "1 fail üleslaadimisel",
+"_Uploading %n file_::_Uploading %n files_" => array("Laadin üles %n faili","Laadin üles %n faili"),
"files uploading" => "faili üleslaadimisel",
"'.' is an invalid file name." => "'.' on vigane failinimi.",
"File name cannot be empty." => "Faili nimi ei saa olla tühi.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
"Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
"Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks.",
"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.",
"Name" => "Nimi",
"Size" => "Suurus",
"Modified" => "Muudetud",
-"1 folder" => "1 kaust",
-"{count} folders" => "{count} kausta",
-"1 file" => "1 fail",
-"{count} files" => "{count} faili",
+"_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"),
+"_%n file_::_%n files_" => array("%n fail","%n faili"),
"%s could not be renamed" => "%s ümbernimetamine ebaõnnestus",
"Upload" => "Lae üles",
"File handling" => "Failide käsitlemine",
@@ -69,6 +67,7 @@
"Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
"Download" => "Lae alla",
"Unshare" => "Lõpeta jagamine",
+"Delete" => "Kustuta",
"Upload too large" => "Üleslaadimine on liiga suur",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
"Files are being scanned, please wait." => "Faile skannitakse, palun oota.",
@@ -79,3 +78,4 @@
"files" => "faili",
"Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 96bfb2d1cc8..fe6e117a93b 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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 set upload directory." => "Ezin da igoera direktorioa ezarri.",
@@ -23,7 +24,6 @@
"Error" => "Errorea",
"Share" => "Elkarbanatu",
"Delete permanently" => "Ezabatu betirako",
-"Delete" => "Ezabatu",
"Rename" => "Berrizendatu",
"Pending" => "Zain",
"{new_name} already exists" => "{new_name} dagoeneko existitzen da",
@@ -32,8 +32,7 @@
"cancel" => "ezeztatu",
"replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du",
"undo" => "desegin",
-"perform delete operation" => "Ezabatu",
-"1 file uploading" => "fitxategi 1 igotzen",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"files uploading" => "fitxategiak igotzen",
"'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.",
"File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
@@ -45,10 +44,8 @@
"Name" => "Izena",
"Size" => "Tamaina",
"Modified" => "Aldatuta",
-"1 folder" => "karpeta bat",
-"{count} folders" => "{count} karpeta",
-"1 file" => "fitxategi bat",
-"{count} files" => "{count} fitxategi",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "%s ezin da berrizendatu",
"Upload" => "Igo",
"File handling" => "Fitxategien kudeaketa",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
"Download" => "Deskargatu",
"Unshare" => "Ez elkarbanatu",
+"Delete" => "Ezabatu",
"Upload too large" => "Igoera handiegia da",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
"Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
@@ -79,3 +77,4 @@
"files" => "fitxategiak",
"Upgrading filesystem cache..." => "Fitxategi sistemaren katxea eguneratzen..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 73f4b493b4d..96332921cff 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s نمی تواند حرکت کند - در حال حاضر پرونده با این نام وجود دارد. ",
"Could not move %s" => "%s نمی تواند حرکت کند ",
"Unable to set upload directory." => "قادر به تنظیم پوشه آپلود نمی باشد.",
@@ -23,7 +24,6 @@
"Error" => "خطا",
"Share" => "اشتراک‌گذاری",
"Delete permanently" => "حذف قطعی",
-"Delete" => "حذف",
"Rename" => "تغییرنام",
"Pending" => "در انتظار",
"{new_name} already exists" => "{نام _جدید} در حال حاضر وجود دارد.",
@@ -32,8 +32,7 @@
"cancel" => "لغو",
"replaced {new_name} with {old_name}" => "{نام_جدید} با { نام_قدیمی} جایگزین شد.",
"undo" => "بازگشت",
-"perform delete operation" => "انجام عمل حذف",
-"1 file uploading" => "1 پرونده آپلود شد.",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
"files uploading" => "بارگذاری فایل ها",
"'.' is an invalid file name." => "'.' یک نام پرونده نامعتبر است.",
"File name cannot be empty." => "نام پرونده نمی تواند خالی باشد.",
@@ -45,10 +44,8 @@
"Name" => "نام",
"Size" => "اندازه",
"Modified" => "تاریخ",
-"1 folder" => "1 پوشه",
-"{count} folders" => "{ شمار} پوشه ها",
-"1 file" => "1 پرونده",
-"{count} files" => "{ شمار } فایل ها",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"%s could not be renamed" => "%s نمیتواند تغییر نام دهد.",
"Upload" => "بارگزاری",
"File handling" => "اداره پرونده ها",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.",
"Download" => "دانلود",
"Unshare" => "لغو اشتراک",
+"Delete" => "حذف",
"Upload too large" => "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
"Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
@@ -79,3 +77,4 @@
"files" => "پرونده ها",
"Upgrading filesystem cache..." => "بهبود فایل سیستمی ذخیره گاه..."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/fi.php b/apps/files/l10n/fi.php
index c5ce878aded..43770829397 100644
--- a/apps/files/l10n/fi.php
+++ b/apps/files/l10n/fi.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Save" => "tallentaa"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 40df7b1546e..b48f44665bc 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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",
"No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
@@ -20,7 +21,6 @@
"Error" => "Virhe",
"Share" => "Jaa",
"Delete permanently" => "Poista pysyvästi",
-"Delete" => "Poista",
"Rename" => "Nimeä uudelleen",
"Pending" => "Odottaa",
"{new_name} already exists" => "{new_name} on jo olemassa",
@@ -28,7 +28,7 @@
"suggest name" => "ehdota nimeä",
"cancel" => "peru",
"undo" => "kumoa",
-"perform delete operation" => "suorita poistotoiminto",
+"_Uploading %n file_::_Uploading %n files_" => array("Lähetetään %n tiedosto","Lähetetään %n tiedostoa"),
"'.' 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.",
@@ -38,10 +38,8 @@
"Name" => "Nimi",
"Size" => "Koko",
"Modified" => "Muokattu",
-"1 folder" => "1 kansio",
-"{count} folders" => "{count} kansiota",
-"1 file" => "1 tiedosto",
-"{count} files" => "{count} tiedostoa",
+"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
+"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
"Upload" => "Lähetä",
"File handling" => "Tiedostonhallinta",
"Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
@@ -61,6 +59,7 @@
"Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",
"Download" => "Lataa",
"Unshare" => "Peru jakaminen",
+"Delete" => "Poista",
"Upload too large" => "Lähetettävä tiedosto on liian suuri",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
"Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki.",
@@ -71,3 +70,4 @@
"files" => "tiedostoa",
"Upgrading filesystem cache..." => "Päivitetään tiedostojärjestelmän välimuistia..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index b293f85ed42..60064134498 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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 set upload directory." => "Impossible de définir le dossier pour l'upload, charger.",
@@ -23,7 +24,6 @@
"Error" => "Erreur",
"Share" => "Partager",
"Delete permanently" => "Supprimer de façon définitive",
-"Delete" => "Supprimer",
"Rename" => "Renommer",
"Pending" => "En attente",
"{new_name} already exists" => "{new_name} existe déjà",
@@ -32,8 +32,7 @@
"cancel" => "annuler",
"replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}",
"undo" => "annuler",
-"perform delete operation" => "effectuer l'opération de suppression",
-"1 file uploading" => "1 fichier en cours d'envoi",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"files uploading" => "fichiers en cours d'envoi",
"'.' 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.",
@@ -45,10 +44,8 @@
"Name" => "Nom",
"Size" => "Taille",
"Modified" => "Modifié",
-"1 folder" => "1 dossier",
-"{count} folders" => "{count} dossiers",
-"1 file" => "1 fichier",
-"{count} files" => "{count} fichiers",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "%s ne peut être renommé",
"Upload" => "Envoyer",
"File handling" => "Gestion des fichiers",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
"Download" => "Télécharger",
"Unshare" => "Ne plus partager",
+"Delete" => "Supprimer",
"Upload too large" => "Téléversement trop volumineux",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
"Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
@@ -79,3 +77,4 @@
"files" => "fichiers",
"Upgrading filesystem cache..." => "Mise à niveau du cache du système de fichier"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index bba6335ae05..98274ed751a 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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 foi posíbel mover %s",
"Unable to set upload directory." => "Non é posíbel configurar o directorio de envíos.",
@@ -23,7 +24,6 @@
"Error" => "Erro",
"Share" => "Compartir",
"Delete permanently" => "Eliminar permanentemente",
-"Delete" => "Eliminar",
"Rename" => "Renomear",
"Pending" => "Pendentes",
"{new_name} already exists" => "Xa existe un {new_name}",
@@ -32,23 +32,21 @@
"cancel" => "cancelar",
"replaced {new_name} with {old_name}" => "substituír {new_name} por {old_name}",
"undo" => "desfacer",
-"perform delete operation" => "realizar a operación de eliminación",
-"1 file uploading" => "Enviándose 1 ficheiro",
+"_Uploading %n file_::_Uploading %n files_" => array("Cargando %n ficheiro","Cargando %n ficheiros"),
"files uploading" => "ficheiros enviándose",
"'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto",
"File name cannot be empty." => "O nome de ficheiro non pode estar baleiro",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*».",
"Your storage is full, files can not be updated or synced anymore!" => "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
"Your storage is almost full ({usedSpacePercent}%)" => "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.",
"Your download is being prepared. This might take some time if the files are big." => "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de cartafol incorrecto. O uso de «Shared» está reservado por Owncloud",
"Name" => "Nome",
"Size" => "Tamaño",
"Modified" => "Modificado",
-"1 folder" => "1 cartafol",
-"{count} folders" => "{count} cartafoles",
-"1 file" => "1 ficheiro",
-"{count} files" => "{count} ficheiros",
+"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
+"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
"%s could not be renamed" => "%s non pode cambiar de nome",
"Upload" => "Enviar",
"File handling" => "Manexo de ficheiro",
@@ -69,6 +67,7 @@
"Nothing in here. Upload something!" => "Aquí non hai nada. Envíe algo.",
"Download" => "Descargar",
"Unshare" => "Deixar de compartir",
+"Delete" => "Eliminar",
"Upload too large" => "Envío demasiado grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
"Files are being scanned, please wait." => "Estanse analizando os ficheiros. Agarde.",
@@ -79,3 +78,4 @@
"files" => "ficheiros",
"Upgrading filesystem cache..." => "Anovando a caché do sistema de ficheiros..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 52946bc6d0b..ef98e2d2188 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "לא ניתן להעביר את %s - קובץ בשם הזה כבר קיים",
"Could not move %s" => "לא ניתן להעביר את %s",
"No file was uploaded. Unknown error" => "לא הועלה קובץ. טעות בלתי מזוהה.",
@@ -19,7 +20,6 @@
"Error" => "שגיאה",
"Share" => "שתף",
"Delete permanently" => "מחק לצמיתות",
-"Delete" => "מחיקה",
"Rename" => "שינוי שם",
"Pending" => "ממתין",
"{new_name} already exists" => "{new_name} כבר קיים",
@@ -28,17 +28,14 @@
"cancel" => "ביטול",
"replaced {new_name} with {old_name}" => "{new_name} הוחלף ב־{old_name}",
"undo" => "ביטול",
-"perform delete operation" => "ביצוע פעולת מחיקה",
-"1 file uploading" => "קובץ אחד נשלח",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"files uploading" => "קבצים בהעלאה",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
"Name" => "שם",
"Size" => "גודל",
"Modified" => "זמן שינוי",
-"1 folder" => "תיקייה אחת",
-"{count} folders" => "{count} תיקיות",
-"1 file" => "קובץ אחד",
-"{count} files" => "{count} קבצים",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Upload" => "העלאה",
"File handling" => "טיפול בקבצים",
"Maximum upload size" => "גודל העלאה מקסימלי",
@@ -56,6 +53,7 @@
"Nothing in here. Upload something!" => "אין כאן שום דבר. אולי ברצונך להעלות משהו?",
"Download" => "הורדה",
"Unshare" => "הסר שיתוף",
+"Delete" => "מחיקה",
"Upload too large" => "העלאה גדולה מידי",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
"Files are being scanned, please wait." => "הקבצים נסרקים, נא להמתין.",
@@ -63,3 +61,4 @@
"file" => "קובץ",
"files" => "קבצים"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php
index 151d1f497c7..7fb5a5b09d3 100644
--- a/apps/files/l10n/hi.php
+++ b/apps/files/l10n/hi.php
@@ -1,5 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "त्रुटि",
"Share" => "साझा करें",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Save" => "सहेजें"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index abe8c40bd53..8f74dea092f 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"There is no error, the file uploaded with success" => "Nema pogreške, datoteka je poslana uspješno.",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka prelazi veličinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi",
"The uploaded file was only partially uploaded" => "Poslana datoteka je parcijalno poslana",
@@ -11,18 +12,19 @@
"File upload is in progress. Leaving the page now will cancel the upload." => "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje.",
"Error" => "Greška",
"Share" => "Podijeli",
-"Delete" => "Obriši",
"Rename" => "Promjeni ime",
"Pending" => "U tijeku",
"replace" => "zamjeni",
"suggest name" => "predloži ime",
"cancel" => "odustani",
"undo" => "vrati",
-"1 file uploading" => "1 datoteka se učitava",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
"files uploading" => "datoteke se učitavaju",
"Name" => "Ime",
"Size" => "Veličina",
"Modified" => "Zadnja promjena",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Upload" => "Učitaj",
"File handling" => "datoteka za rukovanje",
"Maximum upload size" => "Maksimalna veličina prijenosa",
@@ -39,6 +41,7 @@
"Nothing in here. Upload something!" => "Nema ničega u ovoj mapi. Pošalji nešto!",
"Download" => "Preuzimanje",
"Unshare" => "Makni djeljenje",
+"Delete" => "Obriši",
"Upload too large" => "Prijenos je preobiman",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.",
"Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte.",
@@ -46,3 +49,4 @@
"file" => "datoteka",
"files" => "datoteke"
);
+$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;";
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index b0833516958..63efe031da8 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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 set upload directory." => "Nem található a mappa, ahova feltölteni szeretne.",
@@ -23,7 +24,6 @@
"Error" => "Hiba",
"Share" => "Megosztás",
"Delete permanently" => "Végleges törlés",
-"Delete" => "Törlés",
"Rename" => "Átnevezés",
"Pending" => "Folyamatban",
"{new_name} already exists" => "{new_name} már létezik",
@@ -32,8 +32,7 @@
"cancel" => "mégse",
"replaced {new_name} with {old_name}" => "{new_name} fájlt kicseréltük ezzel: {old_name}",
"undo" => "visszavonás",
-"perform delete operation" => "a törlés végrehajtása",
-"1 file uploading" => "1 fájl töltődik föl",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"files uploading" => "fájl töltődik föl",
"'.' is an invalid file name." => "'.' fájlnév érvénytelen.",
"File name cannot be empty." => "A fájlnév nem lehet semmi.",
@@ -45,10 +44,8 @@
"Name" => "Név",
"Size" => "Méret",
"Modified" => "Módosítva",
-"1 folder" => "1 mappa",
-"{count} folders" => "{count} mappa",
-"1 file" => "1 fájl",
-"{count} files" => "{count} fájl",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "%s átnevezése nem sikerült",
"Upload" => "Feltöltés",
"File handling" => "Fájlkezelés",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!",
"Download" => "Letöltés",
"Unshare" => "A megosztás visszavonása",
+"Delete" => "Törlés",
"Upload too large" => "A feltöltés túl nagy",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
"Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!",
@@ -79,3 +77,4 @@
"files" => "fájlok",
"Upgrading filesystem cache..." => "A fájlrendszer gyorsítótárának frissítése zajlik..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hy.php b/apps/files/l10n/hy.php
index 22edf32c6e6..a419a74cc97 100644
--- a/apps/files/l10n/hy.php
+++ b/apps/files/l10n/hy.php
@@ -1,5 +1,10 @@
-<?php $TRANSLATIONS = array(
-"Delete" => "Ջնջել",
+<?php
+$TRANSLATIONS = array(
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Save" => "Պահպանել",
-"Download" => "Բեռնել"
+"Download" => "Բեռնել",
+"Delete" => "Ջնջել"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index 5970a4cd55a..202375636a1 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -1,14 +1,17 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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",
"Files" => "Files",
"Error" => "Error",
"Share" => "Compartir",
-"Delete" => "Deler",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Name" => "Nomine",
"Size" => "Dimension",
"Modified" => "Modificate",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Upload" => "Incargar",
"Maximum upload size" => "Dimension maxime de incargamento",
"Save" => "Salveguardar",
@@ -17,5 +20,7 @@
"Folder" => "Dossier",
"Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!",
"Download" => "Discargar",
+"Delete" => "Deler",
"Upload too large" => "Incargamento troppo longe"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index bacdcc8f496..0f7aac5a228 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada",
"Could not move %s" => "Tidak dapat memindahkan %s",
"No file was uploaded. Unknown error" => "Tidak ada berkas yang diunggah. Galat tidak dikenal.",
@@ -20,7 +21,6 @@
"Error" => "Galat",
"Share" => "Bagikan",
"Delete permanently" => "Hapus secara permanen",
-"Delete" => "Hapus",
"Rename" => "Ubah nama",
"Pending" => "Menunggu",
"{new_name} already exists" => "{new_name} sudah ada",
@@ -29,8 +29,7 @@
"cancel" => "batalkan",
"replaced {new_name} with {old_name}" => "mengganti {new_name} dengan {old_name}",
"undo" => "urungkan",
-"perform delete operation" => "Lakukan operasi penghapusan",
-"1 file uploading" => "1 berkas diunggah",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
"files uploading" => "berkas diunggah",
"'.' is an invalid file name." => "'.' bukan nama berkas yang valid.",
"File name cannot be empty." => "Nama berkas tidak boleh kosong.",
@@ -42,10 +41,8 @@
"Name" => "Nama",
"Size" => "Ukuran",
"Modified" => "Dimodifikasi",
-"1 folder" => "1 folder",
-"{count} folders" => "{count} folder",
-"1 file" => "1 berkas",
-"{count} files" => "{count} berkas",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Upload" => "Unggah",
"File handling" => "Penanganan berkas",
"Maximum upload size" => "Ukuran pengunggahan maksimum",
@@ -65,6 +62,7 @@
"Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
"Download" => "Unduh",
"Unshare" => "Batalkan berbagi",
+"Delete" => "Hapus",
"Upload too large" => "Yang diunggah terlalu besar",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
"Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.",
@@ -73,3 +71,4 @@
"files" => "berkas-berkas",
"Upgrading filesystem cache..." => "Meningkatkan tembolok sistem berkas..."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index 97b19ae9379..aee213691e0 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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",
"No file was uploaded. Unknown error" => "Engin skrá var send inn. Óþekkt villa.",
@@ -18,7 +19,6 @@
"URL cannot be empty." => "Vefslóð má ekki vera tóm.",
"Error" => "Villa",
"Share" => "Deila",
-"Delete" => "Eyða",
"Rename" => "Endurskýra",
"Pending" => "Bíður",
"{new_name} already exists" => "{new_name} er þegar til",
@@ -27,7 +27,7 @@
"cancel" => "hætta við",
"replaced {new_name} with {old_name}" => "yfirskrifaði {new_name} með {old_name}",
"undo" => "afturkalla",
-"1 file uploading" => "1 skrá innsend",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"'.' 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ð.",
@@ -35,10 +35,8 @@
"Name" => "Nafn",
"Size" => "Stærð",
"Modified" => "Breytt",
-"1 folder" => "1 mappa",
-"{count} folders" => "{count} möppur",
-"1 file" => "1 skrá",
-"{count} files" => "{count} skrár",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Upload" => "Senda inn",
"File handling" => "Meðhöndlun skrár",
"Maximum upload size" => "Hámarks stærð innsendingar",
@@ -56,8 +54,10 @@
"Nothing in here. Upload something!" => "Ekkert hér. Settu eitthvað inn!",
"Download" => "Niðurhal",
"Unshare" => "Hætta deilingu",
+"Delete" => "Eyða",
"Upload too large" => "Innsend skrá er of stór",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.",
"Files are being scanned, please wait." => "Verið er að skima skrár, vinsamlegast hinkraðu.",
"Current scanning" => "Er að skima"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 28b33795aeb..3220a3efb6f 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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 set upload directory." => "Impossibile impostare una cartella di caricamento.",
@@ -23,7 +24,6 @@
"Error" => "Errore",
"Share" => "Condividi",
"Delete permanently" => "Elimina definitivamente",
-"Delete" => "Elimina",
"Rename" => "Rinomina",
"Pending" => "In corso",
"{new_name} already exists" => "{new_name} esiste già",
@@ -32,8 +32,7 @@
"cancel" => "annulla",
"replaced {new_name} with {old_name}" => "sostituito {new_name} con {old_name}",
"undo" => "annulla",
-"perform delete operation" => "esegui l'operazione di eliminazione",
-"1 file uploading" => "1 file in fase di caricamento",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"files uploading" => "caricamento file",
"'.' is an invalid file name." => "'.' non è un nome file valido.",
"File name cannot be empty." => "Il nome del file non può essere vuoto.",
@@ -45,10 +44,8 @@
"Name" => "Nome",
"Size" => "Dimensione",
"Modified" => "Modificato",
-"1 folder" => "1 cartella",
-"{count} folders" => "{count} cartelle",
-"1 file" => "1 file",
-"{count} files" => "{count} file",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "%s non può essere rinominato",
"Upload" => "Carica",
"File handling" => "Gestione file",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
"Download" => "Scarica",
"Unshare" => "Rimuovi condivisione",
+"Delete" => "Elimina",
"Upload too large" => "Caricamento troppo grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
"Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
@@ -79,3 +77,4 @@
"files" => "file",
"Upgrading filesystem cache..." => "Aggiornamento della cache del filesystem in corso..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index e4be3133fb0..2d64212a5f2 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s を移動できませんでした ― この名前のファイルはすでに存在します",
"Could not move %s" => "%s を移動できませんでした",
"Unable to set upload directory." => "アップロードディレクトリを設定出来ません。",
@@ -23,7 +24,6 @@
"Error" => "エラー",
"Share" => "共有",
"Delete permanently" => "完全に削除する",
-"Delete" => "削除",
"Rename" => "名前の変更",
"Pending" => "中断",
"{new_name} already exists" => "{new_name} はすでに存在しています",
@@ -32,23 +32,21 @@
"cancel" => "キャンセル",
"replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換",
"undo" => "元に戻す",
-"perform delete operation" => "削除を実行",
-"1 file uploading" => "ファイルを1つアップロード中",
+"_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"),
"files uploading" => "ファイルをアップロード中",
"'.' is an invalid file name." => "'.' は無効なファイル名です。",
"File name cannot be empty." => "ファイル名を空にすることはできません。",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
"Your storage is full, files can not be updated or synced anymore!" => "あなたのストレージは一杯です。ファイルの更新と同期はもうできません!",
"Your storage is almost full ({usedSpacePercent}%)" => "あなたのストレージはほぼ一杯です({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
"Your download is being prepared. This might take some time if the files are big." => "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。",
"Name" => "名前",
"Size" => "サイズ",
"Modified" => "変更",
-"1 folder" => "1 フォルダ",
-"{count} folders" => "{count} フォルダ",
-"1 file" => "1 ファイル",
-"{count} files" => "{count} ファイル",
+"_%n folder_::_%n folders_" => array("%n個のフォルダ"),
+"_%n file_::_%n files_" => array("%n個のファイル"),
"%s could not be renamed" => "%sの名前を変更できませんでした",
"Upload" => "アップロード",
"File handling" => "ファイル操作",
@@ -69,6 +67,7 @@
"Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
"Download" => "ダウンロード",
"Unshare" => "共有解除",
+"Delete" => "削除",
"Upload too large" => "アップロードには大きすぎます。",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
"Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
@@ -79,3 +78,4 @@
"files" => "ファイル",
"Upgrading filesystem cache..." => "ファイルシステムキャッシュを更新中..."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ka.php b/apps/files/l10n/ka.php
index 148e688547a..527a2c49b1c 100644
--- a/apps/files/l10n/ka.php
+++ b/apps/files/l10n/ka.php
@@ -1,4 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Files" => "ფაილები",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Download" => "გადმოწერა"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index b04e1b4536d..3205255e39f 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s –ის გადატანა ვერ მოხერხდა – ფაილი ამ სახელით უკვე არსებობს",
"Could not move %s" => "%s –ის გადატანა ვერ მოხერხდა",
"No file was uploaded. Unknown error" => "ფაილი არ აიტვირთა. უცნობი შეცდომა",
@@ -20,7 +21,6 @@
"Error" => "შეცდომა",
"Share" => "გაზიარება",
"Delete permanently" => "სრულად წაშლა",
-"Delete" => "წაშლა",
"Rename" => "გადარქმევა",
"Pending" => "მოცდის რეჟიმში",
"{new_name} already exists" => "{new_name} უკვე არსებობს",
@@ -29,8 +29,7 @@
"cancel" => "უარყოფა",
"replaced {new_name} with {old_name}" => "{new_name} შეცვლილია {old_name}–ით",
"undo" => "დაბრუნება",
-"perform delete operation" => "მიმდინარეობს წაშლის ოპერაცია",
-"1 file uploading" => "1 ფაილის ატვირთვა",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
"files uploading" => "ფაილები იტვირთება",
"'.' is an invalid file name." => "'.' არის დაუშვებელი ფაილის სახელი.",
"File name cannot be empty." => "ფაილის სახელი არ შეიძლება იყოს ცარიელი.",
@@ -42,10 +41,8 @@
"Name" => "სახელი",
"Size" => "ზომა",
"Modified" => "შეცვლილია",
-"1 folder" => "1 საქაღალდე",
-"{count} folders" => "{count} საქაღალდე",
-"1 file" => "1 ფაილი",
-"{count} files" => "{count} ფაილი",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Upload" => "ატვირთვა",
"File handling" => "ფაილის დამუშავება",
"Maximum upload size" => "მაქსიმუმ ატვირთის ზომა",
@@ -65,9 +62,11 @@
"Nothing in here. Upload something!" => "აქ არაფერი არ არის. ატვირთე რამე!",
"Download" => "ჩამოტვირთვა",
"Unshare" => "გაუზიარებადი",
+"Delete" => "წაშლა",
"Upload too large" => "ასატვირთი ფაილი ძალიან დიდია",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.",
"Files are being scanned, please wait." => "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ.",
"Current scanning" => "მიმდინარე სკანირება",
"Upgrading filesystem cache..." => "ფაილური სისტემის ქეშის განახლება...."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 069c209ee58..7839ad3bd93 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s 항목을 이동시키지 못하였음 - 파일 이름이 이미 존재함",
"Could not move %s" => "%s 항목을 이딩시키지 못하였음",
"No file was uploaded. Unknown error" => "파일이 업로드되지 않았습니다. 알 수 없는 오류입니다",
@@ -20,7 +21,6 @@
"Error" => "오류",
"Share" => "공유",
"Delete permanently" => "영원히 삭제",
-"Delete" => "삭제",
"Rename" => "이름 바꾸기",
"Pending" => "대기 중",
"{new_name} already exists" => "{new_name}이(가) 이미 존재함",
@@ -29,8 +29,7 @@
"cancel" => "취소",
"replaced {new_name} with {old_name}" => "{old_name}이(가) {new_name}(으)로 대체됨",
"undo" => "되돌리기",
-"perform delete operation" => "삭제 작업중",
-"1 file uploading" => "파일 1개 업로드 중",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
"files uploading" => "파일 업로드중",
"'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름 입니다.",
"File name cannot be empty." => "파일 이름이 비어 있을 수 없습니다.",
@@ -42,10 +41,8 @@
"Name" => "이름",
"Size" => "크기",
"Modified" => "수정됨",
-"1 folder" => "폴더 1개",
-"{count} folders" => "폴더 {count}개",
-"1 file" => "파일 1개",
-"{count} files" => "파일 {count}개",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Upload" => "업로드",
"File handling" => "파일 처리",
"Maximum upload size" => "최대 업로드 크기",
@@ -65,6 +62,7 @@
"Nothing in here. Upload something!" => "내용이 없습니다. 업로드할 수 있습니다!",
"Download" => "다운로드",
"Unshare" => "공유 해제",
+"Delete" => "삭제",
"Upload too large" => "업로드한 파일이 너무 큼",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
"Files are being scanned, please wait." => "파일을 검색하고 있습니다. 기다려 주십시오.",
@@ -73,3 +71,4 @@
"files" => "파일",
"Upgrading filesystem cache..." => "파일 시스템 캐시 업그레이드 중..."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php
index 7b36c3b710b..81177f9bea0 100644
--- a/apps/files/l10n/ku_IQ.php
+++ b/apps/files/l10n/ku_IQ.php
@@ -1,9 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"URL cannot be empty." => "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت.",
"Error" => "هه‌ڵه",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Name" => "ناو",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Upload" => "بارکردن",
"Save" => "پاشکه‌وتکردن",
"Folder" => "بوخچه",
"Download" => "داگرتن"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 9b209a4d5cc..c57eebd9e76 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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",
@@ -11,13 +12,15 @@
"File upload is in progress. Leaving the page now will cancel the upload." => "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.",
"Error" => "Fehler",
"Share" => "Deelen",
-"Delete" => "Läschen",
"replace" => "ersetzen",
"cancel" => "ofbriechen",
"undo" => "réckgängeg man",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Name" => "Numm",
"Size" => "Gréisst",
"Modified" => "Geännert",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Upload" => "Eroplueden",
"File handling" => "Fichier handling",
"Maximum upload size" => "Maximum Upload Gréisst ",
@@ -34,6 +37,7 @@
"Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!",
"Download" => "Download",
"Unshare" => "Net méi deelen",
+"Delete" => "Läschen",
"Upload too large" => "Upload ze grouss",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",
"Files are being scanned, please wait." => "Fichieren gi gescannt, war weg.",
@@ -41,3 +45,4 @@
"file" => "Datei",
"files" => "Dateien"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 43fb4657dbb..cae9660ab66 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja",
"Could not move %s" => "Nepavyko perkelti %s",
"No file was uploaded. Unknown error" => "Failai nebuvo įkelti dėl nežinomos priežasties",
@@ -21,7 +22,6 @@
"Error" => "Klaida",
"Share" => "Dalintis",
"Delete permanently" => "Ištrinti negrįžtamai",
-"Delete" => "Ištrinti",
"Rename" => "Pervadinti",
"Pending" => "Laukiantis",
"{new_name} already exists" => "{new_name} jau egzistuoja",
@@ -30,8 +30,7 @@
"cancel" => "atšaukti",
"replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}",
"undo" => "anuliuoti",
-"perform delete operation" => "ištrinti",
-"1 file uploading" => "įkeliamas 1 failas",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
"files uploading" => "įkeliami failai",
"'.' is an invalid file name." => "'.' yra neleidžiamas failo pavadinime.",
"File name cannot be empty." => "Failo pavadinimas negali būti tuščias.",
@@ -43,10 +42,8 @@
"Name" => "Pavadinimas",
"Size" => "Dydis",
"Modified" => "Pakeista",
-"1 folder" => "1 aplankalas",
-"{count} folders" => "{count} aplankalai",
-"1 file" => "1 failas",
-"{count} files" => "{count} failai",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Upload" => "Įkelti",
"File handling" => "Failų tvarkymas",
"Maximum upload size" => "Maksimalus įkeliamo failo dydis",
@@ -66,6 +63,7 @@
"Nothing in here. Upload something!" => "Čia tuščia. Įkelkite ką nors!",
"Download" => "Atsisiųsti",
"Unshare" => "Nebesidalinti",
+"Delete" => "Ištrinti",
"Upload too large" => "Įkėlimui failas per didelis",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje",
"Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.",
@@ -74,3 +72,4 @@
"files" => "failai",
"Upgrading filesystem cache..." => "Atnaujinamas sistemos kešavimas..."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index b0def1e707d..f6ded76e109 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -1,6 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu",
"Could not move %s" => "Nevarēja pārvietot %s",
+"Unable to set upload directory." => "Nevar uzstādīt augšupielādes mapi.",
+"Invalid Token" => "Nepareiza pilnvara",
"No file was uploaded. Unknown error" => "Netika augšupielādēta neviena datne. Nezināma kļūda",
"There is no error, the file uploaded with success" => "Viss kārtībā, datne augšupielādēta veiksmīga",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Augšupielādētā datne pārsniedz upload_max_filesize norādījumu php.ini datnē:",
@@ -17,10 +20,10 @@
"Upload cancelled." => "Augšupielāde ir atcelta.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
"URL cannot be empty." => "URL nevar būt tukšs.",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Kļūdains mapes nosaukums. 'Shared' lietošana ir rezervēta no ownCloud",
"Error" => "Kļūda",
"Share" => "Dalīties",
"Delete permanently" => "Dzēst pavisam",
-"Delete" => "Dzēst",
"Rename" => "Pārsaukt",
"Pending" => "Gaida savu kārtu",
"{new_name} already exists" => "{new_name} jau eksistē",
@@ -29,8 +32,8 @@
"cancel" => "atcelt",
"replaced {new_name} with {old_name}" => "aizvietoja {new_name} ar {old_name}",
"undo" => "atsaukt",
-"perform delete operation" => "veikt dzēšanas darbību",
-"1 file uploading" => "Augšupielādē 1 datni",
+"_Uploading %n file_::_Uploading %n files_" => array("%n","Augšupielāde %n failu","Augšupielāde %n failus"),
+"files uploading" => "fails augšupielādējas",
"'.' is an invalid file name." => "'.' ir nederīgs datnes nosaukums.",
"File name cannot be empty." => "Datnes nosaukums nevar būt tukšs.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'.",
@@ -41,10 +44,9 @@
"Name" => "Nosaukums",
"Size" => "Izmērs",
"Modified" => "Mainīts",
-"1 folder" => "1 mape",
-"{count} folders" => "{count} mapes",
-"1 file" => "1 datne",
-"{count} files" => "{count} datnes",
+"_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"),
+"_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"),
+"%s could not be renamed" => "%s nevar tikt pārsaukts",
"Upload" => "Augšupielādēt",
"File handling" => "Datņu pārvaldība",
"Maximum upload size" => "Maksimālais datņu augšupielādes apjoms",
@@ -64,11 +66,15 @@
"Nothing in here. Upload something!" => "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!",
"Download" => "Lejupielādēt",
"Unshare" => "Pārtraukt dalīšanos",
+"Delete" => "Dzēst",
"Upload too large" => "Datne ir par lielu, lai to augšupielādētu",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu",
"Files are being scanned, please wait." => "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.",
"Current scanning" => "Šobrīd tiek caurskatīts",
+"directory" => "direktorija",
+"directories" => "direktorijas",
"file" => "fails",
"files" => "faili",
"Upgrading filesystem cache..." => "Uzlabo datņu sistēmas kešatmiņu..."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index 2dd75f14338..20fed43ab20 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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:",
@@ -14,7 +15,6 @@
"URL cannot be empty." => "Адресата неможе да биде празна.",
"Error" => "Грешка",
"Share" => "Сподели",
-"Delete" => "Избриши",
"Rename" => "Преименувај",
"Pending" => "Чека",
"{new_name} already exists" => "{new_name} веќе постои",
@@ -23,15 +23,13 @@
"cancel" => "откажи",
"replaced {new_name} with {old_name}" => "заменета {new_name} со {old_name}",
"undo" => "врати",
-"1 file uploading" => "1 датотека се подига",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
"Name" => "Име",
"Size" => "Големина",
"Modified" => "Променето",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папки",
-"1 file" => "1 датотека",
-"{count} files" => "{count} датотеки",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Upload" => "Подигни",
"File handling" => "Ракување со датотеки",
"Maximum upload size" => "Максимална големина за подигање",
@@ -49,6 +47,7 @@
"Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!",
"Download" => "Преземи",
"Unshare" => "Не споделувај",
+"Delete" => "Избриши",
"Upload too large" => "Фајлот кој се вчитува е преголем",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
"Files are being scanned, please wait." => "Се скенираат датотеки, ве молам почекајте.",
@@ -56,3 +55,4 @@
"file" => "датотека",
"files" => "датотеки"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index f96d4d48014..86b70faefda 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"No file was uploaded. Unknown error" => "Tiada fail dimuatnaik. Ralat tidak diketahui.",
"There is no error, the file uploaded with success" => "Tiada ralat berlaku, fail berjaya dimuatnaik",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML",
@@ -11,13 +12,15 @@
"Upload cancelled." => "Muatnaik dibatalkan.",
"Error" => "Ralat",
"Share" => "Kongsi",
-"Delete" => "Padam",
"Pending" => "Dalam proses",
"replace" => "ganti",
"cancel" => "Batal",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
"Name" => "Nama",
"Size" => "Saiz",
"Modified" => "Dimodifikasi",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Upload" => "Muat naik",
"File handling" => "Pengendalian fail",
"Maximum upload size" => "Saiz maksimum muat naik",
@@ -33,6 +36,7 @@
"Cancel upload" => "Batal muat naik",
"Nothing in here. Upload something!" => "Tiada apa-apa di sini. Muat naik sesuatu!",
"Download" => "Muat turun",
+"Delete" => "Padam",
"Upload too large" => "Muatnaik terlalu besar",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
"Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar.",
@@ -40,3 +44,4 @@
"file" => "fail",
"files" => "fail"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/my_MM.php b/apps/files/l10n/my_MM.php
index b791a134ccc..4dc63ffee2d 100644
--- a/apps/files/l10n/my_MM.php
+++ b/apps/files/l10n/my_MM.php
@@ -1,4 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Files" => "ဖိုင်များ",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Download" => "ဒေါင်းလုတ်"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index d4080a17960..d76255f522d 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Kan ikke flytte %s - En fil med samme navn finnes allerede",
"Could not move %s" => "Kunne ikke flytte %s",
"Unable to set upload directory." => "Kunne ikke sette opplastingskatalog.",
+"Invalid Token" => "Ugyldig nøkkel",
"No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
"There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.",
@@ -22,32 +24,29 @@
"Error" => "Feil",
"Share" => "Del",
"Delete permanently" => "Slett permanent",
-"Delete" => "Slett",
-"Rename" => "Omdøp",
+"Rename" => "Gi nytt navn",
"Pending" => "Ventende",
"{new_name} already exists" => "{new_name} finnes allerede",
"replace" => "erstatt",
"suggest name" => "foreslå navn",
"cancel" => "avbryt",
-"replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
+"replaced {new_name} with {old_name}" => "erstattet {new_name} med {old_name}",
"undo" => "angre",
-"perform delete operation" => "utfør sletting",
-"1 file uploading" => "1 fil lastes opp",
+"_Uploading %n file_::_Uploading %n files_" => array("Laster opp %n fil","Laster opp %n filer"),
"files uploading" => "filer lastes opp",
"'.' is an invalid file name." => "'.' er et ugyldig filnavn.",
"File name cannot be empty." => "Filnavn kan ikke være tomt.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
"Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)",
+"Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
"Name" => "Navn",
"Size" => "Størrelse",
"Modified" => "Endret",
-"1 folder" => "1 mappe",
-"{count} folders" => "{count} mapper",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
+"%s could not be renamed" => "Kunne ikke gi nytt navn til %s",
"Upload" => "Last opp",
"File handling" => "Filhåndtering",
"Maximum upload size" => "Maksimum opplastingsstørrelse",
@@ -67,9 +66,10 @@
"Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
"Download" => "Last ned",
"Unshare" => "Avslutt deling",
+"Delete" => "Slett",
"Upload too large" => "Filen er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
-"Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
+"Files are being scanned, please wait." => "Skanner filer, vennligst vent.",
"Current scanning" => "Pågående skanning",
"directory" => "katalog",
"directories" => "kataloger",
@@ -77,3 +77,4 @@
"files" => "filer",
"Upgrading filesystem cache..." => "Oppgraderer filsystemets mellomlager..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 0d906cb138b..6e9ff605f50 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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 set upload directory." => "Kan upload map niet instellen.",
@@ -23,7 +24,6 @@
"Error" => "Fout",
"Share" => "Delen",
"Delete permanently" => "Verwijder definitief",
-"Delete" => "Verwijder",
"Rename" => "Hernoem",
"Pending" => "In behandeling",
"{new_name} already exists" => "{new_name} bestaat al",
@@ -32,23 +32,21 @@
"cancel" => "annuleren",
"replaced {new_name} with {old_name}" => "verving {new_name} met {old_name}",
"undo" => "ongedaan maken",
-"perform delete operation" => "uitvoeren verwijderactie",
-"1 file uploading" => "1 bestand wordt ge-upload",
+"_Uploading %n file_::_Uploading %n files_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"),
"files uploading" => "bestanden aan het uploaden",
"'.' 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.",
"Your storage is full, files can not be updated or synced anymore!" => "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
"Your storage is almost full ({usedSpacePercent}%)" => "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen.",
"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.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud",
"Name" => "Naam",
"Size" => "Grootte",
"Modified" => "Aangepast",
-"1 folder" => "1 map",
-"{count} folders" => "{count} mappen",
-"1 file" => "1 bestand",
-"{count} files" => "{count} bestanden",
+"_%n folder_::_%n folders_" => array("","%n mappen"),
+"_%n file_::_%n files_" => array("","%n bestanden"),
"%s could not be renamed" => "%s kon niet worden hernoemd",
"Upload" => "Uploaden",
"File handling" => "Bestand",
@@ -69,6 +67,7 @@
"Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",
"Download" => "Downloaden",
"Unshare" => "Stop met delen",
+"Delete" => "Verwijder",
"Upload too large" => "Upload is te groot",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server.",
"Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
@@ -79,3 +78,4 @@
"files" => "bestanden",
"Upgrading filesystem cache..." => "Upgraden bestandssysteem cache..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index dcc3373bea0..0f0ad318740 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet",
"Could not move %s" => "Klarte ikkje flytta %s",
"No file was uploaded. Unknown error" => "Ingen filer lasta opp. Ukjend feil",
@@ -21,7 +22,6 @@
"Error" => "Feil",
"Share" => "Del",
"Delete permanently" => "Slett for godt",
-"Delete" => "Slett",
"Rename" => "Endra namn",
"Pending" => "Under vegs",
"{new_name} already exists" => "{new_name} finst allereie",
@@ -30,8 +30,7 @@
"cancel" => "avbryt",
"replaced {new_name} with {old_name}" => "bytte ut {new_name} med {old_name}",
"undo" => "angre",
-"perform delete operation" => "utfør sletting",
-"1 file uploading" => "1 fil lastar opp",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"files uploading" => "filer lastar opp",
"'.' is an invalid file name." => "«.» er eit ugyldig filnamn.",
"File name cannot be empty." => "Filnamnet kan ikkje vera tomt.",
@@ -43,10 +42,8 @@
"Name" => "Namn",
"Size" => "Storleik",
"Modified" => "Endra",
-"1 folder" => "1 mappe",
-"{count} folders" => "{count} mapper",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Upload" => "Last opp",
"File handling" => "Filhandtering",
"Maximum upload size" => "Maksimal opplastingsstorleik",
@@ -66,9 +63,11 @@
"Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
"Download" => "Last ned",
"Unshare" => "Udel",
+"Delete" => "Slett",
"Upload too large" => "For stor opplasting",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.",
"Files are being scanned, please wait." => "Skannar filer, ver venleg og vent.",
"Current scanning" => "Køyrande skanning",
"Upgrading filesystem cache..." => "Oppgraderer mellomlageret av filsystemet …"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index 703aeb3fbad..552d72bef59 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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",
@@ -11,18 +12,19 @@
"File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ",
"Error" => "Error",
"Share" => "Parteja",
-"Delete" => "Escafa",
"Rename" => "Torna nomenar",
"Pending" => "Al esperar",
"replace" => "remplaça",
"suggest name" => "nom prepausat",
"cancel" => "anulla",
"undo" => "defar",
-"1 file uploading" => "1 fichièr al amontcargar",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"files uploading" => "fichièrs al amontcargar",
"Name" => "Nom",
"Size" => "Talha",
"Modified" => "Modificat",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Upload" => "Amontcarga",
"File handling" => "Manejament de fichièr",
"Maximum upload size" => "Talha maximum d'amontcargament",
@@ -39,6 +41,7 @@
"Nothing in here. Upload something!" => "Pas res dedins. Amontcarga qualquaren",
"Download" => "Avalcarga",
"Unshare" => "Pas partejador",
+"Delete" => "Escafa",
"Upload too large" => "Amontcargament tròp gròs",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.",
"Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, ",
@@ -46,3 +49,4 @@
"file" => "fichièr",
"files" => "fichièrs"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index a3acfea6618..813d2ee8e7c 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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 set upload directory." => "Nie można ustawić katalog wczytywania.",
@@ -23,7 +24,6 @@
"Error" => "Błąd",
"Share" => "Udostępnij",
"Delete permanently" => "Trwale usuń",
-"Delete" => "Usuń",
"Rename" => "Zmień nazwę",
"Pending" => "Oczekujące",
"{new_name} already exists" => "{new_name} już istnieje",
@@ -32,8 +32,7 @@
"cancel" => "anuluj",
"replaced {new_name} with {old_name}" => "zastąpiono {new_name} przez {old_name}",
"undo" => "cofnij",
-"perform delete operation" => "wykonaj operację usunięcia",
-"1 file uploading" => "1 plik wczytywany",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
"files uploading" => "pliki wczytane",
"'.' is an invalid file name." => "„.” jest nieprawidłową nazwą pliku.",
"File name cannot be empty." => "Nazwa pliku nie może być pusta.",
@@ -45,10 +44,8 @@
"Name" => "Nazwa",
"Size" => "Rozmiar",
"Modified" => "Modyfikacja",
-"1 folder" => "1 folder",
-"{count} folders" => "Ilość folderów: {count}",
-"1 file" => "1 plik",
-"{count} files" => "Ilość plików: {count}",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"%s could not be renamed" => "%s nie można zmienić nazwy",
"Upload" => "Wyślij",
"File handling" => "Zarządzanie plikami",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "Pusto. Wyślij coś!",
"Download" => "Pobierz",
"Unshare" => "Zatrzymaj współdzielenie",
+"Delete" => "Usuń",
"Upload too large" => "Ładowany plik jest za duży",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
"Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
@@ -79,3 +77,4 @@
"files" => "pliki",
"Upgrading filesystem cache..." => "Uaktualnianie plików pamięci podręcznej..."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/pl_PL.php b/apps/files/l10n/pl_PL.php
index 157d9a41e4d..b67f67b972e 100644
--- a/apps/files/l10n/pl_PL.php
+++ b/apps/files/l10n/pl_PL.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Save" => "Zapisz"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 3ad679f8764..575df891114 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Impossível mover %s - Um arquivo com este nome já existe",
"Could not move %s" => "Impossível mover %s",
"Unable to set upload directory." => "Impossível configurar o diretório de upload",
@@ -23,7 +24,6 @@
"Error" => "Erro",
"Share" => "Compartilhar",
"Delete permanently" => "Excluir permanentemente",
-"Delete" => "Excluir",
"Rename" => "Renomear",
"Pending" => "Pendente",
"{new_name} already exists" => "{new_name} já existe",
@@ -32,8 +32,7 @@
"cancel" => "cancelar",
"replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ",
"undo" => "desfazer",
-"perform delete operation" => "realizar operação de exclusão",
-"1 file uploading" => "enviando 1 arquivo",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"files uploading" => "enviando arquivos",
"'.' is an invalid file name." => "'.' é um nome de arquivo inválido.",
"File name cannot be empty." => "O nome do arquivo não pode estar vazio.",
@@ -45,10 +44,8 @@
"Name" => "Nome",
"Size" => "Tamanho",
"Modified" => "Modificado",
-"1 folder" => "1 pasta",
-"{count} folders" => "{count} pastas",
-"1 file" => "1 arquivo",
-"{count} files" => "{count} arquivos",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "%s não pode ser renomeado",
"Upload" => "Upload",
"File handling" => "Tratamento de Arquivo",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
"Download" => "Baixar",
"Unshare" => "Descompartilhar",
+"Delete" => "Excluir",
"Upload too large" => "Upload muito grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
"Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.",
@@ -79,3 +77,4 @@
"files" => "arquivos",
"Upgrading filesystem cache..." => "Atualizando cache do sistema de arquivos..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 8aeb30efbf2..64110f6704a 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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 set upload directory." => "Não foi possível criar o diretório de upload",
@@ -23,7 +24,6 @@
"Error" => "Erro",
"Share" => "Partilhar",
"Delete permanently" => "Eliminar permanentemente",
-"Delete" => "Eliminar",
"Rename" => "Renomear",
"Pending" => "Pendente",
"{new_name} already exists" => "O nome {new_name} já existe",
@@ -32,8 +32,7 @@
"cancel" => "cancelar",
"replaced {new_name} with {old_name}" => "substituido {new_name} por {old_name}",
"undo" => "desfazer",
-"perform delete operation" => "Executar a tarefa de apagar",
-"1 file uploading" => "A enviar 1 ficheiro",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"files uploading" => "A enviar os ficheiros",
"'.' 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.",
@@ -45,10 +44,8 @@
"Name" => "Nome",
"Size" => "Tamanho",
"Modified" => "Modificado",
-"1 folder" => "1 pasta",
-"{count} folders" => "{count} pastas",
-"1 file" => "1 ficheiro",
-"{count} files" => "{count} ficheiros",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"%s could not be renamed" => "%s não pode ser renomeada",
"Upload" => "Carregar",
"File handling" => "Manuseamento de ficheiros",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
"Download" => "Transferir",
"Unshare" => "Deixar de partilhar",
+"Delete" => "Eliminar",
"Upload too large" => "Upload muito grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
"Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
@@ -79,3 +77,4 @@
"files" => "ficheiros",
"Upgrading filesystem cache..." => "Atualizar cache do sistema de ficheiros..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index b0cca7d7a82..85805cf5623 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s nu se poate muta - Fișierul cu acest nume există deja ",
"Could not move %s" => "Nu s-a putut muta %s",
"Unable to set upload directory." => "Imposibil de a seta directorul pentru incărcare.",
@@ -23,7 +24,6 @@
"Error" => "Eroare",
"Share" => "Partajează",
"Delete permanently" => "Stergere permanenta",
-"Delete" => "Șterge",
"Rename" => "Redenumire",
"Pending" => "În așteptare",
"{new_name} already exists" => "{new_name} deja exista",
@@ -32,8 +32,7 @@
"cancel" => "anulare",
"replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}",
"undo" => "Anulează ultima acțiune",
-"perform delete operation" => "efectueaza operatiunea de stergere",
-"1 file uploading" => "un fișier se încarcă",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
"files uploading" => "fișiere se încarcă",
"'.' 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.",
@@ -45,10 +44,8 @@
"Name" => "Nume",
"Size" => "Dimensiune",
"Modified" => "Modificat",
-"1 folder" => "1 folder",
-"{count} folders" => "{count} foldare",
-"1 file" => "1 fisier",
-"{count} files" => "{count} fisiere",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"%s could not be renamed" => "%s nu a putut fi redenumit",
"Upload" => "Încărcare",
"File handling" => "Manipulare fișiere",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
"Download" => "Descarcă",
"Unshare" => "Anulare partajare",
+"Delete" => "Șterge",
"Upload too large" => "Fișierul încărcat este prea mare",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",
"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.",
@@ -79,3 +77,4 @@
"files" => "fișiere",
"Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 71742cb4d57..fe771d2b571 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Невозможно переместить %s - файл с таким именем уже существует",
"Could not move %s" => "Невозможно переместить %s",
"Unable to set upload directory." => "Не удалось установить каталог загрузки.",
@@ -23,7 +24,6 @@
"Error" => "Ошибка",
"Share" => "Открыть доступ",
"Delete permanently" => "Удалено навсегда",
-"Delete" => "Удалить",
"Rename" => "Переименовать",
"Pending" => "Ожидание",
"{new_name} already exists" => "{new_name} уже существует",
@@ -32,8 +32,7 @@
"cancel" => "отмена",
"replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}",
"undo" => "отмена",
-"perform delete operation" => "выполнить операцию удаления",
-"1 file uploading" => "загружается 1 файл",
+"_Uploading %n file_::_Uploading %n files_" => array("Закачка %n файла","Закачка %n файлов","Закачка %n файлов"),
"files uploading" => "файлы загружаются",
"'.' is an invalid file name." => "'.' - неправильное имя файла.",
"File name cannot be empty." => "Имя файла не может быть пустым.",
@@ -45,10 +44,8 @@
"Name" => "Имя",
"Size" => "Размер",
"Modified" => "Изменён",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папок",
-"1 file" => "1 файл",
-"{count} files" => "{count} файлов",
+"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"),
+"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"),
"%s could not be renamed" => "%s не может быть переименован",
"Upload" => "Загрузка",
"File handling" => "Управление файлами",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
"Download" => "Скачать",
"Unshare" => "Закрыть общий доступ",
+"Delete" => "Удалить",
"Upload too large" => "Файл слишком велик",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",
"Files are being scanned, please wait." => "Подождите, файлы сканируются.",
@@ -79,3 +77,4 @@
"files" => "файлы",
"Upgrading filesystem cache..." => "Обновление кэша файловой системы..."
);
+$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);";
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
deleted file mode 100644
index e0bfab33215..00000000000
--- a/apps/files/l10n/ru_RU.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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" => "Размер загружаемого файла превысил максимально допустимый в директиве MAX_FILE_SIZE, специфицированной в HTML-форме",
-"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен лишь частично",
-"No file was uploaded" => "Файл не был загружен",
-"Missing a temporary folder" => "Отсутствие временной папки",
-"Failed to write to disk" => "Не удалось записать на диск",
-"Not enough storage available" => "Недостаточно места в хранилище",
-"Share" => "Сделать общим",
-"Delete" => "Удалить",
-"Error" => "Ошибка",
-"Name" => "Имя",
-"Save" => "Сохранить",
-"Download" => "Загрузка"
-);
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index 82fca4bc75d..ffb28e09584 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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 විශාලත්වයට වඩා වැඩිය",
@@ -12,18 +13,17 @@
"URL cannot be empty." => "යොමුව හිස් විය නොහැක",
"Error" => "දෝෂයක්",
"Share" => "බෙදා හදා ගන්න",
-"Delete" => "මකා දමන්න",
"Rename" => "නැවත නම් කරන්න",
"replace" => "ප්‍රතිස්ථාපනය කරන්න",
"suggest name" => "නමක් යෝජනා කරන්න",
"cancel" => "අත් හරින්න",
"undo" => "නිෂ්ප්‍රභ කරන්න",
-"1 file uploading" => "1 ගොනුවක් උඩගත කෙරේ",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Name" => "නම",
"Size" => "ප්‍රමාණය",
"Modified" => "වෙනස් කළ",
-"1 folder" => "1 ෆොල්ඩරයක්",
-"1 file" => "1 ගොනුවක්",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Upload" => "උඩුගත කරන්න",
"File handling" => "ගොනු පරිහරණය",
"Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
@@ -41,6 +41,7 @@
"Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
"Download" => "බාන්න",
"Unshare" => "නොබෙදු",
+"Delete" => "මකා දමන්න",
"Upload too large" => "උඩුගත කිරීම විශාල වැඩිය",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය",
"Files are being scanned, please wait." => "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න",
@@ -48,3 +49,4 @@
"file" => "ගොනුව",
"files" => "ගොනු"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index ac71f30e907..41ff4fe25da 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Nie je možné presunúť %s - súbor s týmto menom už existuje",
"Could not move %s" => "Nie je možné presunúť %s",
"Unable to set upload directory." => "Nemožno nastaviť priečinok pre nahrané súbory.",
@@ -23,7 +24,6 @@
"Error" => "Chyba",
"Share" => "Zdieľať",
"Delete permanently" => "Zmazať trvalo",
-"Delete" => "Zmazať",
"Rename" => "Premenovať",
"Pending" => "Prebieha",
"{new_name} already exists" => "{new_name} už existuje",
@@ -32,23 +32,21 @@
"cancel" => "zrušiť",
"replaced {new_name} with {old_name}" => "prepísaný {new_name} súborom {old_name}",
"undo" => "vrátiť",
-"perform delete operation" => "vykonať zmazanie",
-"1 file uploading" => "1 súbor sa posiela ",
+"_Uploading %n file_::_Uploading %n files_" => array("Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"),
"files uploading" => "nahrávanie súborov",
"'.' is an invalid file name." => "'.' je neplatné meno súboru.",
"File name cannot be empty." => "Meno súboru nemôže byť prázdne",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.",
"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov.",
"Your download is being prepared. This might take some time if the files are big." => "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len pre Owncloud",
"Name" => "Názov",
"Size" => "Veľkosť",
"Modified" => "Upravené",
-"1 folder" => "1 priečinok",
-"{count} folders" => "{count} priečinkov",
-"1 file" => "1 súbor",
-"{count} files" => "{count} súborov",
+"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"),
+"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"),
"%s could not be renamed" => "%s nemohol byť premenovaný",
"Upload" => "Odoslať",
"File handling" => "Nastavenie správania sa k súborom",
@@ -69,6 +67,7 @@
"Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
"Download" => "Sťahovanie",
"Unshare" => "Zrušiť zdieľanie",
+"Delete" => "Zmazať",
"Upload too large" => "Nahrávanie je príliš veľké",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
"Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané.",
@@ -79,3 +78,4 @@
"files" => "súbory",
"Upgrading filesystem cache..." => "Aktualizujem medzipamäť súborového systému..."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index bb01e5475d5..9922a0be7ee 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s ni mogoče premakniti - datoteka s tem imenom že obstaja",
"Could not move %s" => "Ni mogoče premakniti %s",
"Unable to set upload directory." => "Mapo, v katero boste prenašali dokumente, ni mogoče določiti",
@@ -23,7 +24,6 @@
"Error" => "Napaka",
"Share" => "Souporaba",
"Delete permanently" => "Izbriši dokončno",
-"Delete" => "Izbriši",
"Rename" => "Preimenuj",
"Pending" => "V čakanju ...",
"{new_name} already exists" => "{new_name} že obstaja",
@@ -32,8 +32,7 @@
"cancel" => "prekliči",
"replaced {new_name} with {old_name}" => "preimenovano ime {new_name} z imenom {old_name}",
"undo" => "razveljavi",
-"perform delete operation" => "izvedi opravilo brisanja",
-"1 file uploading" => "Pošiljanje 1 datoteke",
+"_Uploading %n file_::_Uploading %n files_" => array("","","",""),
"files uploading" => "poteka pošiljanje datotek",
"'.' is an invalid file name." => "'.' je neveljavno ime datoteke.",
"File name cannot be empty." => "Ime datoteke ne sme biti prazno polje.",
@@ -45,10 +44,8 @@
"Name" => "Ime",
"Size" => "Velikost",
"Modified" => "Spremenjeno",
-"1 folder" => "1 mapa",
-"{count} folders" => "{count} map",
-"1 file" => "1 datoteka",
-"{count} files" => "{count} datotek",
+"_%n folder_::_%n folders_" => array("","","",""),
+"_%n file_::_%n files_" => array("","","",""),
"%s could not be renamed" => "%s ni bilo mogoče preimenovati",
"Upload" => "Pošlji",
"File handling" => "Upravljanje z datotekami",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!",
"Download" => "Prejmi",
"Unshare" => "Prekliči souporabo",
+"Delete" => "Izbriši",
"Upload too large" => "Prekoračenje omejitve velikosti",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.",
"Files are being scanned, please wait." => "Poteka preučevanje datotek, počakajte ...",
@@ -79,3 +77,4 @@
"files" => "datoteke",
"Upgrading filesystem cache..." => "Nadgrajevanje predpomnilnika datotečnega sistema ..."
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
index 2daca10a416..34250b56c3e 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s nuk u spostua - Aty ekziston një skedar me të njëjtin emër",
"Could not move %s" => "%s nuk u spostua",
"No file was uploaded. Unknown error" => "Nuk u ngarkua asnjë skedar. Veprim i gabuar i panjohur",
@@ -20,7 +21,6 @@
"Error" => "Veprim i gabuar",
"Share" => "Nda",
"Delete permanently" => "Elimino përfundimisht",
-"Delete" => "Elimino",
"Rename" => "Riemërto",
"Pending" => "Pezulluar",
"{new_name} already exists" => "{new_name} ekziston",
@@ -29,8 +29,7 @@
"cancel" => "anulo",
"replaced {new_name} with {old_name}" => "U zëvëndësua {new_name} me {old_name}",
"undo" => "anulo",
-"perform delete operation" => "ekzekuto operacionin e eliminimit",
-"1 file uploading" => "Po ngarkohet 1 skedar",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"files uploading" => "po ngarkoj skedarët",
"'.' is an invalid file name." => "'.' është emër i pavlefshëm.",
"File name cannot be empty." => "Emri i skedarit nuk mund të jetë bosh.",
@@ -42,10 +41,8 @@
"Name" => "Emri",
"Size" => "Dimensioni",
"Modified" => "Modifikuar",
-"1 folder" => "1 dosje",
-"{count} folders" => "{count} dosje",
-"1 file" => "1 skedar",
-"{count} files" => "{count} skedarë",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Upload" => "Ngarko",
"File handling" => "Trajtimi i skedarit",
"Maximum upload size" => "Dimensioni maksimal i ngarkimit",
@@ -65,9 +62,11 @@
"Nothing in here. Upload something!" => "Këtu nuk ka asgjë. Ngarkoni diçka!",
"Download" => "Shkarko",
"Unshare" => "Hiq ndarjen",
+"Delete" => "Elimino",
"Upload too large" => "Ngarkimi është shumë i madh",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Skedarët që doni të ngarkoni tejkalojnë dimensionet maksimale për ngarkimet në këtë server.",
"Files are being scanned, please wait." => "Skedarët po analizohen, ju lutemi pritni.",
"Current scanning" => "Analizimi aktual",
"Upgrading filesystem cache..." => "Po përmirësoj memorjen e filesystem-it..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index 68f2f5a93b6..d73188d483c 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Не могу да преместим %s – датотека с овим именом већ постоји",
"Could not move %s" => "Не могу да преместим %s",
"No file was uploaded. Unknown error" => "Ниједна датотека није отпремљена услед непознате грешке",
@@ -20,7 +21,6 @@
"Error" => "Грешка",
"Share" => "Дели",
"Delete permanently" => "Обриши за стално",
-"Delete" => "Обриши",
"Rename" => "Преименуј",
"Pending" => "На чекању",
"{new_name} already exists" => "{new_name} већ постоји",
@@ -29,8 +29,7 @@
"cancel" => "откажи",
"replaced {new_name} with {old_name}" => "замењено {new_name} са {old_name}",
"undo" => "опозови",
-"perform delete operation" => "обриши",
-"1 file uploading" => "Отпремам 1 датотеку",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
"files uploading" => "датотеке се отпремају",
"'.' is an invalid file name." => "Датотека „.“ је неисправног имена.",
"File name cannot be empty." => "Име датотеке не може бити празно.",
@@ -42,10 +41,8 @@
"Name" => "Име",
"Size" => "Величина",
"Modified" => "Измењено",
-"1 folder" => "1 фасцикла",
-"{count} folders" => "{count} фасцикле/и",
-"1 file" => "1 датотека",
-"{count} files" => "{count} датотеке/а",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Upload" => "Отпреми",
"File handling" => "Управљање датотекама",
"Maximum upload size" => "Највећа величина датотеке",
@@ -65,9 +62,11 @@
"Nothing in here. Upload something!" => "Овде нема ничег. Отпремите нешто!",
"Download" => "Преузми",
"Unshare" => "Укини дељење",
+"Delete" => "Обриши",
"Upload too large" => "Датотека је превелика",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеке које желите да отпремите прелазе ограничење у величини.",
"Files are being scanned, please wait." => "Скенирам датотеке…",
"Current scanning" => "Тренутно скенирање",
"Upgrading filesystem cache..." => "Дограђујем кеш система датотека…"
);
+$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);";
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index fb08bca2cae..bc7b11b8c53 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -1,19 +1,24 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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!",
"No file was uploaded" => "Nijedan fajl nije poslat",
"Missing a temporary folder" => "Nedostaje privremena fascikla",
"Files" => "Fajlovi",
-"Delete" => "Obriši",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
"Name" => "Ime",
"Size" => "Veličina",
"Modified" => "Zadnja izmena",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Upload" => "Pošalji",
"Maximum upload size" => "Maksimalna veličina pošiljke",
"Save" => "Snimi",
"Nothing in here. Upload something!" => "Ovde nema ničeg. Pošaljite nešto!",
"Download" => "Preuzmi",
+"Delete" => "Obriši",
"Upload too large" => "Pošiljka je prevelika",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
);
+$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);";
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 70f3121a20c..d9010bc0f53 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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 set upload directory." => "Kan inte sätta mapp för uppladdning.",
@@ -23,7 +24,6 @@
"Error" => "Fel",
"Share" => "Dela",
"Delete permanently" => "Radera permanent",
-"Delete" => "Radera",
"Rename" => "Byt namn",
"Pending" => "Väntar",
"{new_name} already exists" => "{new_name} finns redan",
@@ -32,23 +32,21 @@
"cancel" => "avbryt",
"replaced {new_name} with {old_name}" => "ersatt {new_name} med {old_name}",
"undo" => "ångra",
-"perform delete operation" => "utför raderingen",
-"1 file uploading" => "1 filuppladdning",
+"_Uploading %n file_::_Uploading %n files_" => array("Laddar upp %n fil","Laddar upp %n filer"),
"files uploading" => "filer laddas upp",
"'.' 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.",
"Your storage is full, files can not be updated or synced anymore!" => "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer.",
"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.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud",
"Name" => "Namn",
"Size" => "Storlek",
"Modified" => "Ändrad",
-"1 folder" => "1 mapp",
-"{count} folders" => "{count} mappar",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
"%s could not be renamed" => "%s kunde inte namnändras",
"Upload" => "Ladda upp",
"File handling" => "Filhantering",
@@ -69,6 +67,7 @@
"Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
"Download" => "Ladda ner",
"Unshare" => "Sluta dela",
+"Delete" => "Radera",
"Upload too large" => "För stor uppladdning",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
"Files are being scanned, please wait." => "Filer skannas, var god vänta",
@@ -79,3 +78,4 @@
"files" => "filer",
"Upgrading filesystem cache..." => "Uppgraderar filsystemets cache..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index e03b88569b7..eb39218e48d 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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 ஐ விட கூடியது",
@@ -13,7 +14,6 @@
"URL cannot be empty." => "URL வெறுமையாக இருக்கமுடியாது.",
"Error" => "வழு",
"Share" => "பகிர்வு",
-"Delete" => "நீக்குக",
"Rename" => "பெயர்மாற்றம்",
"Pending" => "நிலுவையிலுள்ள",
"{new_name} already exists" => "{new_name} ஏற்கனவே உள்ளது",
@@ -22,15 +22,13 @@
"cancel" => "இரத்து செய்க",
"replaced {new_name} with {old_name}" => "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது",
"undo" => "முன் செயல் நீக்கம் ",
-"1 file uploading" => "1 கோப்பு பதிவேற்றப்படுகிறது",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
"Name" => "பெயர்",
"Size" => "அளவு",
"Modified" => "மாற்றப்பட்டது",
-"1 folder" => "1 கோப்புறை",
-"{count} folders" => "{எண்ணிக்கை} கோப்புறைகள்",
-"1 file" => "1 கோப்பு",
-"{count} files" => "{எண்ணிக்கை} கோப்புகள்",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Upload" => "பதிவேற்றுக",
"File handling" => "கோப்பு கையாளுதல்",
"Maximum upload size" => "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
@@ -48,8 +46,10 @@
"Nothing in here. Upload something!" => "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!",
"Download" => "பதிவிறக்குக",
"Unshare" => "பகிரப்படாதது",
+"Delete" => "நீக்குக",
"Upload too large" => "பதிவேற்றல் மிகப்பெரியது",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது.",
"Files are being scanned, please wait." => "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்.",
"Current scanning" => "தற்போது வருடப்படுபவை"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/te.php b/apps/files/l10n/te.php
index 710034de12e..5a108274dd9 100644
--- a/apps/files/l10n/te.php
+++ b/apps/files/l10n/te.php
@@ -1,10 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "పొరపాటు",
"Delete permanently" => "శాశ్వతంగా తొలగించు",
-"Delete" => "తొలగించు",
"cancel" => "రద్దుచేయి",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Name" => "పేరు",
"Size" => "పరిమాణం",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Save" => "భద్రపరచు",
-"Folder" => "సంచయం"
+"Folder" => "సంచయం",
+"Delete" => "తొలగించు"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 5b2eab6b3a1..c101398918e 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "ไม่สามารถย้าย %s ได้ - ไฟล์ที่ใช้ชื่อนี้มีอยู่แล้ว",
"Could not move %s" => "ไม่สามารถย้าย %s ได้",
"No file was uploaded. Unknown error" => "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ",
@@ -19,7 +20,6 @@
"URL cannot be empty." => "URL ไม่สามารถเว้นว่างได้",
"Error" => "ข้อผิดพลาด",
"Share" => "แชร์",
-"Delete" => "ลบ",
"Rename" => "เปลี่ยนชื่อ",
"Pending" => "อยู่ระหว่างดำเนินการ",
"{new_name} already exists" => "{new_name} มีอยู่แล้วในระบบ",
@@ -28,8 +28,7 @@
"cancel" => "ยกเลิก",
"replaced {new_name} with {old_name}" => "แทนที่ {new_name} ด้วย {old_name} แล้ว",
"undo" => "เลิกทำ",
-"perform delete operation" => "ดำเนินการตามคำสั่งลบ",
-"1 file uploading" => "กำลังอัพโหลดไฟล์ 1 ไฟล์",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
"files uploading" => "การอัพโหลดไฟล์",
"'.' is an invalid file name." => "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง",
"File name cannot be empty." => "ชื่อไฟล์ไม่สามารถเว้นว่างได้",
@@ -41,10 +40,8 @@
"Name" => "ชื่อ",
"Size" => "ขนาด",
"Modified" => "แก้ไขแล้ว",
-"1 folder" => "1 โฟลเดอร์",
-"{count} folders" => "{count} โฟลเดอร์",
-"1 file" => "1 ไฟล์",
-"{count} files" => "{count} ไฟล์",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Upload" => "อัพโหลด",
"File handling" => "การจัดกาไฟล์",
"Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
@@ -62,6 +59,7 @@
"Nothing in here. Upload something!" => "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!",
"Download" => "ดาวน์โหลด",
"Unshare" => "ยกเลิกการแชร์",
+"Delete" => "ลบ",
"Upload too large" => "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
"Files are being scanned, please wait." => "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
@@ -70,3 +68,4 @@
"files" => "ไฟล์",
"Upgrading filesystem cache..." => "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 6b479b580eb..725bebfa7db 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"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 set upload directory." => "Yükleme dizini tanımlanamadı.",
@@ -23,7 +24,6 @@
"Error" => "Hata",
"Share" => "Paylaş",
"Delete permanently" => "Kalıcı olarak sil",
-"Delete" => "Sil",
"Rename" => "İsim değiştir.",
"Pending" => "Bekliyor",
"{new_name} already exists" => "{new_name} zaten mevcut",
@@ -32,8 +32,7 @@
"cancel" => "iptal",
"replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile değiştirildi",
"undo" => "geri al",
-"perform delete operation" => "Silme işlemini gerçekleştir",
-"1 file uploading" => "1 dosya yüklendi",
+"_Uploading %n file_::_Uploading %n files_" => array("%n dosya yükleniyor","%n dosya yükleniyor"),
"files uploading" => "Dosyalar yükleniyor",
"'.' is an invalid file name." => "'.' geçersiz dosya adı.",
"File name cannot be empty." => "Dosya adı boş olamaz.",
@@ -45,10 +44,8 @@
"Name" => "İsim",
"Size" => "Boyut",
"Modified" => "Değiştirilme",
-"1 folder" => "1 dizin",
-"{count} folders" => "{count} dizin",
-"1 file" => "1 dosya",
-"{count} files" => "{count} dosya",
+"_%n folder_::_%n folders_" => array("%n dizin","%n dizin"),
+"_%n file_::_%n files_" => array("%n dosya","%n dosya"),
"%s could not be renamed" => "%s yeniden adlandırılamadı",
"Upload" => "Yükle",
"File handling" => "Dosya taşıma",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!",
"Download" => "İndir",
"Unshare" => "Paylaşılmayan",
+"Delete" => "Sil",
"Upload too large" => "Yükleme çok büyük",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
"Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
@@ -79,3 +77,4 @@
"files" => "dosyalar",
"Upgrading filesystem cache..." => "Sistem dosyası önbelleği güncelleniyor"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php
index c11ffe7b9bf..2eceeea44a8 100644
--- a/apps/files/l10n/ug.php
+++ b/apps/files/l10n/ug.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s" => "%s يۆتكىيەلمەيدۇ",
"No file was uploaded. Unknown error" => "ھېچقانداق ھۆججەت يۈكلەنمىدى. يوچۇن خاتالىق",
"No file was uploaded" => "ھېچقانداق ھۆججەت يۈكلەنمىدى",
@@ -12,7 +13,6 @@
"Error" => "خاتالىق",
"Share" => "ھەمبەھىر",
"Delete permanently" => "مەڭگۈلۈك ئۆچۈر",
-"Delete" => "ئۆچۈر",
"Rename" => "ئات ئۆزگەرت",
"Pending" => "كۈتۈۋاتىدۇ",
"{new_name} already exists" => "{new_name} مەۋجۇت",
@@ -20,14 +20,13 @@
"suggest name" => "تەۋسىيە ئات",
"cancel" => "ۋاز كەچ",
"undo" => "يېنىۋال",
-"1 file uploading" => "1 ھۆججەت يۈكلىنىۋاتىدۇ",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
"files uploading" => "ھۆججەت يۈكلىنىۋاتىدۇ",
"Name" => "ئاتى",
"Size" => "چوڭلۇقى",
"Modified" => "ئۆزگەرتكەن",
-"1 folder" => "1 قىسقۇچ",
-"1 file" => "1 ھۆججەت",
-"{count} files" => "{count} ھۆججەت",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Upload" => "يۈكلە",
"Save" => "ساقلا",
"New" => "يېڭى",
@@ -38,6 +37,8 @@
"Nothing in here. Upload something!" => "بۇ جايدا ھېچنېمە يوق. Upload something!",
"Download" => "چۈشۈر",
"Unshare" => "ھەمبەھىرلىمە",
+"Delete" => "ئۆچۈر",
"Upload too large" => "يۈكلەندىغىنى بەك چوڭ",
"Upgrading filesystem cache..." => "ھۆججەت سىستېما غەملىكىنى يۈكسەلدۈرۈۋاتىدۇ…"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 261853ef202..f34383d969d 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Не вдалося перемістити %s - Файл з таким ім'ям вже існує",
"Could not move %s" => "Не вдалося перемістити %s",
"No file was uploaded. Unknown error" => "Не завантажено жодного файлу. Невідома помилка",
@@ -20,7 +21,6 @@
"Error" => "Помилка",
"Share" => "Поділитися",
"Delete permanently" => "Видалити назавжди",
-"Delete" => "Видалити",
"Rename" => "Перейменувати",
"Pending" => "Очікування",
"{new_name} already exists" => "{new_name} вже існує",
@@ -29,8 +29,7 @@
"cancel" => "відміна",
"replaced {new_name} with {old_name}" => "замінено {new_name} на {old_name}",
"undo" => "відмінити",
-"perform delete operation" => "виконати операцію видалення",
-"1 file uploading" => "1 файл завантажується",
+"_Uploading %n file_::_Uploading %n files_" => array("","",""),
"files uploading" => "файли завантажуються",
"'.' is an invalid file name." => "'.' це невірне ім'я файлу.",
"File name cannot be empty." => " Ім'я файлу не може бути порожнім.",
@@ -42,10 +41,9 @@
"Name" => "Ім'я",
"Size" => "Розмір",
"Modified" => "Змінено",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папок",
-"1 file" => "1 файл",
-"{count} files" => "{count} файлів",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
+"%s could not be renamed" => "%s не може бути перейменований",
"Upload" => "Вивантажити",
"File handling" => "Робота з файлами",
"Maximum upload size" => "Максимальний розмір відвантажень",
@@ -65,11 +63,15 @@
"Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
"Download" => "Завантажити",
"Unshare" => "Закрити доступ",
+"Delete" => "Видалити",
"Upload too large" => "Файл занадто великий",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
"Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка.",
"Current scanning" => "Поточне сканування",
+"directory" => "каталог",
+"directories" => "каталоги",
"file" => "файл",
"files" => "файли",
"Upgrading filesystem cache..." => "Оновлення кеша файлової системи..."
);
+$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);";
diff --git a/apps/files/l10n/ur_PK.php b/apps/files/l10n/ur_PK.php
index aa87eeda385..15c24700df0 100644
--- a/apps/files/l10n/ur_PK.php
+++ b/apps/files/l10n/ur_PK.php
@@ -1,4 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "ایرر",
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Unshare" => "شئیرنگ ختم کریں"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index e3c9fd5488a..ae5b152ed08 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Không thể di chuyển %s - Đã có tên tập tin này trên hệ thống",
"Could not move %s" => "Không thể di chuyển %s",
"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",
@@ -20,7 +21,6 @@
"Error" => "Lỗi",
"Share" => "Chia sẻ",
"Delete permanently" => "Xóa vĩnh vễn",
-"Delete" => "Xóa",
"Rename" => "Sửa tên",
"Pending" => "Đang chờ",
"{new_name} already exists" => "{new_name} đã tồn tại",
@@ -29,8 +29,7 @@
"cancel" => "hủy",
"replaced {new_name} with {old_name}" => "đã thay thế {new_name} bằng {old_name}",
"undo" => "lùi lại",
-"perform delete operation" => "thực hiện việc xóa",
-"1 file uploading" => "1 tệp tin đang được tải lên",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
"files uploading" => "tệp tin đang được tải lên",
"'.' is an invalid file name." => "'.' là một tên file không hợp lệ",
"File name cannot be empty." => "Tên file không được rỗng",
@@ -42,10 +41,8 @@
"Name" => "Tên",
"Size" => "Kích cỡ",
"Modified" => "Thay đổi",
-"1 folder" => "1 thư mục",
-"{count} folders" => "{count} thư mục",
-"1 file" => "1 tập tin",
-"{count} files" => "{count} tập tin",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Upload" => "Tải lên",
"File handling" => "Xử lý tập tin",
"Maximum upload size" => "Kích thước tối đa ",
@@ -65,6 +62,7 @@
"Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",
"Download" => "Tải về",
"Unshare" => "Bỏ chia sẻ",
+"Delete" => "Xóa",
"Upload too large" => "Tập tin tải lên quá lớn",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",
"Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.",
@@ -73,3 +71,4 @@
"files" => "files",
"Upgrading filesystem cache..." => "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index 469211ca7f4..d031a1e5a55 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "无法移动 %s - 存在同名文件",
"Could not move %s" => "无法移动 %s",
"Unable to set upload directory." => "无法设置上传文件夹",
@@ -23,7 +24,6 @@
"Error" => "出错",
"Share" => "分享",
"Delete permanently" => "永久删除",
-"Delete" => "删除",
"Rename" => "重命名",
"Pending" => "等待中",
"{new_name} already exists" => "{new_name} 已存在",
@@ -32,8 +32,7 @@
"cancel" => "取消",
"replaced {new_name} with {old_name}" => "已用 {old_name} 替换 {new_name}",
"undo" => "撤销",
-"perform delete operation" => "执行删除",
-"1 file uploading" => "1 个文件正在上传",
+"_Uploading %n file_::_Uploading %n files_" => array("正在上传 %n 个文件"),
"files uploading" => "个文件正在上传",
"'.' is an invalid file name." => "'.' 文件名不正确",
"File name cannot be empty." => "文件名不能为空",
@@ -45,10 +44,8 @@
"Name" => "名称",
"Size" => "大小",
"Modified" => "修改日期",
-"1 folder" => "1 个文件夹",
-"{count} folders" => "{count} 个文件夹",
-"1 file" => "1 个文件",
-"{count} files" => "{count} 个文件",
+"_%n folder_::_%n folders_" => array("%n 个文件夹"),
+"_%n file_::_%n files_" => array("%n 个文件"),
"%s could not be renamed" => "不能重命名 %s",
"Upload" => "上传",
"File handling" => "文件处理中",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "这里没有东西.上传点什么!",
"Download" => "下载",
"Unshare" => "取消分享",
+"Delete" => "删除",
"Upload too large" => "上传过大",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "你正在试图上传的文件超过了此服务器支持的最大的文件大小.",
"Files are being scanned, please wait." => "正在扫描文件,请稍候.",
@@ -79,3 +77,4 @@
"files" => "文件",
"Upgrading filesystem cache..." => "升级系统缓存..."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 68680676a19..495e9d9d9dd 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "无法移动 %s - 同名文件已存在",
"Could not move %s" => "无法移动 %s",
"Unable to set upload directory." => "无法设置上传文件夹。",
@@ -23,7 +24,6 @@
"Error" => "错误",
"Share" => "分享",
"Delete permanently" => "永久删除",
-"Delete" => "删除",
"Rename" => "重命名",
"Pending" => "等待",
"{new_name} already exists" => "{new_name} 已存在",
@@ -32,8 +32,7 @@
"cancel" => "取消",
"replaced {new_name} with {old_name}" => "已将 {old_name}替换成 {new_name}",
"undo" => "撤销",
-"perform delete operation" => "进行删除操作",
-"1 file uploading" => "1个文件上传中",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
"files uploading" => "文件上传中",
"'.' is an invalid file name." => "'.' 是一个无效的文件名。",
"File name cannot be empty." => "文件名不能为空。",
@@ -45,10 +44,8 @@
"Name" => "名称",
"Size" => "大小",
"Modified" => "修改日期",
-"1 folder" => "1个文件夹",
-"{count} folders" => "{count} 个文件夹",
-"1 file" => "1 个文件",
-"{count} files" => "{count} 个文件",
+"_%n folder_::_%n folders_" => array("%n 文件夹"),
+"_%n file_::_%n files_" => array("%n个文件"),
"%s could not be renamed" => "%s 不能被重命名",
"Upload" => "上传",
"File handling" => "文件处理",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "这里还什么都没有。上传些东西吧!",
"Download" => "下载",
"Unshare" => "取消共享",
+"Delete" => "删除",
"Upload too large" => "上传文件过大",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
"Files are being scanned, please wait." => "文件正在被扫描,请稍候。",
@@ -77,3 +75,4 @@
"files" => "文件",
"Upgrading filesystem cache..." => "正在更新文件系统缓存..."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_HK.php b/apps/files/l10n/zh_HK.php
index 4402812f2b6..a9064fa7f78 100644
--- a/apps/files/l10n/zh_HK.php
+++ b/apps/files/l10n/zh_HK.php
@@ -1,12 +1,16 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Files" => "文件",
"Error" => "錯誤",
"Share" => "分享",
-"Delete" => "刪除",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
"Name" => "名稱",
-"{count} folders" => "{}文件夾",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Upload" => "上傳",
"Save" => "儲存",
"Download" => "下載",
-"Unshare" => "取消分享"
+"Unshare" => "取消分享",
+"Delete" => "刪除"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 63d2bd92365..b96b02e5d93 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "無法移動 %s - 同名的檔案已經存在",
"Could not move %s" => "無法移動 %s",
"Unable to set upload directory." => "無法設定上傳目錄。",
@@ -23,7 +24,6 @@
"Error" => "錯誤",
"Share" => "分享",
"Delete permanently" => "永久刪除",
-"Delete" => "刪除",
"Rename" => "重新命名",
"Pending" => "等候中",
"{new_name} already exists" => "{new_name} 已經存在",
@@ -32,8 +32,7 @@
"cancel" => "取消",
"replaced {new_name} with {old_name}" => "使用 {new_name} 取代 {old_name}",
"undo" => "復原",
-"perform delete operation" => "進行刪除動作",
-"1 file uploading" => "1 個檔案正在上傳",
+"_Uploading %n file_::_Uploading %n files_" => array(""),
"files uploading" => "檔案正在上傳中",
"'.' is an invalid file name." => "'.' 是不合法的檔名。",
"File name cannot be empty." => "檔名不能為空。",
@@ -45,10 +44,8 @@
"Name" => "名稱",
"Size" => "大小",
"Modified" => "修改",
-"1 folder" => "1 個資料夾",
-"{count} folders" => "{count} 個資料夾",
-"1 file" => "1 個檔案",
-"{count} files" => "{count} 個檔案",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"%s could not be renamed" => "無法重新命名 %s",
"Upload" => "上傳",
"File handling" => "檔案處理",
@@ -69,6 +66,7 @@
"Nothing in here. Upload something!" => "這裡什麼也沒有,上傳一些東西吧!",
"Download" => "下載",
"Unshare" => "取消共享",
+"Delete" => "刪除",
"Upload too large" => "上傳過大",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。",
"Files are being scanned, please wait." => "正在掃描檔案,請稍等。",
@@ -79,3 +77,4 @@
"files" => "檔案",
"Upgrading filesystem cache..." => "正在升級檔案系統快取..."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php
index f7052ef80b0..579e8676cfc 100644
--- a/apps/files/lib/app.php
+++ b/apps/files/lib/app.php
@@ -76,4 +76,4 @@ class App {
return $result;
}
-} \ No newline at end of file
+}
diff --git a/apps/files/lib/capabilities.php b/apps/files/lib/capabilities.php
index 90a5e2f4eb9..d4820e931ba 100644
--- a/apps/files/lib/capabilities.php
+++ b/apps/files/lib/capabilities.php
@@ -21,4 +21,4 @@ class Capabilities {
));
}
-} \ No newline at end of file
+}
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 79c283dc336..360874103f8 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -119,3 +119,4 @@
<!-- config hints for javascript -->
<input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
<input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
+<input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" />
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 2b90a11743d..8eff978cde0 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -114,4 +114,4 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
$this->assertEquals($expected, $result);
}
-} \ No newline at end of file
+}
diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php
index 366f634a51c..945f054ea84 100644
--- a/apps/files_encryption/ajax/changeRecoveryPassword.php
+++ b/apps/files_encryption/ajax/changeRecoveryPassword.php
@@ -49,4 +49,4 @@ if ($return) {
\OCP\JSON::success(array('data' => array('message' => $l->t('Password successfully changed.'))));
} else {
\OCP\JSON::error(array('data' => array('message' => $l->t('Could not change the password. Maybe the old password was not correct.'))));
-} \ No newline at end of file
+}
diff --git a/apps/files_encryption/ajax/updatePrivateKeyPassword.php b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
index 6fd63dae9cd..1e6644da576 100644
--- a/apps/files_encryption/ajax/updatePrivateKeyPassword.php
+++ b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
@@ -51,4 +51,4 @@ if ($return) {
\OCP\JSON::success(array('data' => array('message' => $l->t('Private key password successfully updated.'))));
} else {
\OCP\JSON::error(array('data' => array('message' => $l->t('Could not update the private key password. Maybe the old password was not correct.'))));
-} \ No newline at end of file
+}
diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php
index 1d0f1ac2d17..d6c94bde81e 100644
--- a/apps/files_encryption/ajax/userrecovery.php
+++ b/apps/files_encryption/ajax/userrecovery.php
@@ -38,4 +38,4 @@ if (
}
// Return success or failure
-($return) ? \OCP\JSON::success() : \OCP\JSON::error(); \ No newline at end of file
+($return) ? \OCP\JSON::success() : \OCP\JSON::error();
diff --git a/apps/files_encryption/appinfo/routes.php b/apps/files_encryption/appinfo/routes.php
index ab83432a4b2..07ff920a60d 100644
--- a/apps/files_encryption/appinfo/routes.php
+++ b/apps/files_encryption/appinfo/routes.php
@@ -6,4 +6,4 @@
*/
// Register with the capabilities API
-OC_API::register('get', '/cloud/capabilities', array('OCA\Encryption\Capabilities', 'getCapabilities'), 'files_encryption', OC_API::USER_AUTH); \ No newline at end of file
+OC_API::register('get', '/cloud/capabilities', array('OCA\Encryption\Capabilities', 'getCapabilities'), 'files_encryption', OC_API::USER_AUTH);
diff --git a/apps/files_encryption/css/settings-personal.css b/apps/files_encryption/css/settings-personal.css
index 4ee0acc9768..8eb5bedcb06 100644
--- a/apps/files_encryption/css/settings-personal.css
+++ b/apps/files_encryption/css/settings-personal.css
@@ -7,4 +7,4 @@
, #recoveryEnabledError
, #recoveryEnabledSuccess {
display: none;
-} \ No newline at end of file
+}
diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php
index f93c67d920a..2dd27257abe 100644
--- a/apps/files_encryption/files/error.php
+++ b/apps/files_encryption/files/error.php
@@ -1,6 +1,6 @@
<?php
if (!isset($_)) { //also provide standalone error page
- require_once '../../../lib/base.php';
+ require_once __DIR__ . '/../../../lib/base.php';
$l = OC_L10N::get('files_encryption');
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 741df166b70..de306462d79 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -30,9 +30,6 @@ use OC\Files\Filesystem;
*/
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
@@ -40,9 +37,9 @@ class Hooks {
public static function login($params) {
$l = new \OC_L10N('files_encryption');
//check if all requirements are met
- if(!Helper::checkRequirements() ) {
+ if(!Helper::checkRequirements() || !Helper::checkConfiguration() ) {
$error_msg = $l->t("Missing requirements.");
- $hint = $l->t('Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled.');
+ $hint = $l->t('Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.');
\OC_App::disable('files_encryption');
\OCP\Util::writeLog('Encryption library', $error_msg . ' ' . $hint, \OCP\Util::ERROR);
\OCP\Template::printErrorPage($error_msg, $hint);
@@ -62,18 +59,7 @@ class Hooks {
return false;
}
- $encryptedKey = Keymanager::getPrivateKey($view, $params['uid']);
-
- $privateKey = Crypt::decryptPrivateKey($encryptedKey, $params['password']);
-
- if ($privateKey === false) {
- \OCP\Util::writeLog('Encryption library', 'Private key for user "' . $params['uid']
- . '" is not valid! Maybe the user password was changed from outside if so please change it back to gain access', \OCP\Util::ERROR);
- }
-
- $session = new \OCA\Encryption\Session($view);
-
- $session->setPrivateKey($privateKey);
+ $session = $util->initEncryption($params);
// Check if first-run file migration has already been performed
$ready = false;
diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js
index 7c1866445ee..6647c621e7b 100644
--- a/apps/files_encryption/js/settings-admin.js
+++ b/apps/files_encryption/js/settings-admin.js
@@ -99,4 +99,4 @@ $(document).ready(function(){
);
});
-}); \ No newline at end of file
+});
diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js
index d6535a25b70..e16519c3c98 100644
--- a/apps/files_encryption/js/settings-personal.js
+++ b/apps/files_encryption/js/settings-personal.js
@@ -95,4 +95,4 @@ $(document).ready(function(){
updatePrivateKeyPasswd();
});
-}); \ No newline at end of file
+});
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index 1adc158c6b8..45a0c4616f4 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "جاري الحفظ...",
"Encryption" => "التشفير"
);
+$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;";
diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
index f21f7641c1a..9060c92ed43 100644
--- a/apps/files_encryption/l10n/bg_BG.php
+++ b/apps/files_encryption/l10n/bg_BG.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Записване...",
"Encryption" => "Криптиране"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/bn_BD.php b/apps/files_encryption/l10n/bn_BD.php
index 068de46e7a1..5fc4f6a13f3 100644
--- a/apps/files_encryption/l10n/bn_BD.php
+++ b/apps/files_encryption/l10n/bn_BD.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "সংরক্ষণ করা হচ্ছে..",
"Encryption" => "সংকেতায়ন"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index d9d3d7b4fa5..14d7992ad5d 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "La clau de recuperació s'ha activat",
"Could not enable recovery key. Please check your recovery key password!" => "No s'ha pogut activar la clau de recuperació. Comproveu contrasenya de la clau de recuperació!",
"Recovery key successfully disabled" => "La clau de recuperació s'ha descativat",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora del sistema ownCloud (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.",
"Missing requirements." => "Manca de requisits.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assegureu-vos que teniu instal·lada la versió de PHP 5.3.3 o posterior, i que teniu l'extensió OpenSSL PHP activada i configurada correctament. Per ara, l'aplicació de xifrat esta desactivada.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat.",
+"Following users are not set up for encryption:" => "Els usuaris següents no estan configurats per a l'encriptació:",
"Saving..." => "Desant...",
"Your private key is not valid! Maybe the your password was changed from outside." => "La vostra clau privada no és vàlida! Potser la vostra contrasenya ha canviat des de fora.",
"You can unlock your private key in your " => "Podeu desbloquejar la clau privada en el vostre",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "S'han actualitzat els arranjaments de recuperació de fitxers",
"Could not update file recovery" => "No s'ha pogut actualitzar la recuperació de fitxers"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index fcf0287f04f..89f63cc1cdd 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Záchranný klíč byl úspěšně povolen",
"Could not enable recovery key. Please check your recovery key password!" => "Nepodařilo se povolit záchranný klíč. Zkontrolujte prosím vaše heslo záchranného klíče!",
"Recovery key successfully disabled" => "Záchranný klíč byl úspěšně zakázán",
@@ -9,7 +10,7 @@
"Could not update the private key password. Maybe the old password was not correct." => "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš soukromý klíč není platný! Pravděpodobně bylo heslo změněno vně systému ownCloud (např. ve vašem firemním adresáři). Heslo vašeho soukromého klíče můžete změnit ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům.",
"Missing requirements." => "Nesplněné závislosti.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Ujistěte se prosím, že máte nainstalované PHP verze PHP 5.3.3 či novější s nainstalovaným a správně nastaveným rozšířením OpenSSL. Prozatím byla šifrovací aplikace zablokována.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Ujistěte se prosím, že máte nainstalované PHP 5.3.3 nebo novější a že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Prozatím byla aplikace pro šifrování vypnuta.",
"Following users are not set up for encryption:" => "Následující uživatelé nemají nastavené šifrování:",
"Saving..." => "Ukládám...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Váš soukromý klíč není platný! Pravděpodobně bylo vaše heslo změněno zvenčí.",
@@ -35,3 +36,4 @@
"File recovery settings updated" => "Možnosti záchrany souborů aktualizovány",
"Could not update file recovery" => "Nelze nastavit záchranu souborů"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_encryption/l10n/cy_GB.php b/apps/files_encryption/l10n/cy_GB.php
index 6e18a7913c8..ea8b19963b0 100644
--- a/apps/files_encryption/l10n/cy_GB.php
+++ b/apps/files_encryption/l10n/cy_GB.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Yn cadw...",
"Encryption" => "Amgryptiad"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index 609137cf193..1b7069b6784 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Gendannelsesnøgle aktiveret med succes",
"Could not enable recovery key. Please check your recovery key password!" => "Kunne ikke aktivere gendannelsesnøgle. Kontroller venligst dit gendannelsesnøgle kodeord!",
"Recovery key successfully disabled" => "Gendannelsesnøgle deaktiveret succesfuldt",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "Kunne ikke opdatere det private nøgle kodeord-. Måske var det gamle kodeord forkert.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din private nøgle er gyldig! Sandsynligvis blev dit kodeord ændre uden for ownCloud systemet (f.eks. dit firmas register). Du kan opdatere dit private nøgle kodeord under personlige indstillinger, for at generhverve adgang til dine krypterede filer.",
"Missing requirements." => "Manglende betingelser.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Sikker dig venligst at PHP 5.3.3 eller nyere er installeret og at OpenSSL PHP udvidelsen er aktiveret og konfigureret korrekt. Indtil videre er krypterings app'en deaktiveret. ",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.",
+"Following users are not set up for encryption:" => "Følgende brugere er ikke sat op til kryptering:",
"Saving..." => "Gemmer...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Din private nøgle er ikke gyldig. Måske blev dit kodeord ændre udefra.",
"You can unlock your private key in your " => "Du kan låse din private nøgle op i din ",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "Filgendannelsesindstillinger opdateret",
"Could not update file recovery" => "Kunne ikke opdatere filgendannelse"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index 69b15aa00a8..4c36d31ed6b 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!",
"Recovery key successfully disabled" => "Wiederherstellungsschlüssel deaktiviert.",
@@ -9,7 +10,7 @@
"Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Dein Passwort geändert (z.B. in deinem gemeinsamen Verzeichnis). Du kannst das Passwort deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an deine Dateien zu gelangen.",
"Missing requirements." => "Fehlende Vorraussetzungen",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert ist und die OpenSSL-PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung wurde vorerst deaktiviert.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
"Saving..." => "Speichern...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Ihr privater Schlüssel ist ungültig! Eventuell wurde Ihr Passwort von außerhalb geändert.",
@@ -35,3 +36,4 @@
"File recovery settings updated" => "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
"Could not update file recovery" => "Dateiwiederherstellung konnte nicht aktualisiert werden"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 5a20b2093cd..200001e6ebf 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
@@ -9,7 +10,7 @@
"Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
"Missing requirements." => "Fehlende Voraussetzungen",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und die PHP-Erweiterung OpenSSL aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
"Saving..." => "Speichern...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Ihr privater Schlüssel ist ungültig! Vielleicht wurde Ihr Passwort von außerhalb geändert.",
@@ -35,3 +36,4 @@
"File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
"Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 990f464bc1a..70f778f0a50 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password successfully changed." => "Ο κωδικός αλλάχτηκε επιτυχώς.",
"Could not change the password. Maybe the old password was not correct." => "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
"Saving..." => "Γίνεται αποθήκευση...",
@@ -9,3 +10,4 @@
"Change Password" => "Αλλαγή Κωδικού Πρόσβασης",
"File recovery settings updated" => "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index 997b60f8ac3..d6881253022 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password successfully changed." => "La pasvorto sukcese ŝanĝiĝis.",
"Could not change the password. Maybe the old password was not correct." => "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
"Private key password successfully updated." => "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.",
@@ -13,3 +14,4 @@
"Current log-in password" => "Nuna ensaluta pasvorto",
"Update Private Key Password" => "Ĝisdatigi la pasvorton de la malpublika klavo"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 0b49edbd2af..8341bafc9fd 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Se ha habilitado la recuperación de archivos",
"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña.",
"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
@@ -9,7 +10,6 @@
"Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros.",
"Missing requirements." => "Requisitos incompletos.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
"Saving..." => "Guardando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera.",
"You can unlock your private key in your " => "Puede desbloquear su clave privada en su",
@@ -34,3 +34,4 @@
"File recovery settings updated" => "Opciones de recuperación de archivos actualizada",
"Could not update file recovery" => "No se pudo actualizar la recuperación de archivos"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index f53bbd437c4..cac8c465362 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Se habilitó la recuperación de archivos",
"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor, comprobá tu contraseña.",
"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
@@ -9,7 +10,6 @@
"Could not update the private key password. Maybe the old password was not correct." => "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde fuera del sistema de ownCloud (por ej. desde tu cuenta de sistema). Podés actualizar tu clave privada en la sección de \"configuración personal\", para recuperar el acceso a tus archivos.",
"Missing requirements." => "Requisitos incompletos.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegurate que PHP 5.3.3 o posterior esté instalado y que la extensión OpenSSL de PHP esté habilitada y configurada correctamente. Por el momento, la aplicación de encriptación está deshabilitada.",
"Saving..." => "Guardando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde afuera.",
"You can unlock your private key in your " => "Podés desbloquear tu clave privada en tu",
@@ -34,3 +34,4 @@
"File recovery settings updated" => "Las opciones de recuperación de archivos fueron actualizadas",
"Could not update file recovery" => "No fue posible actualizar la recuperación de archivos"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index c1c8164b810..3edb7299c20 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Taastevõtme lubamine õnnestus",
"Could not enable recovery key. Please check your recovery key password!" => "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!",
"Recovery key successfully disabled" => "Taastevõtme keelamine õnnestus",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sinu privaatne võti pole toimiv! Tõenäoliselt on sinu parool muutunud väljaspool ownCloud süsteemi (näiteks ettevõtte keskhaldus). Sa saad uuendada oma privaatse võtme parooli seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
"Missing requirements." => "Nõutavad on puudu.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Veendu, et kasutusel oleks PHP 5.3.3 või uuem versioon ning kasutusel oleks OpenSSL PHP laiendus ja see on korrektselt seadistatud. Hetkel on krüpteerimise rakenduse kasutamine peatatud.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud.",
+"Following users are not set up for encryption:" => "Järgmised kasutajad pole seadistatud krüpteeringuks:",
"Saving..." => "Salvestamine...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Sinu privaatne võti ei ole õige. Võib-olla on parool vahetatud süsteemi väliselt.",
"You can unlock your private key in your " => "Saad avada oma privaatse võtme oma",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "Faili taaste seaded uuendatud",
"Could not update file recovery" => "Ei suuda uuendada taastefaili"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 307cd385e7e..e750c850688 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Berreskuratze gakoa behar bezala gaitua",
"Could not enable recovery key. Please check your recovery key password!" => "Ezin da berreskuratze gako gaitu. Egiaztatu berreskuratze gako pasahitza!",
"Recovery key successfully disabled" => "Berreskuratze gakoa behar bezala desgaitu da",
@@ -9,7 +10,6 @@
"Could not update the private key password. Maybe the old password was not correct." => "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza ownCloud sistematik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko.",
"Missing requirements." => "Eskakizun batzuk ez dira betetzen.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Ziurtatu PHP 5.3.3 edo berriagoa instalatuta dagoela eta PHPren OpenSSL gehigarria gaituta eta ongi konfiguratuta dagoela. Oraingoz enkriptazio programa ez dago gaituta.",
"Saving..." => "Gordetzen...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Zure gako pribatua ez da egokia! Agian zure pasahitza kanpotik aldatu da.",
"You can unlock your private key in your " => "Zure gako pribatua desblokeatu dezakezu zure",
@@ -34,3 +34,4 @@
"File recovery settings updated" => "Fitxategi berreskuratze ezarpenak eguneratuak",
"Could not update file recovery" => "Ezin da fitxategi berreskuratzea eguneratu"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index 8967ca1eed8..461ec2b92cb 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "کلید بازیابی با موفقیت فعال شده است.",
"Could not enable recovery key. Please check your recovery key password!" => "کلید بازیابی نمی تواند فعال شود. لطفا رمزعبور کلید بازیابی خود را بررسی نمایید!",
"Recovery key successfully disabled" => "کلید بازیابی با موفقیت غیر فعال شده است.",
@@ -9,7 +10,6 @@
"Could not update the private key password. Maybe the old password was not correct." => "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صحیح نمی باشد.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "کلید خصوصی شما معتبر نمی باشد! ظاهرا رمزعبور شما بیرون از سیستم ownCloud تغییر یافته است( به عنوان مثال پوشه سازمان شما ). شما میتوانید رمزعبور کلید خصوصی خود را در تنظیمات شخصیتان به روز کنید تا بتوانید به فایل های رمزگذاری شده خود را دسترسی داشته باشید.",
"Missing requirements." => "نیازمندی های گمشده",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "لطفا مطمئن شوید که PHP 5.3.3 یا جدیدتر نصب شده و پسوند OpenSSL PHP فعال است و به درستی پیکربندی شده است. در حال حاضر، برنامه رمزگذاری غیر فعال شده است.",
"Saving..." => "در حال ذخیره سازی...",
"Your private key is not valid! Maybe the your password was changed from outside." => "کلید خصوصی شما معتبر نیست! شاید رمزعبوراز بیرون تغییر یافته است.",
"You can unlock your private key in your " => "شما میتوانید کلید خصوصی خود را باز نمایید.",
@@ -34,3 +34,4 @@
"File recovery settings updated" => "تنظیمات بازیابی فایل به روز شده است.",
"Could not update file recovery" => "به روز رسانی بازیابی فایل را نمی تواند انجام دهد."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index a00cc8ab96e..53b0a6b25cd 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password successfully changed." => "Salasana vaihdettiin onnistuneesti.",
"Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
"Saving..." => "Tallennetaan...",
@@ -7,3 +8,4 @@
"Disabled" => "Ei käytössä",
"Change Password" => "Vaihda salasana"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 174932d6e8a..12af8101394 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Clé de récupération activée avec succès",
"Could not enable recovery key. Please check your recovery key password!" => "Impossible d'activer la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
"Recovery key successfully disabled" => "Clé de récupération désactivée avec succès",
@@ -9,7 +10,6 @@
"Could not update the private key password. Maybe the old password was not correct." => "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte.",
"Missing requirements." => "Système minimum requis non respecté.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Veuillez vous assurer qu'une version de PHP 5.3.3 ou plus récente est installée et que l'extension OpenSSL de PHP est activée et configurée correctement. En attendant, l'application de cryptage a été désactivée.",
"Saving..." => "Enregistrement...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur.",
"You can unlock your private key in your " => "Vous pouvez déverrouiller votre clé privée dans votre",
@@ -34,3 +34,4 @@
"File recovery settings updated" => "Paramètres de récupération de fichiers mis à jour",
"Could not update file recovery" => "Ne peut pas remettre à jour les fichiers de récupération"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 7b3ad526734..abf12d73d57 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Activada satisfactoriamente a chave de recuperación",
"Could not enable recovery key. Please check your recovery key password!" => "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
"Recovery key successfully disabled" => "Desactivada satisfactoriamente a chave de recuperación",
@@ -9,7 +10,7 @@
"Could not update the private key password. Maybe the old password was not correct." => "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
"Missing requirements." => "Non se cumpren os requisitos.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de que a extensión OpenSSL PHP estea activada e configurada correctamente. Polo de agora foi desactivado o aplicativo de cifrado.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado.",
"Following users are not set up for encryption:" => "Os seguintes usuarios non teñen configuración para o cifrado:",
"Saving..." => "Gardando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior. ",
@@ -35,3 +36,4 @@
"File recovery settings updated" => "Actualizouse o ficheiro de axustes de recuperación",
"Could not update file recovery" => "Non foi posíbel actualizar o ficheiro de recuperación"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/he.php b/apps/files_encryption/l10n/he.php
index 7a80cfa2f9f..cdf29c9b0ac 100644
--- a/apps/files_encryption/l10n/he.php
+++ b/apps/files_encryption/l10n/he.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "שמירה…",
"Encryption" => "הצפנה"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/hr.php b/apps/files_encryption/l10n/hr.php
index 9b9284ddc5e..60ee610bd3e 100644
--- a/apps/files_encryption/l10n/hr.php
+++ b/apps/files_encryption/l10n/hr.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Spremanje..."
);
+$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;";
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index bf95c31f2c5..49dcf817fb7 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Mentés...",
"Encryption" => "Titkosítás"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index ad827b53791..32c348bd8ba 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Menyimpan...",
"Encryption" => "Enkripsi"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/is.php b/apps/files_encryption/l10n/is.php
index 0f98c6bd3bf..27c0904a532 100644
--- a/apps/files_encryption/l10n/is.php
+++ b/apps/files_encryption/l10n/is.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Er að vista ...",
"Encryption" => "Dulkóðun"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index db1a1b1709a..f9534d7eca3 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Chiave di ripristino abilitata correttamente",
"Could not enable recovery key. Please check your recovery key password!" => "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
"Recovery key successfully disabled" => "Chiave di ripristinata disabilitata correttamente",
@@ -9,7 +10,7 @@
"Could not update the private key password. Maybe the old password was not correct." => "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La chiave privata non è valida! Forse la password è stata cambiata esternamente al sistema di ownCloud (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file.",
"Missing requirements." => "Requisiti mancanti.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
"Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:",
"Saving..." => "Salvataggio in corso...",
"Your private key is not valid! Maybe the your password was changed from outside." => "La tua chiave privata non è valida! Forse è stata modifica dall'esterno.",
@@ -35,3 +36,4 @@
"File recovery settings updated" => "Impostazioni di ripristino dei file aggiornate",
"Could not update file recovery" => "Impossibile aggiornare il ripristino dei file"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index a1fcbd5c544..d1f8303bda7 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "リカバリ用のキーは正常に有効化されました",
"Could not enable recovery key. Please check your recovery key password!" => "リカバリ用のキーを有効にできませんでした。リカバリ用のキーのパスワードを確認して下さい!",
"Recovery key successfully disabled" => "リカバリ用のキーを正常に無効化しました",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "秘密鍵が有効ではありません。パスワードがownCloudシステムの外部(例えば、企業ディレクトリ)から変更された恐れがあります。個人設定で秘密鍵のパスワードを更新して、暗号化されたファイルを回復出来ます。",
"Missing requirements." => "必要要件が満たされていません。",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "必ず、PHP 5.3.3以上をインストールし、OpenSSLのPHP拡張を有効にして適切に設定してください。現時点では暗号化アプリは無効になっています。",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。",
+"Following users are not set up for encryption:" => "以下のユーザーは、暗号化設定がされていません:",
"Saving..." => "保存中...",
"Your private key is not valid! Maybe the your password was changed from outside." => "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。",
"You can unlock your private key in your " => "個人設定で",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "ファイル復旧設定が更新されました",
"Could not update file recovery" => "ファイル復旧を更新できませんでした"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ka_GE.php b/apps/files_encryption/l10n/ka_GE.php
index 55a59f44341..bbabd449648 100644
--- a/apps/files_encryption/l10n/ka_GE.php
+++ b/apps/files_encryption/l10n/ka_GE.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "შენახვა...",
"Encryption" => "ენკრიპცია"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index 52e0997ef7b..cfe9f99fa19 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password successfully changed." => "암호가 성공적으로 변경되었습니다",
"Could not change the password. Maybe the old password was not correct." => "암호를 변경할수 없습니다. 아마도 예전 암호가 정확하지 않은것 같습니다.",
"Private key password successfully updated." => "개인키 암호가 성공적으로 업데이트 됨.",
@@ -16,3 +17,4 @@
"File recovery settings updated" => "파일 복구 설정 업데이트됨",
"Could not update file recovery" => "파일 복구를 업데이트 할수 없습니다"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ku_IQ.php b/apps/files_encryption/l10n/ku_IQ.php
index 61b720372ec..d971350b4c7 100644
--- a/apps/files_encryption/l10n/ku_IQ.php
+++ b/apps/files_encryption/l10n/ku_IQ.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "پاشکه‌وتده‌کات...",
"Encryption" => "نهێنیکردن"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/lb.php b/apps/files_encryption/l10n/lb.php
index 77bad681732..a33f4969b09 100644
--- a/apps/files_encryption/l10n/lb.php
+++ b/apps/files_encryption/l10n/lb.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Speicheren..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 84fa902dc65..9fbf7b29604 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Atkūrimo raktas sėkmingai įjungtas",
"Could not enable recovery key. Please check your recovery key password!" => "Neišėjo įjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
"Recovery key successfully disabled" => "Atkūrimo raktas sėkmingai išjungtas",
@@ -13,3 +14,4 @@
"File recovery settings updated" => "Failų atstatymo nustatymai pakeisti",
"Could not update file recovery" => "Neišėjo atnaujinti failų atkūrimo"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/lv.php b/apps/files_encryption/l10n/lv.php
index 04922854ceb..b8414174a74 100644
--- a/apps/files_encryption/l10n/lv.php
+++ b/apps/files_encryption/l10n/lv.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Saglabā...",
"Encryption" => "Šifrēšana"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php
index a7216f205ad..fd8dd4e51c1 100644
--- a/apps/files_encryption/l10n/mk.php
+++ b/apps/files_encryption/l10n/mk.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Снимам...",
"Encryption" => "Енкрипција"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_encryption/l10n/ms_MY.php b/apps/files_encryption/l10n/ms_MY.php
index bb963cb72d2..f73e61c1674 100644
--- a/apps/files_encryption/l10n/ms_MY.php
+++ b/apps/files_encryption/l10n/ms_MY.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Simpan..."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index d4e2b1ffb50..26956c410a3 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Lagrer...",
"Encryption" => "Kryptering"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 9cf7bcd1721..e37ccf54d6d 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Herstelsleutel succesvol geactiveerd",
"Could not enable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet activeren. Controleer het wachtwoord van uw herstelsleutel!",
"Recovery key successfully disabled" => "Herstelsleutel succesvol gedeactiveerd",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Uw privésleutel is niet geldig! Misschien was uw wachtwoord van buitenaf gewijzigd. U kunt het wachtwoord van uw privésleutel aanpassen in uw persoonlijke instellingen om toegang tot uw versleutelde bestanden te vergaren.",
"Missing requirements." => "Missende benodigdheden.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
+"Following users are not set up for encryption:" => "De volgende gebruikers hebben geen configuratie voor encryptie:",
"Saving..." => "Opslaan",
"Your private key is not valid! Maybe the your password was changed from outside." => "Uw privésleutel is niet geldig. Misschien was uw wachtwoord van buitenaf gewijzigd.",
"You can unlock your private key in your " => "U kunt uw privésleutel deblokkeren in uw",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "Bestandsherstel instellingen bijgewerkt",
"Could not update file recovery" => "Kon bestandsherstel niet bijwerken"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/nn_NO.php b/apps/files_encryption/l10n/nn_NO.php
index 97b3a27a9d0..b99d0751540 100644
--- a/apps/files_encryption/l10n/nn_NO.php
+++ b/apps/files_encryption/l10n/nn_NO.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Lagrar …"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/oc.php b/apps/files_encryption/l10n/oc.php
index 0a34c4cda12..87d1e6ceffb 100644
--- a/apps/files_encryption/l10n/oc.php
+++ b/apps/files_encryption/l10n/oc.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Enregistra..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 3928afb1d5c..ca4502ff6aa 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Klucz odzyskiwania włączony",
"Could not enable recovery key. Please check your recovery key password!" => "Nie można włączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
"Recovery key successfully disabled" => "Klucz odzyskiwania wyłączony",
@@ -7,6 +8,10 @@
"Could not change the password. Maybe the old password was not correct." => "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
"Private key password successfully updated." => "Pomyślnie zaktualizowano hasło klucza prywatnego.",
"Could not update the private key password. Maybe the old password was not correct." => "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Klucz prywatny nie jest ważny! Prawdopodobnie Twoje hasło zostało zmienione poza systemem ownCloud (np. w katalogu firmy). Aby odzyskać dostęp do zaszyfrowanych plików można zaktualizować hasło klucza prywatnego w ustawieniach osobistych.",
+"Missing requirements." => "Brak wymagań.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone.",
+"Following users are not set up for encryption:" => "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:",
"Saving..." => "Zapisywanie...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz.",
"You can unlock your private key in your " => "Możesz odblokować swój klucz prywatny w swojej",
@@ -31,3 +36,4 @@
"File recovery settings updated" => "Ustawienia odzyskiwania plików zmienione",
"Could not update file recovery" => "Nie można zmienić pliku odzyskiwania"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 073201d06b1..5b8a68657b7 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Recuperação de chave habilitada com sucesso",
"Could not enable recovery key. Please check your recovery key password!" => "Impossível habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
"Recovery key successfully disabled" => "Recuperação de chave desabilitada com sucesso",
@@ -9,7 +10,7 @@
"Could not update the private key password. Maybe the old password was not correct." => "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora do sistema ownCloud (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
"Missing requirements." => "Requisitos não encontrados.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitada e configurada corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
"Following users are not set up for encryption:" => "Seguintes usuários não estão configurados para criptografia:",
"Saving..." => "Salvando...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Sua chave privada não é válida! Talvez sua senha tenha sido mudada.",
@@ -35,3 +36,4 @@
"File recovery settings updated" => "Configurações de recuperação de arquivo atualizado",
"Could not update file recovery" => "Não foi possível atualizar a recuperação de arquivos"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 15a9ee6de63..53335ab7297 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Chave de recuperação activada com sucesso",
"Could not enable recovery key. Please check your recovery key password!" => "Não foi possível activar a chave de recuperação. Por favor verifique a password da chave de recuperação!",
"Recovery key successfully disabled" => "Chave de recuperação descativada com sucesso",
@@ -8,7 +9,6 @@
"Could not update the private key password. Maybe the old password was not correct." => "Não foi possível alterar a chave. Possivelmente a password antiga não está correcta.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Chave privada não é válida! Provavelmente senha foi alterada fora do sistema ownCloud (exemplo, o diretório corporativo). Pode atualizar password da chave privada em configurações personalizadas para recuperar o acesso aos seus arquivos encriptados.",
"Missing requirements." => "Faltam alguns requisitos.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está ativada e corretamente configurada. Por agora, a encripitação está desativado.",
"Saving..." => "A guardar...",
"personal settings" => "configurações personalizadas ",
"Encryption" => "Encriptação",
@@ -27,3 +27,4 @@
"File recovery settings updated" => "Actualizadas as definições de recuperação de ficheiros",
"Could not update file recovery" => "Não foi possível actualizar a recuperação de ficheiros"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php
index 9e04b627c42..3dcdce32418 100644
--- a/apps/files_encryption/l10n/ro.php
+++ b/apps/files_encryption/l10n/ro.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Se salvează...",
"Encryption" => "Încriptare"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 5bb803de2d0..e0d52399c73 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Ключ восстановления успешно установлен",
"Could not enable recovery key. Please check your recovery key password!" => "Невозможно включить ключ восстановления. Проверьте правильность пароля от ключа!",
"Recovery key successfully disabled" => "Ключ восстановления успешно отключен",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне системы OwnCloud (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
"Missing requirements." => "Требования отсутствуют.",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Пожалуйста, убедитесь, что PHP 5.3.3 или новее установлен и что расширение OpenSSL PHP включен и настроен. В настоящее время, шифрование для приложения было отключено.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Пожалуйста, убедитесь, что версия PHP 5.3.3 или новее, а также, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования отключено.",
+"Following users are not set up for encryption:" => "Для следующих пользователей шифрование не настроено:",
"Saving..." => "Сохранение...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Секретный ключ недействителен! Возможно, Ваш пароль был изменён в другой программе.",
"You can unlock your private key in your " => "Вы можете разблокировать закрытый ключ в своём ",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "Настройки файла восстановления обновлены",
"Could not update file recovery" => "Невозможно обновить файл восстановления"
);
+$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);";
diff --git a/apps/files_encryption/l10n/ru_RU.php b/apps/files_encryption/l10n/ru_RU.php
deleted file mode 100644
index 1351f63f89b..00000000000
--- a/apps/files_encryption/l10n/ru_RU.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Saving..." => "Сохранение"
-);
diff --git a/apps/files_encryption/l10n/si_LK.php b/apps/files_encryption/l10n/si_LK.php
index 6c678bb3a4f..5f5330df547 100644
--- a/apps/files_encryption/l10n/si_LK.php
+++ b/apps/files_encryption/l10n/si_LK.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "සුරැකෙමින් පවතී...",
"Encryption" => "ගුප්ත කේතනය"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index d8894e53706..a723d80773b 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Záchranný kľúč bol úspešne povolený",
"Could not enable recovery key. Please check your recovery key password!" => "Nepodarilo sa povoliť záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
"Recovery key successfully disabled" => "Záchranný kľúč bol úspešne zakázaný",
@@ -25,3 +26,4 @@
"File recovery settings updated" => "Nastavenie obnovy súborov aktualizované",
"Could not update file recovery" => "Nemožno aktualizovať obnovenie súborov"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index 016937c1415..8b2f264c62e 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Ključ za obnovitev gesla je bil uspešno nastavljen",
"Could not enable recovery key. Please check your recovery key password!" => "Ključa za obnovitev gesla ni bilo mogoče nastaviti. Preverite ključ!",
"Recovery key successfully disabled" => "Ključ za obnovitev gesla je bil uspešno onemogočen",
@@ -9,7 +10,8 @@
"Could not update the private key password. Maybe the old password was not correct." => "Zasebnega ključa za geslo ni bilo mogoče posodobiti. Morda vnos starega gesla ni bil pravilen.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno zunaj sistema ownCloud (npr. v skupnem imeniku). Svoj zasebni ključ, ki vam bo omogočil dostop do šifriranih dokumentov, lahko posodobite v osebnih nastavitvah.",
"Missing requirements." => "Manjkajoče zahteve",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Preverite, da imate na strežniku nameščen PHP 5.3.3 ali novejši in da je omogočen in pravilno nastavljen PHP OpenSSL . Zaenkrat je šifriranje onemogočeno.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Preverite, da imate na strežniku nameščen paket PHP 5.3.3 ali novejši in da je omogočen in pravilno nastavljen PHP OpenSSL . Zaenkrat je šifriranje onemogočeno.",
+"Following users are not set up for encryption:" => "Naslednji uporabniki še nimajo nastavljenega šifriranja:",
"Saving..." => "Poteka shranjevanje ...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno.",
"You can unlock your private key in your " => "Svoj zasebni ključ lahko odklenite v",
@@ -34,3 +36,4 @@
"File recovery settings updated" => "Nastavitve obnavljanja dokumentov so bile posodobljene",
"Could not update file recovery" => "Nastavitev za obnavljanje dokumentov ni bilo mogoče posodobiti"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_encryption/l10n/sr.php b/apps/files_encryption/l10n/sr.php
index a36e37c1790..cbf87dcf4d2 100644
--- a/apps/files_encryption/l10n/sr.php
+++ b/apps/files_encryption/l10n/sr.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Чување у току...",
"Encryption" => "Шифровање"
);
+$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);";
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 785d46cdc76..88ba6b47159 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Återställningsnyckeln har framgångsrikt aktiverats",
"Could not enable recovery key. Please check your recovery key password!" => "Kunde inte aktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
"Recovery key successfully disabled" => "Återställningsnyckeln har framgångsrikt inaktiverats",
@@ -9,7 +10,7 @@
"Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera den privata lösenordsnyckeln. Kanske var det gamla lösenordet fel.",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför ownCloud (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
"Missing requirements." => "Krav som saknas",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och rätt inställd. Kryperingsappen är därför tillsvidare inaktiverad.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad.",
"Following users are not set up for encryption:" => "Följande användare har inte aktiverat kryptering:",
"Saving..." => "Sparar...",
"Your private key is not valid! Maybe the your password was changed from outside." => "Din privata lösenordsnyckel är inte giltig! Kanske byttes ditt lösenord från utsidan.",
@@ -35,3 +36,4 @@
"File recovery settings updated" => "Inställningarna för filåterställning har uppdaterats",
"Could not update file recovery" => "Kunde inte uppdatera filåterställning"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ta_LK.php b/apps/files_encryption/l10n/ta_LK.php
index 63fe9ecde86..9dec6de3acb 100644
--- a/apps/files_encryption/l10n/ta_LK.php
+++ b/apps/files_encryption/l10n/ta_LK.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "சேமிக்கப்படுகிறது...",
"Encryption" => "மறைக்குறியீடு"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
index 6cab4370ccf..7bf3e2765aa 100644
--- a/apps/files_encryption/l10n/th_TH.php
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "กำลังบันทึกข้อมูล...",
"Encryption" => "การเข้ารหัส"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 24c6fa47278..7fdda1a5bf6 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "Kurtarma anahtarı başarıyla etkinleştirildi",
"Could not enable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı etkinleştirilemedi. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
"Recovery key successfully disabled" => "Kurtarma anahtarı başarıyla devre dışı bırakıldı",
@@ -13,3 +14,4 @@
"File recovery settings updated" => "Dosya kurtarma ayarları güncellendi",
"Could not update file recovery" => "Dosya kurtarma güncellenemedi"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/ug.php b/apps/files_encryption/l10n/ug.php
index 954d95b4132..25b3f68634b 100644
--- a/apps/files_encryption/l10n/ug.php
+++ b/apps/files_encryption/l10n/ug.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "ساقلاۋاتىدۇ…",
"Encryption" => "شىفىرلاش"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index 1c176a39142..680beddfe68 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Зберігаю...",
"Encryption" => "Шифрування"
);
+$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);";
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index d11569bb94c..18882be63a1 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password successfully changed." => "Đã đổi mật khẩu.",
"Could not change the password. Maybe the old password was not correct." => "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
"Saving..." => "Đang lưu...",
@@ -7,3 +8,4 @@
"Disabled" => "Tắt",
"Change Password" => "Đổi Mật khẩu"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_CN.GB2312.php b/apps/files_encryption/l10n/zh_CN.GB2312.php
index 3c405a81ace..0f9f459c771 100644
--- a/apps/files_encryption/l10n/zh_CN.GB2312.php
+++ b/apps/files_encryption/l10n/zh_CN.GB2312.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "保存中...",
"Encryption" => "加密"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index a3939165c7a..c4c52f4ac2e 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Recovery key successfully enabled" => "恢复密钥成功启用",
"Could not enable recovery key. Please check your recovery key password!" => "不能启用恢复密钥。请检查恢复密钥密码!",
"Recovery key successfully disabled" => "恢复密钥成功禁用",
@@ -32,3 +33,4 @@
"File recovery settings updated" => "文件恢复设置已更新",
"Could not update file recovery" => "不能更新文件恢复"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_HK.php b/apps/files_encryption/l10n/zh_HK.php
index 0a38a2ddf85..edbeb0f1c66 100644
--- a/apps/files_encryption/l10n/zh_HK.php
+++ b/apps/files_encryption/l10n/zh_HK.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Encryption" => "加密"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index cc43ec37a43..02dc49cc3d9 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -1,8 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password successfully changed." => "成功變更密碼。",
"Could not change the password. Maybe the old password was not correct." => "無法變更密碼,或許是輸入的舊密碼不正確。",
"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "您的私鑰不正確! 感覺像是密碼在 ownCloud 系統之外被改變(例:您的目錄)。 您可以在個人設定中更新私鑰密碼取回已加密的檔案。",
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "請確認已安裝 PHP 5.3.3 或更新的版本並啟用 OpenSSL PHP 且正確設定。目前 encryption app 不可使用。",
"Saving..." => "儲存中...",
"Encryption" => "加密",
"Enabled" => "已啓用",
@@ -14,3 +14,4 @@
"File recovery settings updated" => "檔案還原設定已更新",
"Could not update file recovery" => "無法更新檔案還原設定"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/lib/capabilities.php b/apps/files_encryption/lib/capabilities.php
index 72baddcd049..ef94c9e086d 100644
--- a/apps/files_encryption/lib/capabilities.php
+++ b/apps/files_encryption/lib/capabilities.php
@@ -20,4 +20,4 @@ class Capabilities {
));
}
-} \ No newline at end of file
+}
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 6543a0de5f3..e129bc9313e 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -25,8 +25,7 @@
namespace OCA\Encryption;
-//require_once '../3rdparty/Crypt_Blowfish/Blowfish.php';
-require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
+require_once __DIR__ . '/../3rdparty/Crypt_Blowfish/Blowfish.php';
/**
* Class for common cryptography functionality
@@ -57,7 +56,9 @@ class Crypt {
if ($res === false) {
\OCP\Util::writeLog('Encryption library', 'couldn\'t generate users key-pair for ' . \OCP\User::getUser(), \OCP\Util::ERROR);
- \OCP\Util::writeLog('Encryption library', openssl_error_string(), \OCP\Util::ERROR);
+ while ($msg = openssl_error_string()) {
+ \OCP\Util::writeLog('Encryption library', 'openssl_pkey_new() fails: ' . $msg, \OCP\Util::ERROR);
+ }
} elseif (openssl_pkey_export($res, $privateKey)) {
// Get public key
$keyDetails = openssl_pkey_get_details($res);
@@ -84,7 +85,7 @@ class Crypt {
* blocks with encryption alone, hence padding is added to achieve the
* required length.
*/
- public static function addPadding($data) {
+ private static function addPadding($data) {
$padded = $data . 'xx';
@@ -97,7 +98,7 @@ class Crypt {
* @param string $padded padded data to remove padding from
* @return string unpadded data on success, false on error
*/
- public static function removePadding($padded) {
+ private static function removePadding($padded) {
if (substr($padded, -2) === 'xx') {
@@ -205,7 +206,7 @@ class Crypt {
* @param string $passphrase
* @return string encrypted file content
*/
- public static function encrypt($plainContent, $iv, $passphrase = '') {
+ private static function encrypt($plainContent, $iv, $passphrase = '') {
if ($encryptedContent = openssl_encrypt($plainContent, 'AES-128-CFB', $passphrase, false, $iv)) {
return $encryptedContent;
@@ -226,7 +227,7 @@ class Crypt {
* @throws \Exception
* @return string decrypted file content
*/
- public static function decrypt($encryptedContent, $iv, $passphrase) {
+ private static function decrypt($encryptedContent, $iv, $passphrase) {
if ($plainContent = openssl_decrypt($encryptedContent, 'AES-128-CFB', $passphrase, false, $iv)) {
@@ -246,7 +247,7 @@ class Crypt {
* @param string $iv IV to be concatenated
* @returns string concatenated content
*/
- public static function concatIv($content, $iv) {
+ private static function concatIv($content, $iv) {
$combined = $content . '00iv00' . $iv;
@@ -259,7 +260,7 @@ class Crypt {
* @param string $catFile concatenated data to be split
* @returns array keys: encrypted, iv
*/
- public static function splitIv($catFile) {
+ private static function splitIv($catFile) {
// Fetch encryption metadata from end of file
$meta = substr($catFile, -22);
@@ -376,34 +377,6 @@ class Crypt {
}
-
- /**
- * @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
@@ -487,42 +460,10 @@ class Crypt {
}
/**
- * @brief Asymetrically encrypt a string using a public key
- * @param $plainContent
- * @param $publicKey
- * @return string 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
- * @param $encryptedContent
- * @param $privatekey
- * @return string decrypted file
- */
- public static function keyDecrypt($encryptedContent, $privatekey) {
-
- $result = @openssl_private_decrypt($encryptedContent, $plainContent, $privatekey);
-
- if ($result) {
- return $plainContent;
- }
-
- return $result;
-
- }
-
- /**
* @brief Generates a pseudo random initialisation vector
* @return String $iv generated IV
*/
- public static function generateIv() {
+ private static function generateIv() {
if ($random = openssl_random_pseudo_bytes(12, $strong)) {
@@ -548,7 +489,7 @@ class Crypt {
}
/**
- * @brief Generate a pseudo random 1024kb ASCII key
+ * @brief Generate a pseudo random 1024kb ASCII key, used as file key
* @returns $key Generated key
*/
public static function generateKey() {
@@ -574,13 +515,13 @@ class Crypt {
}
/**
- * @brief Get the blowfish encryption handeler for a key
+ * @brief Get the blowfish encryption handler for a key
* @param $key string (optional)
* @return \Crypt_Blowfish blowfish object
*
- * if the key is left out, the default handeler will be used
+ * if the key is left out, the default handler will be used
*/
- public static function getBlowfish($key = '') {
+ private static function getBlowfish($key = '') {
if ($key) {
@@ -595,38 +536,6 @@ class Crypt {
}
/**
- * @param $passphrase
- * @return mixed
- */
- 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 string $content the cleartext message you want to encrypt
- * @param string $passphrase
- * @returns string 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 string $content the cleartext message you want to decrypt
* @param string $passphrase
@@ -663,4 +572,4 @@ class Crypt {
}
}
-} \ No newline at end of file
+}
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 6eee8fed6a6..0209a5d18b7 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -199,6 +199,12 @@ class Helper {
public static function stripUserFilesPath($path) {
$trimmed = ltrim($path, '/');
$split = explode('/', $trimmed);
+
+ // it is not a file relative to data/user/files
+ if (count($split) < 3 || $split[1] !== 'files') {
+ return false;
+ }
+
$sliced = array_slice($split, 2);
$relPath = implode('/', $sliced);
@@ -206,6 +212,27 @@ class Helper {
}
/**
+ * @brief get path to the correspondig file in data/user/files
+ * @param string $path path to a version or a file in the trash
+ * @return string path to correspondig file relative to data/user/files
+ */
+ public static function getPathToRealFile($path) {
+ $trimmed = ltrim($path, '/');
+ $split = explode('/', $trimmed);
+
+ if (count($split) < 3 || $split[1] !== "files_versions") {
+ return false;
+ }
+
+ $sliced = array_slice($split, 2);
+ $realPath = implode('/', $sliced);
+ //remove the last .v
+ $realPath = substr($realPath, 0, strrpos($realPath, '.v'));
+
+ return $realPath;
+ }
+
+ /**
* @brief redirect to a error page
*/
public static function redirectToErrorPage() {
@@ -232,6 +259,21 @@ class Helper {
return (bool) $result;
}
+
+ /**
+ * check some common errors if the server isn't configured properly for encryption
+ * @return bool true if configuration seems to be OK
+ */
+ public static function checkConfiguration() {
+ if(openssl_pkey_new(array('private_key_bits' => 4096))) {
+ return true;
+ } else {
+ while ($msg = openssl_error_string()) {
+ \OCP\Util::writeLog('Encryption library', 'openssl_pkey_new() fails: ' . $msg, \OCP\Util::ERROR);
+ }
+ return false;
+ }
+ }
/**
* @brief glob uses different pattern than regular expressions, escape glob pattern only
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index b2fd650f18d..5386de486e1 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -593,4 +593,4 @@ class Keymanager {
return $targetPath;
}
-} \ No newline at end of file
+}
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 735eba911a9..eb7ba60cb9d 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -116,7 +116,7 @@ class Proxy extends \OC_FileProxy {
return true;
}
- $handle = fopen('crypt://' . $relativePath . '.etmp', 'w');
+ $handle = fopen('crypt://' . $path . '.etmp', 'w');
if (is_resource($handle)) {
// write data to stream
@@ -154,9 +154,6 @@ class Proxy extends \OC_FileProxy {
$plainData = null;
$view = new \OC_FilesystemView('/');
- // get relative path
- $relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
-
// init session
$session = new \OCA\Encryption\Session($view);
@@ -166,7 +163,7 @@ class Proxy extends \OC_FileProxy {
&& Crypt::isCatfileContent($data)
) {
- $handle = fopen('crypt://' . $relativePath, 'r');
+ $handle = fopen('crypt://' . $path, 'r');
if (is_resource($handle)) {
while (($plainDataChunk = fgets($handle, 8192)) !== false) {
@@ -296,14 +293,14 @@ class Proxy extends \OC_FileProxy {
// Open the file using the crypto stream wrapper
// protocol and let it do the decryption work instead
- $result = fopen('crypt://' . $relativePath, $meta['mode']);
+ $result = fopen('crypt://' . $path, $meta['mode']);
} elseif (
self::shouldEncrypt($path)
and $meta ['mode'] !== 'r'
and $meta['mode'] !== 'rb'
) {
- $result = fopen('crypt://' . $relativePath, $meta['mode']);
+ $result = fopen('crypt://' . $path, $meta['mode']);
}
// Re-enable the proxy
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 3c1eb2c5f5e..335ea3733eb 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -62,6 +62,7 @@ class Stream {
private $unencryptedSize;
private $publicKey;
private $encKeyfile;
+ private $newFile; // helper var, we only need to write the keyfile for new files
/**
* @var \OC\Files\View
*/
@@ -73,13 +74,16 @@ class Stream {
private $privateKey;
/**
- * @param $path
+ * @param $path raw path relative to data/
* @param $mode
* @param $options
* @param $opened_path
* @return bool
*/
public function stream_open($path, $mode, $options, &$opened_path) {
+
+ // assume that the file already exist before we decide it finally in getKey()
+ $this->newFile = false;
if (!isset($this->rootView)) {
$this->rootView = new \OC_FilesystemView('/');
@@ -93,12 +97,21 @@ class Stream {
$this->userId = $util->getUserId();
- // Strip identifier text from path, this gives us the path relative to data/<user>/files
- $this->relPath = \OC\Files\Filesystem::normalizePath(str_replace('crypt://', '', $path));
-
// rawPath is relative to the data directory
- $this->rawPath = $util->getUserFilesDir() . $this->relPath;
+ $this->rawPath = \OC\Files\Filesystem::normalizePath(str_replace('crypt://', '', $path));
+ // Strip identifier text from path, this gives us the path relative to data/<user>/files
+ $this->relPath = Helper::stripUserFilesPath($this->rawPath);
+ // if raw path doesn't point to a real file, check if it is a version or a file in the trash bin
+ if ($this->relPath === false) {
+ $this->relPath = Helper::getPathToRealFile($this->rawPath);
+ }
+
+ if($this->relPath === false) {
+ \OCP\Util::writeLog('Encryption library', 'failed to open file "' . $this->rawPath . '" expecting a path to user/files or to user/files_versions', \OCP\Util::ERROR);
+ return false;
+ }
+
// Disable fileproxies so we can get the file size and open the source file without recursive encryption
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
@@ -258,6 +271,8 @@ class Stream {
} else {
+ $this->newFile = true;
+
return false;
}
@@ -436,9 +451,7 @@ class Stream {
fwrite($this->handle, $encrypted);
$this->writeCache = '';
-
}
-
}
/**
@@ -451,56 +464,63 @@ class Stream {
// if there is no valid private key return false
if ($this->privateKey === false) {
- // cleanup
- if ($this->meta['mode'] !== 'r' && $this->meta['mode'] !== 'rb') {
+ // cleanup
+ if ($this->meta['mode'] !== 'r' && $this->meta['mode'] !== 'rb') {
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- if ($this->rootView->file_exists($this->rawPath) && $this->size === 0) {
- $this->rootView->unlink($this->rawPath);
- }
-
- // Re-enable proxy - our work is done
- \OC_FileProxy::$enabled = $proxyStatus;
+ if ($this->rootView->file_exists($this->rawPath) && $this->size === 0) {
+ $this->rootView->unlink($this->rawPath);
}
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
+
// if private key is not valid redirect user to a error page
\OCA\Encryption\Helper::redirectToErrorPage();
}
if (
- $this->meta['mode'] !== 'r'
- and $this->meta['mode'] !== 'rb'
- and $this->size > 0
+ $this->meta['mode'] !== 'r' &&
+ $this->meta['mode'] !== 'rb' &&
+ $this->size > 0
) {
- // Disable encryption proxy to prevent recursive calls
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = false;
+ // only write keyfiles if it was a new file
+ if ($this->newFile === true) {
+
+ // Disable encryption proxy to prevent recursive calls
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
- // Fetch user's public key
- $this->publicKey = Keymanager::getPublicKey($this->rootView, $this->userId);
+ // Fetch user's public key
+ $this->publicKey = Keymanager::getPublicKey($this->rootView, $this->userId);
- // Check if OC sharing api is enabled
- $sharingEnabled = \OCP\Share::isEnabled();
+ // Check if OC sharing api is enabled
+ $sharingEnabled = \OCP\Share::isEnabled();
- $util = new Util($this->rootView, $this->userId);
+ $util = new Util($this->rootView, $this->userId);
- // Get all users sharing the file includes current user
- $uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $this->relPath, $this->userId);
+ // Get all users sharing the file includes current user
+ $uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $this->relPath, $this->userId);
- // Fetch public keys for all sharing users
- $publicKeys = Keymanager::getPublicKeys($this->rootView, $uniqueUserIds);
+ // Fetch public keys for all sharing users
+ $publicKeys = Keymanager::getPublicKeys($this->rootView, $uniqueUserIds);
- // Encrypt enc key for all sharing users
- $this->encKeyfiles = Crypt::multiKeyEncrypt($this->plainKey, $publicKeys);
+ // Encrypt enc key for all sharing users
+ $this->encKeyfiles = Crypt::multiKeyEncrypt($this->plainKey, $publicKeys);
- // Save the new encrypted file key
- Keymanager::setFileKey($this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data']);
+ // Save the new encrypted file key
+ Keymanager::setFileKey($this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data']);
- // Save the sharekeys
- Keymanager::setShareKeys($this->rootView, $this->relPath, $this->encKeyfiles['keys']);
+ // Save the sharekeys
+ Keymanager::setShareKeys($this->rootView, $this->relPath, $this->encKeyfiles['keys']);
+
+ // Re-enable proxy - our work is done
+ \OC_FileProxy::$enabled = $proxyStatus;
+ }
// get file info
$fileInfo = $this->rootView->getFileInfo($this->rawPath);
@@ -508,9 +528,6 @@ class Stream {
$fileInfo = array();
}
- // Re-enable proxy - our work is done
- \OC_FileProxy::$enabled = $proxyStatus;
-
// set encryption data
$fileInfo['encrypted'] = true;
$fileInfo['size'] = $this->size;
@@ -521,7 +538,6 @@ class Stream {
}
return fclose($this->handle);
-
}
}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 50e823585d7..b8d68623493 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -21,30 +21,6 @@
*
*/
-# Bugs
-# ----
-# Sharing a file to a user without encryption set up will not provide them with access but won't notify the sharer
-# Sharing all files to admin for recovery purposes still in progress
-# Possibly public links are broken (not tested since last merge of master)
-
-
-# Missing features
-# ----------------
-# Make sure user knows if large files weren't encrypted
-
-
-# Test
-# ----
-# Test that writing files works when recovery is enabled, and sharing API is disabled
-# Test trashbin support
-
-
-// Old 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"
-
namespace OCA\Encryption;
/**
@@ -57,45 +33,6 @@ namespace OCA\Encryption;
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
-
-
- // 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: implement flag system to allow user to specify encryption by folder, subfolder, etc.
-
-
- // Integration testing:
-
- //// TODO: test new encryption with versioning
- //// DONE: test new encryption with sharing
- //// TODO: test new encryption with proxies
-
const MIGRATION_COMPLETED = 1; // migration to new encryption completed
const MIGRATION_IN_PROGRESS = -1; // migration is running
const MIGRATION_OPEN = 0; // user still needs to be migrated
@@ -403,7 +340,7 @@ class Util {
$filePath = $directory . '/' . $this->view->getRelativePath('/' . $file);
$relPath = \OCA\Encryption\Helper::stripUserFilesPath($filePath);
- // If the path is a directory, search
+ // If the path is a directory, search
// its contents
if ($this->view->is_dir($filePath)) {
@@ -419,8 +356,8 @@ class Util {
$isEncryptedPath = $this->isEncryptedPath($filePath);
// If the file is encrypted
- // NOTE: If the userId is
- // empty or not set, file will
+ // NOTE: If the userId is
+ // empty or not set, file will
// detected as plain
// NOTE: This is inefficient;
// scanning every file like this
@@ -565,9 +502,6 @@ class Util {
// split the path parts
$pathParts = explode('/', $path);
- // get relative path
- $relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
-
if (isset($pathParts[2]) && $pathParts[2] === 'files' && $this->view->file_exists($path)
&& $this->isEncryptedPath($path)
) {
@@ -580,7 +514,7 @@ class Util {
$lastChunkNr = floor($size / 8192);
// open stream
- $stream = fopen('crypt://' . $relativePath, "r");
+ $stream = fopen('crypt://' . $path, "r");
if (is_resource($stream)) {
// calculate last chunk position
@@ -663,6 +597,205 @@ class Util {
}
/**
+ * @brief encrypt versions from given file
+ * @param array $filelist list of encrypted files, relative to data/user/files
+ * @return boolean
+ */
+ private function encryptVersions($filelist) {
+
+ $successful = true;
+
+ if (\OCP\App::isEnabled('files_versions')) {
+
+ foreach ($filelist as $filename) {
+
+ $versions = \OCA\Files_Versions\Storage::getVersions($this->userId, $filename);
+ foreach ($versions as $version) {
+
+ $path = '/' . $this->userId . '/files_versions/' . $version['path'] . '.v' . $version['version'];
+
+ $encHandle = fopen('crypt://' . $path . '.part', 'wb');
+
+ if ($encHandle === false) {
+ \OCP\Util::writeLog('Encryption library', 'couldn\'t open "' . $path . '", decryption failed!', \OCP\Util::FATAL);
+ $successful = false;
+ continue;
+ }
+
+ $plainHandle = $this->view->fopen($path, 'rb');
+ if ($plainHandle === false) {
+ \OCP\Util::writeLog('Encryption library', 'couldn\'t open "' . $path . '.part", decryption failed!', \OCP\Util::FATAL);
+ $successful = false;
+ continue;
+ }
+
+ stream_copy_to_stream($plainHandle, $encHandle);
+
+ fclose($encHandle);
+ fclose($plainHandle);
+
+ $this->view->rename($path . '.part', $path);
+ }
+ }
+ }
+
+ return $successful;
+ }
+
+ /**
+ * @brief decrypt versions from given file
+ * @param string $filelist list of decrypted files, relative to data/user/files
+ * @return boolean
+ */
+ private function decryptVersions($filelist) {
+
+ $successful = true;
+
+ if (\OCP\App::isEnabled('files_versions')) {
+
+ foreach ($filelist as $filename) {
+
+ $versions = \OCA\Files_Versions\Storage::getVersions($this->userId, $filename);
+ foreach ($versions as $version) {
+
+ $path = '/' . $this->userId . '/files_versions/' . $version['path'] . '.v' . $version['version'];
+
+ $encHandle = fopen('crypt://' . $path, 'rb');
+
+ if ($encHandle === false) {
+ \OCP\Util::writeLog('Encryption library', 'couldn\'t open "' . $path . '", decryption failed!', \OCP\Util::FATAL);
+ $successful = false;
+ continue;
+ }
+
+ $plainHandle = $this->view->fopen($path . '.part', 'wb');
+ if ($plainHandle === false) {
+ \OCP\Util::writeLog('Encryption library', 'couldn\'t open "' . $path . '.part", decryption failed!', \OCP\Util::FATAL);
+ $successful = false;
+ continue;
+ }
+
+ stream_copy_to_stream($encHandle, $plainHandle);
+
+ fclose($encHandle);
+ fclose($plainHandle);
+
+ $this->view->rename($path . '.part', $path);
+ }
+ }
+ }
+
+ return $successful;
+ }
+
+ /**
+ * @brief Decrypt all files
+ * @return bool
+ */
+ public function decryptAll() {
+
+ $found = $this->findEncFiles($this->userId . '/files');
+
+ $successful = true;
+
+ if ($found) {
+
+ $versionStatus = \OCP\App::isEnabled('files_versions');
+ \OC_App::disable('files_versions');
+
+ $decryptedFiles = array();
+
+ // Encrypt unencrypted files
+ foreach ($found['encrypted'] as $encryptedFile) {
+
+ //get file info
+ $fileInfo = \OC\Files\Filesystem::getFileInfo($encryptedFile['path']);
+
+ //relative to data/<user>/file
+ $relPath = Helper::stripUserFilesPath($encryptedFile['path']);
+
+ //relative to /data
+ $rawPath = $encryptedFile['path'];
+
+ //get timestamp
+ $timestamp = $this->view->filemtime($rawPath);
+
+ //enable proxy to use OC\Files\View to access the original file
+ \OC_FileProxy::$enabled = true;
+
+ // Open enc file handle for binary reading
+ $encHandle = $this->view->fopen($rawPath, 'rb');
+
+ // Disable proxy to prevent file being encrypted again
+ \OC_FileProxy::$enabled = false;
+
+ if ($encHandle === false) {
+ \OCP\Util::writeLog('Encryption library', 'couldn\'t open "' . $rawPath . '", decryption failed!', \OCP\Util::FATAL);
+ $successful = false;
+ continue;
+ }
+
+ // Open plain file handle for binary writing, with same filename as original plain file
+ $plainHandle = $this->view->fopen($rawPath . '.part', 'wb');
+ if ($plainHandle === false) {
+ \OCP\Util::writeLog('Encryption library', 'couldn\'t open "' . $rawPath . '.part", decryption failed!', \OCP\Util::FATAL);
+ $successful = false;
+ continue;
+ }
+
+ // Move plain file to a temporary location
+ $size = stream_copy_to_stream($encHandle, $plainHandle);
+ if ($size === 0) {
+ \OCP\Util::writeLog('Encryption library', 'Zero bytes copied of "' . $rawPath . '", decryption failed!', \OCP\Util::FATAL);
+ $successful = false;
+ continue;
+ }
+
+ fclose($encHandle);
+ fclose($plainHandle);
+
+ $fakeRoot = $this->view->getRoot();
+ $this->view->chroot('/' . $this->userId . '/files');
+
+ $this->view->rename($relPath . '.part', $relPath);
+
+ $this->view->chroot($fakeRoot);
+
+ //set timestamp
+ $this->view->touch($rawPath, $timestamp);
+
+ // Add the file to the cache
+ \OC\Files\Filesystem::putFileInfo($relPath, array(
+ 'encrypted' => false,
+ 'size' => $size,
+ 'unencrypted_size' => $size,
+ 'etag' => $fileInfo['etag']
+ ));
+
+ $decryptedFiles[] = $relPath;
+
+ }
+
+ if ($versionStatus) {
+ \OC_App::enable('files_versions');
+ }
+
+ if (!$this->decryptVersions($decryptedFiles)) {
+ $successful = false;
+ }
+
+ if ($successful) {
+ $this->view->deleteAll($this->keyfilesPath);
+ $this->view->deleteAll($this->shareKeysPath);
+ }
+
+ \OC_FileProxy::$enabled = true;
+ }
+
+ return $successful;
+ }
+
+ /**
* @brief Encrypt all files in a directory
* @param string $dirPath the directory whose files will be encrypted
* @param null $legacyPassphrase
@@ -672,30 +805,44 @@ class Util {
*/
public function encryptAll($dirPath, $legacyPassphrase = null, $newPassphrase = null) {
- if ($found = $this->findEncFiles($dirPath)) {
+ $found = $this->findEncFiles($dirPath);
+
+ if ($found) {
// Disable proxy to prevent file being encrypted twice
\OC_FileProxy::$enabled = false;
+ $versionStatus = \OCP\App::isEnabled('files_versions');
+ \OC_App::disable('files_versions');
+
+ $encryptedFiles = array();
+
// Encrypt unencrypted files
foreach ($found['plain'] as $plainFile) {
+ //get file info
+ $fileInfo = \OC\Files\Filesystem::getFileInfo($plainFile['path']);
+
//relative to data/<user>/file
$relPath = $plainFile['path'];
//relative to /data
$rawPath = '/' . $this->userId . '/files/' . $plainFile['path'];
+ // keep timestamp
+ $timestamp = $this->view->filemtime($rawPath);
+
// Open plain file handle for binary reading
$plainHandle = $this->view->fopen($rawPath, 'rb');
// Open enc file handle for binary writing, with same filename as original plain file
- $encHandle = fopen('crypt://' . $relPath . '.part', 'wb');
+ $encHandle = fopen('crypt://' . $rawPath . '.part', 'wb');
// Move plain file to a temporary location
$size = stream_copy_to_stream($plainHandle, $encHandle);
fclose($encHandle);
+ fclose($plainHandle);
$fakeRoot = $this->view->getRoot();
$this->view->chroot('/' . $this->userId . '/files');
@@ -704,12 +851,19 @@ class Util {
$this->view->chroot($fakeRoot);
+ // set timestamp
+ $this->view->touch($rawPath, $timestamp);
+
// Add the file to the cache
\OC\Files\Filesystem::putFileInfo($relPath, array(
- 'encrypted' => true,
- 'size' => $size,
- 'unencrypted_size' => $size
- ));
+ 'encrypted' => true,
+ 'size' => $size,
+ 'unencrypted_size' => $size,
+ 'etag' => $fileInfo['etag']
+ ));
+
+ $encryptedFiles[] = $relPath;
+
}
// Encrypt legacy encrypted files
@@ -750,6 +904,12 @@ class Util {
\OC_FileProxy::$enabled = true;
+ if ($versionStatus) {
+ \OC_App::enable('files_versions');
+ }
+
+ $this->encryptVersions($encryptedFiles);
+
// If files were found, return true
return true;
} else {
@@ -878,46 +1038,22 @@ class Util {
}
/**
- * @brief Decrypt a keyfile without knowing how it was encrypted
+ * @brief Decrypt a keyfile
* @param string $filePath
- * @param string $fileOwner
* @param string $privateKey
* @return bool|string
- * @note Checks whether file was encrypted with openssl_seal or
- * openssl_encrypt, and decrypts accrdingly
- * @note This was used when 2 types of encryption for keyfiles was used,
- * but now we've switched to exclusively using openssl_seal()
*/
- public function decryptUnknownKeyfile($filePath, $fileOwner, $privateKey) {
+ private function decryptKeyfile($filePath, $privateKey) {
// Get the encrypted keyfile
- // NOTE: the keyfile format depends on how it was encrypted! At
- // this stage we don't know how it was encrypted
$encKeyfile = Keymanager::getFileKey($this->view, $this->userId, $filePath);
- // We need to decrypt the keyfile
- // Has the file been shared yet?
- if (
- $this->userId === $fileOwner
- && !Keymanager::getShareKey($this->view, $this->userId, $filePath) // NOTE: we can't use isShared() here because it's a post share hook so it always returns true
- ) {
-
- // The file has no shareKey, and its keyfile must be
- // decrypted conventionally
- $plainKeyfile = Crypt::keyDecrypt($encKeyfile, $privateKey);
-
+ // The file has a shareKey and must use it for decryption
+ $shareKey = Keymanager::getShareKey($this->view, $this->userId, $filePath);
- } else {
-
- // The file has a shareKey and must use it for decryption
- $shareKey = Keymanager::getShareKey($this->view, $this->userId, $filePath);
-
- $plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
-
- }
+ $plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
return $plainKeyfile;
-
}
/**
@@ -956,7 +1092,7 @@ class Util {
$fileOwner = \OC\Files\Filesystem::getOwner($filePath);
// Decrypt keyfile
- $plainKeyfile = $this->decryptUnknownKeyfile($filePath, $fileOwner, $privateKey);
+ $plainKeyfile = $this->decryptKeyfile($filePath, $privateKey);
// Re-enc keyfile to (additional) sharekeys
$multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
@@ -1012,7 +1148,7 @@ class Util {
}
- // If recovery is enabled, add the
+ // If recovery is enabled, add the
// Admin UID to list of users to share to
if ($recoveryEnabled) {
// Find recoveryAdmin user ID
@@ -1579,4 +1715,28 @@ class Util {
return false;
}
+ /**
+ * @brief decrypt private key and add it to the current session
+ * @param array $params with 'uid' and 'password'
+ * @return mixed session or false
+ */
+ public function initEncryption($params) {
+
+ $encryptedKey = Keymanager::getPrivateKey($this->view, $params['uid']);
+
+ $privateKey = Crypt::decryptPrivateKey($encryptedKey, $params['password']);
+
+ if ($privateKey === false) {
+ \OCP\Util::writeLog('Encryption library', 'Private key for user "' . $params['uid']
+ . '" is not valid! Maybe the user password was changed from outside if so please change it back to gain access', \OCP\Util::ERROR);
+ return false;
+ }
+
+ $session = new \OCA\Encryption\Session($this->view);
+
+ $session->setPrivateKey($privateKey);
+
+ return $session;
+ }
+
}
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index fddc3ea5eee..589219f32ad 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -16,7 +16,7 @@ $view = new \OC_FilesystemView('/');
$util = new \OCA\Encryption\Util($view, $user);
$session = new \OCA\Encryption\Session($view);
-$privateKeySet = ($session->getPrivateKey() !== false) ? true : false;
+$privateKeySet = $session->getPrivateKey() !== false;
$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 9b97df22d16..5146613e252 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -7,16 +7,16 @@
* See the COPYING-README file.
*/
-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__) . '/../lib/helper.php');
-require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
-require_once realpath(dirname(__FILE__) . '/util.php');
+require_once __DIR__ . '/../3rdparty/Crypt_Blowfish/Blowfish.php';
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../lib/helper.php';
+require_once __DIR__ . '/../appinfo/app.php';
+require_once __DIR__ . '/util.php';
use OCA\Encryption;
@@ -67,12 +67,12 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$this->pass = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
// set content for encrypting / decrypting in tests
- $this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
+ $this->dataLong = file_get_contents(__DIR__ . '/../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->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key');
+ $this->dataUrl = __DIR__ . '/../lib/crypt.php';
+ $this->legacyData = __DIR__ . '/legacy-text.txt';
+ $this->legacyEncryptedData = __DIR__ . '/legacy-encrypted-text.txt';
+ $this->legacyEncryptedDataKey = __DIR__ . '/encryption.key';
$this->randomKey = Encryption\Crypt::generateKey();
$keypair = Encryption\Crypt::createKeypair();
@@ -115,130 +115,6 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
}
- /**
- * @large
- * @return String
- */
- function testGenerateIv() {
-
- $iv = Encryption\Crypt::generateIv();
-
- $this->assertEquals(16, strlen($iv));
-
- return $iv;
-
- }
-
- /**
- * @large
- * @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
- );
-
- }
-
- /**
- * @medium
- * @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']);
-
- }
-
- /**
- * @medium
- * @return string padded
- */
- function testAddPadding() {
-
- $padded = Encryption\Crypt::addPadding($this->dataLong);
-
- $padding = substr($padded, -2);
-
- $this->assertEquals('xx', $padding);
-
- return $padded;
-
- }
-
- /**
- * @medium
- * @depends testAddPadding
- */
- function testRemovePadding($padded) {
-
- $noPadding = Encryption\Crypt::RemovePadding($padded);
-
- $this->assertEquals($this->dataLong, $noPadding);
-
- }
-
- /**
- * @medium
- */
- 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);
-
- }
-
- /**
- * @medium
- */
- 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 testDecryptPrivateKey() {
// test successful decrypt
@@ -281,7 +157,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$filename = 'tmp-' . time() . '.test';
- $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataShort);
+ $cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/'. $filename, $this->dataShort);
// Test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
@@ -339,7 +215,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$filename = 'tmp-' . time() . '.test';
// Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong . $this->dataLong);
+ $cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong . $this->dataLong);
// Test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
@@ -364,14 +240,12 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
//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[11], $r[12].$r[13], $r[14] );
+ $e = array();
+ $i = 0;
+ while ($i < count($r)-1) {
+ $e[] = $r[$i] . $r[$i+1];
+ $i = $i + 2;
+ }
//print_r($e);
@@ -422,7 +296,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$filename = 'tmp-' . time();
// Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataShort);
+ $cryptedFile = file_put_contents('crypt:///'. $this->userId . '/files/' . $filename, $this->dataShort);
// Test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
@@ -436,7 +310,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
\OC_FileProxy::$enabled = $proxyStatus;
// Get file decrypted contents
- $decrypt = file_get_contents('crypt://' . $filename);
+ $decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
$this->assertEquals($this->dataShort, $decrypt);
@@ -452,13 +326,13 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$filename = 'tmp-' . time();
// Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+ $cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong);
// Test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
// Get file decrypted contents
- $decrypt = file_get_contents('crypt://' . $filename);
+ $decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
$this->assertEquals($this->dataLong, $decrypt);
@@ -469,24 +343,6 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
/**
* @medium
*/
- 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);
-
- }
-
- /**
- * @medium
- */
function testIsEncryptedContent() {
$this->assertFalse(Encryption\Crypt::isCatfileContent($this->dataUrl));
@@ -528,47 +384,11 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
/**
* @medium
- */
- 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);
-
- }
-
- /**
- * @medium
- * @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;
-
- }
-
- /**
- * @medium
* @brief test decryption using legacy blowfish method
- * @depends testLegacyEncryptShort
*/
- function testLegacyDecryptShort($crypted) {
+ function testLegacyDecryptShort() {
+
+ $crypted = $this->legacyEncrypt($this->dataShort, $this->pass);
$decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
@@ -578,53 +398,15 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
/**
* @medium
- * @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;
-
- }
-
- /**
- * @medium
* @brief test decryption using legacy blowfish method
- * @depends testLegacyEncryptLong
*/
- function testLegacyDecryptLong($crypted) {
+ function testLegacyDecryptLong() {
+
+ $crypted = $this->legacyEncrypt($this->dataLong, $this->pass);
$decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
$this->assertEquals($this->dataLong, $decrypted);
-
- $this->assertFalse(Encryption\Crypt::getBlowfish(''));
- }
-
- /**
- * @medium
- * @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::legacyBlockDecrypt($encKey, $this->pass);
-
- $this->assertTrue(is_numeric($key));
-
- // Check that key is correct length
- $this->assertEquals(20, strlen($key));
-
}
/**
@@ -635,13 +417,13 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$filename = 'tmp-' . time();
// Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+ $cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong);
// Test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
// Get file decrypted contents
- $decrypt = file_get_contents('crypt://' . $filename);
+ $decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
$this->assertEquals($this->dataLong, $decrypt);
@@ -650,7 +432,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$view->rename($filename, $newFilename);
// Get file decrypted contents
- $newDecrypt = file_get_contents('crypt://' . $newFilename);
+ $newDecrypt = file_get_contents('crypt:///'. $this->userId . '/files/' . $newFilename);
$this->assertEquals($this->dataLong, $newDecrypt);
@@ -666,13 +448,13 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$filename = 'tmp-' . time();
// Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+ $cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong);
// Test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
// Get file decrypted contents
- $decrypt = file_get_contents('crypt://' . $filename);
+ $decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
$this->assertEquals($this->dataLong, $decrypt);
@@ -683,7 +465,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$view->rename($filename, $newFolder . '/' . $newFilename);
// Get file decrypted contents
- $newDecrypt = file_get_contents('crypt://' . $newFolder . '/' . $newFilename);
+ $newDecrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $newFolder . '/' . $newFilename);
$this->assertEquals($this->dataLong, $newDecrypt);
@@ -704,13 +486,13 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$view->mkdir($folder);
// Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents('crypt://' . $folder . $filename, $this->dataLong);
+ $cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $folder . $filename, $this->dataLong);
// Test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
// Get file decrypted contents
- $decrypt = file_get_contents('crypt://' . $folder . $filename);
+ $decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $folder . $filename);
$this->assertEquals($this->dataLong, $decrypt);
@@ -720,7 +502,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$view->rename($folder, $newFolder);
// Get file decrypted contents
- $newDecrypt = file_get_contents('crypt://' . $newFolder . $filename);
+ $newDecrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $newFolder . $filename);
$this->assertEquals($this->dataLong, $newDecrypt);
@@ -736,13 +518,13 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$filename = 'tmp-' . time();
// Save long data as encrypted file using stream wrapper
- $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+ $cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong);
// Test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
// Get file decrypted contents
- $decrypt = file_get_contents('crypt://' . $filename);
+ $decrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
$this->assertEquals($this->dataLong, $decrypt);
@@ -755,7 +537,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
OCA\Encryption\Hooks::login($params);
// Get file decrypted contents
- $newDecrypt = file_get_contents('crypt://' . $filename);
+ $newDecrypt = file_get_contents('crypt:///' . $this->userId . '/files/' . $filename);
$this->assertEquals($this->dataLong, $newDecrypt);
@@ -871,4 +653,20 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
// tear down
$view->unlink($filename);
}
+
+
+ /**
+ * @brief encryption using legacy blowfish method
+ * @param $data string data to encrypt
+ * @param $passwd string password
+ * @return string
+ */
+ function legacyEncrypt($data, $passwd) {
+
+ $bf = new \Crypt_Blowfish($passwd);
+ $crypted = $bf->encrypt($data);
+
+ return $crypted;
+ }
+
}
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index b644856d95d..b2d200cca3e 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -6,15 +6,15 @@
* See the COPYING-README file.
*/
-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__) . '/../lib/helper.php');
-require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
-require_once realpath(dirname(__FILE__) . '/util.php');
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../lib/helper.php';
+require_once __DIR__ . '/../appinfo/app.php';
+require_once __DIR__ . '/util.php';
use OCA\Encryption;
@@ -57,11 +57,11 @@ class Test_Encryption_Keymanager 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->dataLong = file_get_contents(__DIR__ . '/../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->dataUrl = __DIR__ . '/../lib/crypt.php';
+ $this->legacyData = __DIR__ . '/legacy-text.txt';
+ $this->legacyEncryptedData = __DIR__ . '/legacy-encrypted-text.txt';
$this->randomKey = Encryption\Crypt::generateKey();
$keypair = Encryption\Crypt::createKeypair();
@@ -141,10 +141,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
*/
function testSetFileKey() {
- # NOTE: This cannot be tested until we are able to break out
- # of the FileSystemView data directory root
-
- $key = Encryption\Crypt::symmetricEncryptFileContentKeyfile($this->randomKey, 'hat');
+ $key = $this->randomKey;
$file = 'unittest-' . time() . '.txt';
@@ -152,24 +149,17 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- $this->view->file_put_contents($this->userId . '/files/' . $file, $key['encrypted']);
+ $this->view->file_put_contents($this->userId . '/files/' . $file, $this->dataShort);
- // Re-enable proxy - our work is done
- \OC_FileProxy::$enabled = $proxyStatus;
+ Encryption\Keymanager::setFileKey($this->view, $file, $this->userId, $key);
- //$view = new \OC_FilesystemView( '/' . $this->userId . '/files_encryption/keyfiles' );
- Encryption\Keymanager::setFileKey($this->view, $file, $this->userId, $key['key']);
-
- // enable encryption proxy
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = true;
+ $this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/keyfiles/' . $file . '.key'));
// cleanup
$this->view->unlink('/' . $this->userId . '/files/' . $file);
// change encryption proxy to previous state
\OC_FileProxy::$enabled = $proxyStatus;
-
}
/**
@@ -233,7 +223,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
\OC_FileProxy::$enabled = true;
// save file with content
- $cryptedFile = file_put_contents('crypt:///folder1/subfolder/subsubfolder/' . $filename, $this->dataShort);
+ $cryptedFile = file_put_contents('crypt:///'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1/subfolder/subsubfolder' . $filename, $this->dataShort);
// test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 5f3d5005090..6a29d2428dc 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -20,16 +20,16 @@
*
*/
-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__) . '/../lib/helper.php');
-require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
-require_once realpath(dirname(__FILE__) . '/util.php');
+require_once __DIR__ . '/../3rdparty/Crypt_Blowfish/Blowfish.php';
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../lib/helper.php';
+require_once __DIR__ . '/../appinfo/app.php';
+require_once __DIR__ . '/util.php';
use OCA\Encryption;
@@ -136,7 +136,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
// save file with content
- $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+ $cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
// test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
@@ -293,7 +293,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
. $this->subsubfolder);
// save file with content
- $cryptedFile = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+ $cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
. $this->filename, $this->dataShort);
// test that data was successfully written
@@ -499,7 +499,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
// save file with content
- $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+ $cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
// test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
@@ -540,7 +540,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
\OC_User::setUserId(false);
// get file contents
- $retrievedCryptedFile = file_get_contents('crypt://' . $this->filename);
+ $retrievedCryptedFile = file_get_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
// check if data is the same as we previously written
$this->assertEquals($this->dataShort, $retrievedCryptedFile);
@@ -575,7 +575,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
// save file with content
- $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+ $cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
// test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
@@ -649,6 +649,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
* @large
*/
function testRecoveryFile() {
+ $this->markTestIncomplete(
+ 'No idea what\'s wrong here, this works perfectly in real-world. removeRecoveryKeys(\'/\') L709 removes correctly the keys, but for some reasons afterwards also the top-level folder "share-keys" is gone...'
+ );
// login as admin
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -675,8 +678,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
. $this->subsubfolder);
// save file with content
- $cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
- $cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+ $cryptedFile1 = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
+ $cryptedFile2 = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
. $this->filename, $this->dataShort);
// test that data was successfully written
@@ -717,7 +720,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
// enable recovery for admin
$this->assertTrue($util->setRecoveryForUser(1));
- // remove all recovery keys
+ // add recovery keys again
$util->addRecoveryKeys('/');
// check if share key for admin and recovery exists
@@ -752,7 +755,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
*/
function testRecoveryForUser() {
$this->markTestIncomplete(
- 'This test drives Jenkins crazy - "Cannot modify header information - headers already sent" - line 811'
+ 'This test drives Jenkins crazy - "Cannot modify header information - headers already sent" - line 811'
);
// login as admin
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -760,7 +763,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
- // login as user1
+ // login as user2
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
@@ -777,8 +780,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
. $this->subsubfolder);
// save file with content
- $cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
- $cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+ $cryptedFile1 = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2. '/files/' . $this->filename, $this->dataShort);
+ $cryptedFile2 = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
. $this->filename, $this->dataShort);
// test that data was successfully written
@@ -807,13 +810,13 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
// change password
\OC_User::setPassword(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, 'test', 'test123');
- // login as user1
+ // login as user2
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, false, 'test');
// get file contents
- $retrievedCryptedFile1 = file_get_contents('crypt://' . $this->filename);
+ $retrievedCryptedFile1 = file_get_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/' . $this->filename);
$retrievedCryptedFile2 = file_get_contents(
- 'crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+ 'crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
// check if data is the same as we previously written
$this->assertEquals($this->dataShort, $retrievedCryptedFile1);
@@ -854,7 +857,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
// save file with content
- $cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+ $cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
// test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index 50ac41e4536..530ee3a7b2d 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -20,14 +20,14 @@
*
*/
-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');
-require_once realpath(dirname(__FILE__) . '/util.php');
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../appinfo/app.php';
+require_once __DIR__ . '/util.php';
use OCA\Encryption;
@@ -180,4 +180,4 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
// tear down
$view->unlink($filename);
}
-} \ No newline at end of file
+}
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index ade968fbece..2a41ace4015 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -20,15 +20,15 @@
*
*/
-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');
-require_once realpath(dirname(__FILE__) . '/../../files_trashbin/appinfo/app.php');
-require_once realpath(dirname(__FILE__) . '/util.php');
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../appinfo/app.php';
+require_once __DIR__ . '/../../files_trashbin/appinfo/app.php';
+require_once __DIR__ . '/util.php';
use OCA\Encryption;
@@ -122,7 +122,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
$filename = 'tmp-' . time() . '.txt';
// save file with content
- $cryptedFile = file_put_contents('crypt:///' . $filename, $this->dataShort);
+ $cryptedFile = file_put_contents('crypt:///' .\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename, $this->dataShort);
// test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
@@ -226,7 +226,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
$filename = 'tmp-' . time() . '.txt';
// save file with content
- $cryptedFile = file_put_contents('crypt:///' . $filename, $this->dataShort);
+ $cryptedFile = file_put_contents('crypt:///' .$this->userId. '/files/' . $filename, $this->dataShort);
// test that data was successfully written
$this->assertTrue(is_int($cryptedFile));
@@ -300,4 +300,4 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
}
-} \ No newline at end of file
+}
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 368b7b3dc3f..eddc4c6b3ff 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -6,13 +6,13 @@
* See the COPYING-README file.
*/
-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');
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../appinfo/app.php';
use OCA\Encryption;
@@ -69,12 +69,12 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
$this->pass = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1;
// set content for encrypting / decrypting in tests
- $this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
+ $this->dataUrl = __DIR__ . '/../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->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key');
+ $this->dataLong = file_get_contents(__DIR__ . '/../lib/crypt.php');
+ $this->legacyData = __DIR__ . '/legacy-text.txt';
+ $this->legacyEncryptedData = __DIR__ . '/legacy-encrypted-text.txt';
+ $this->legacyEncryptedDataKey = __DIR__ . '/encryption.key';
$this->legacyKey = "30943623843030686906\0\0\0\0";
$keypair = Encryption\Crypt::createKeypair();
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index 1d406789f0c..a2a8ce6e34f 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -20,14 +20,14 @@
*
*/
-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');
-require_once realpath(dirname(__FILE__) . '/util.php');
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../appinfo/app.php';
+require_once __DIR__ . '/util.php';
use OCA\Encryption;
@@ -153,7 +153,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
$this->assertTrue(Encryption\Crypt::isCatfileContent($encryptedContent));
// get decrypted file contents
- $decrypt = file_get_contents('crypt://' . $filename);
+ $decrypt = file_get_contents('crypt:///' . $this->userId . '/files'. $filename);
// check if file content match with the written content
$this->assertEquals($this->dataShort, $decrypt);
@@ -259,4 +259,4 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
// return captured content
return $content;
}
-} \ No newline at end of file
+}
diff --git a/apps/files_external/ajax/addMountPoint.php b/apps/files_external/ajax/addMountPoint.php
index fed2ddfcf3d..9100d47db3a 100644
--- a/apps/files_external/ajax/addMountPoint.php
+++ b/apps/files_external/ajax/addMountPoint.php
@@ -16,4 +16,4 @@ $status = OC_Mount_Config::addMountPoint($_POST['mountPoint'],
$_POST['mountType'],
$_POST['applicable'],
$isPersonal);
-OCP\JSON::success(array('data' => array('message' => $status))); \ No newline at end of file
+OCP\JSON::success(array('data' => array('message' => $status)));
diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/google.php
index e63b7cb07b9..2594a1780b3 100644
--- a/apps/files_external/ajax/google.php
+++ b/apps/files_external/ajax/google.php
@@ -39,4 +39,4 @@ if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST
}
}
}
-} \ No newline at end of file
+}
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
index 7e111a95d98..b4be1c1dc41 100644
--- a/apps/files_external/js/google.js
+++ b/apps/files_external/js/google.js
@@ -126,4 +126,4 @@ $(document).ready(function() {
}
});
-}); \ No newline at end of file
+});
diff --git a/apps/files_external/l10n/af_ZA.php b/apps/files_external/l10n/af_ZA.php
index cf9b951828d..261c44310fd 100644
--- a/apps/files_external/l10n/af_ZA.php
+++ b/apps/files_external/l10n/af_ZA.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Users" => "Gebruikers"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ar.php b/apps/files_external/l10n/ar.php
index a53bfe48bc3..905d221e886 100644
--- a/apps/files_external/l10n/ar.php
+++ b/apps/files_external/l10n/ar.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Groups" => "مجموعات",
"Users" => "المستخدمين",
"Delete" => "إلغاء"
);
+$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;";
diff --git a/apps/files_external/l10n/bg_BG.php b/apps/files_external/l10n/bg_BG.php
index fcb01152bf8..17665d22286 100644
--- a/apps/files_external/l10n/bg_BG.php
+++ b/apps/files_external/l10n/bg_BG.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Достъпът е даден",
"Grant access" => "Даване на достъп",
"External Storage" => "Външно хранилище",
@@ -16,3 +17,4 @@
"SSL root certificates" => "SSL основни сертификати",
"Import Root Certificate" => "Импортиране на основен сертификат"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/bn_BD.php b/apps/files_external/l10n/bn_BD.php
index 0f032df9f05..0591dbba55c 100644
--- a/apps/files_external/l10n/bn_BD.php
+++ b/apps/files_external/l10n/bn_BD.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "অধিগমনের অনুমতি প্রদান করা হলো",
"Error configuring Dropbox storage" => "Dropbox সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
"Grant access" => "অধিগমনের অনুমতি প্রদান কর",
@@ -18,3 +19,4 @@
"SSL root certificates" => "SSL রুট সনদপত্র",
"Import Root Certificate" => "রুট সনদপত্রটি আমদানি করুন"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index 90ac954301f..c1d6ec077b4 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "S'ha concedit l'accés",
"Error configuring Dropbox storage" => "Error en configurar l'emmagatzemament Dropbox",
"Grant access" => "Concedeix accés",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificats SSL root",
"Import Root Certificate" => "Importa certificat root"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index c64ecbb5e26..a574e0506cf 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Přístup povolen",
"Error configuring Dropbox storage" => "Chyba při nastavení úložiště Dropbox",
"Grant access" => "Povolit přístup",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Kořenové certifikáty SSL",
"Import Root Certificate" => "Importovat kořenového certifikátu"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_external/l10n/cy_GB.php b/apps/files_external/l10n/cy_GB.php
index 78bbb987eb8..33992789cb3 100644
--- a/apps/files_external/l10n/cy_GB.php
+++ b/apps/files_external/l10n/cy_GB.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Groups" => "Grwpiau",
"Users" => "Defnyddwyr",
"Delete" => "Dileu"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_external/l10n/da.php b/apps/files_external/l10n/da.php
index f2c1e45778d..3a25142b36d 100644
--- a/apps/files_external/l10n/da.php
+++ b/apps/files_external/l10n/da.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Adgang godkendt",
"Error configuring Dropbox storage" => "Fejl ved konfiguration af Dropbox plads",
"Grant access" => "Godkend adgang",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL-rodcertifikater",
"Import Root Certificate" => "Importer rodcertifikat"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
index 8dfa0eafbb4..b2c72f76889 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Zugriff gestattet",
"Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
"Grant access" => "Zugriff gestatten",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL-Root-Zertifikate",
"Import Root Certificate" => "Root-Zertifikate importieren"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index 9b7ab4d53ca..8f6a25cb522 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Zugriff gestattet",
"Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
"Grant access" => "Zugriff gestatten",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL-Root-Zertifikate",
"Import Root Certificate" => "Root-Zertifikate importieren"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index 62703b08fbc..0161c0901d6 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Προσβαση παρασχέθηκε",
"Error configuring Dropbox storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ",
"Grant access" => "Παροχή πρόσβασης",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Πιστοποιητικά SSL root",
"Import Root Certificate" => "Εισαγωγή Πιστοποιητικού Root"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php
index b0afb77498f..5697221cac0 100644
--- a/apps/files_external/l10n/eo.php
+++ b/apps/files_external/l10n/eo.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Alirpermeso donita",
"Error configuring Dropbox storage" => "Eraro dum agordado de la memorservo Dropbox",
"Grant access" => "Doni alirpermeson",
@@ -19,3 +20,4 @@
"SSL root certificates" => "Radikaj SSL-atestoj",
"Import Root Certificate" => "Enporti radikan ateston"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index d145a176f71..5179d9329a5 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Acceso concedido",
"Error configuring Dropbox storage" => "Error configurando el almacenamiento de Dropbox",
"Grant access" => "Conceder acceso",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificados raíz SSL",
"Import Root Certificate" => "Importar certificado raíz"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/es_AR.php b/apps/files_external/l10n/es_AR.php
index c1b3ac63886..a0bb3a8dfea 100644
--- a/apps/files_external/l10n/es_AR.php
+++ b/apps/files_external/l10n/es_AR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Acceso permitido",
"Error configuring Dropbox storage" => "Error al configurar el almacenamiento de Dropbox",
"Grant access" => "Permitir acceso",
@@ -24,3 +25,4 @@
"SSL root certificates" => "certificados SSL raíz",
"Import Root Certificate" => "Importar certificado raíz"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index 465201df4dd..a7e623eb7da 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Ligipääs on antud",
"Error configuring Dropbox storage" => "Viga Dropboxi salvestusruumi seadistamisel",
"Grant access" => "Anna ligipääs",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL root sertifikaadid",
"Import Root Certificate" => "Impordi root sertifikaadid"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
index 9dc1f3e9c03..db92e2f001c 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Sarrera baimendua",
"Error configuring Dropbox storage" => "Errore bat egon da Dropbox biltegiratzea konfiguratzean",
"Grant access" => "Baimendu sarrera",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL erro ziurtagiriak",
"Import Root Certificate" => "Inportatu Erro Ziurtagiria"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/fa.php b/apps/files_external/l10n/fa.php
index 036a34c0992..216893811cb 100644
--- a/apps/files_external/l10n/fa.php
+++ b/apps/files_external/l10n/fa.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "مجوز دسترسی صادر شد",
"Error configuring Dropbox storage" => "خطا به هنگام تنظیم فضای دراپ باکس",
"Grant access" => " مجوز اعطا دسترسی",
@@ -24,3 +25,4 @@
"SSL root certificates" => "گواهی های اصلی SSL ",
"Import Root Certificate" => "وارد کردن گواهی اصلی"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
index ba39d140fbc..9632aa255ea 100644
--- a/apps/files_external/l10n/fi_FI.php
+++ b/apps/files_external/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Pääsy sallittu",
"Error configuring Dropbox storage" => "Virhe Dropbox levyn asetuksia tehtäessä",
"Grant access" => "Salli pääsy",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL-juurivarmenteet",
"Import Root Certificate" => "Tuo juurivarmenne"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index 5006133a7b6..f6b1a75200c 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Accès autorisé",
"Error configuring Dropbox storage" => "Erreur lors de la configuration du support de stockage Dropbox",
"Grant access" => "Autoriser l'accès",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificats racine SSL",
"Import Root Certificate" => "Importer un certificat racine"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/gl.php b/apps/files_external/l10n/gl.php
index 77f23c39bc3..3dda999dd18 100644
--- a/apps/files_external/l10n/gl.php
+++ b/apps/files_external/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Concedeuse acceso",
"Error configuring Dropbox storage" => "Produciuse un erro ao configurar o almacenamento en Dropbox",
"Grant access" => "Permitir o acceso",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificados SSL root",
"Import Root Certificate" => "Importar o certificado root"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/he.php b/apps/files_external/l10n/he.php
index 9cba045d1ea..e99c9f5193d 100644
--- a/apps/files_external/l10n/he.php
+++ b/apps/files_external/l10n/he.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "הוענקה גישה",
"Error configuring Dropbox storage" => "אירעה שגיאה בעת הגדרת אחסון ב־Dropbox",
"Grant access" => "הענקת גישה",
@@ -19,3 +20,4 @@
"SSL root certificates" => "שורש אישורי אבטחת SSL ",
"Import Root Certificate" => "ייבוא אישור אבטחת שורש"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/hi.php b/apps/files_external/l10n/hi.php
index 0482efc4b23..7df96572596 100644
--- a/apps/files_external/l10n/hi.php
+++ b/apps/files_external/l10n/hi.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Users" => "उपयोगकर्ता"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/hr.php b/apps/files_external/l10n/hr.php
index 24f27ddf81b..91536e0b873 100644
--- a/apps/files_external/l10n/hr.php
+++ b/apps/files_external/l10n/hr.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Groups" => "Grupe",
"Users" => "Korisnici",
"Delete" => "Obriši"
);
+$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;";
diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php
index b88737a19ab..23fe916eba6 100644
--- a/apps/files_external/l10n/hu_HU.php
+++ b/apps/files_external/l10n/hu_HU.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Érvényes hozzáférés",
"Error configuring Dropbox storage" => "A Dropbox tárolót nem sikerült beállítani",
"Grant access" => "Megadom a hozzáférést",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL tanúsítványok",
"Import Root Certificate" => "SSL tanúsítványok importálása"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/hy.php b/apps/files_external/l10n/hy.php
index 3b80487278a..f933bec8feb 100644
--- a/apps/files_external/l10n/hy.php
+++ b/apps/files_external/l10n/hy.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Delete" => "Ջնջել"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ia.php b/apps/files_external/l10n/ia.php
index f57f96688bf..47b0f89b8b5 100644
--- a/apps/files_external/l10n/ia.php
+++ b/apps/files_external/l10n/ia.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Groups" => "Gruppos",
"Users" => "Usatores",
"Delete" => "Deler"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/id.php b/apps/files_external/l10n/id.php
index 30cd28bba1c..53ab79ae7ee 100644
--- a/apps/files_external/l10n/id.php
+++ b/apps/files_external/l10n/id.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Akses diberikan",
"Error configuring Dropbox storage" => "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
"Grant access" => "Berikan hak akses",
@@ -23,3 +24,4 @@
"SSL root certificates" => "Sertifikat root SSL",
"Import Root Certificate" => "Impor Sertifikat Root"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/is.php b/apps/files_external/l10n/is.php
index 6af53096fac..d2229d1fcdd 100644
--- a/apps/files_external/l10n/is.php
+++ b/apps/files_external/l10n/is.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Aðgengi veitt",
"Error configuring Dropbox storage" => "Villa við að setja upp Dropbox gagnasvæði",
"Grant access" => "Veita aðgengi",
@@ -21,3 +22,4 @@
"SSL root certificates" => "SSL rótar skilríki",
"Import Root Certificate" => "Flytja inn rótar skilríki"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
index 4c70a04022e..b53663beb56 100644
--- a/apps/files_external/l10n/it.php
+++ b/apps/files_external/l10n/it.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Accesso consentito",
"Error configuring Dropbox storage" => "Errore durante la configurazione dell'archivio Dropbox",
"Grant access" => "Concedi l'accesso",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificati SSL radice",
"Import Root Certificate" => "Importa certificato radice"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ja_JP.php b/apps/files_external/l10n/ja_JP.php
index 97dd4e119d4..fc528f035c2 100644
--- a/apps/files_external/l10n/ja_JP.php
+++ b/apps/files_external/l10n/ja_JP.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "アクセスは許可されました",
"Error configuring Dropbox storage" => "Dropboxストレージの設定エラー",
"Grant access" => "アクセスを許可",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSLルート証明書",
"Import Root Certificate" => "ルート証明書をインポート"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ka.php b/apps/files_external/l10n/ka.php
index 14c0625e1f2..f6356d2cef8 100644
--- a/apps/files_external/l10n/ka.php
+++ b/apps/files_external/l10n/ka.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Users" => "მომხმარებლები"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ka_GE.php b/apps/files_external/l10n/ka_GE.php
index b0845555b4b..445d40e7089 100644
--- a/apps/files_external/l10n/ka_GE.php
+++ b/apps/files_external/l10n/ka_GE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "დაშვება მინიჭებულია",
"Error configuring Dropbox storage" => "შეცდომა Dropbox საცავის კონფიგურირების დროს",
"Grant access" => "დაშვების მინიჭება",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL root სერთიფიკატები",
"Import Root Certificate" => "Root სერთიფიკატის იმპორტირება"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ko.php b/apps/files_external/l10n/ko.php
index 803b489c218..64d815a5bcb 100644
--- a/apps/files_external/l10n/ko.php
+++ b/apps/files_external/l10n/ko.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "접근 허가됨",
"Error configuring Dropbox storage" => "Dropbox 저장소 설정 오류",
"Grant access" => "접근 권한 부여",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL 루트 인증서",
"Import Root Certificate" => "루트 인증서 가져오기"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ku_IQ.php b/apps/files_external/l10n/ku_IQ.php
index 59eabb36c9f..39778bce072 100644
--- a/apps/files_external/l10n/ku_IQ.php
+++ b/apps/files_external/l10n/ku_IQ.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Folder name" => "ناوی بوخچه",
"Users" => "به‌كارهێنه‌ر"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/lb.php b/apps/files_external/l10n/lb.php
index 4e78227ec48..13233bf3626 100644
--- a/apps/files_external/l10n/lb.php
+++ b/apps/files_external/l10n/lb.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Folder name" => "Dossiers Numm:",
"Groups" => "Gruppen",
"Users" => "Benotzer",
"Delete" => "Läschen"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php
index 29c962d9a80..57cdfe6722a 100644
--- a/apps/files_external/l10n/lt_LT.php
+++ b/apps/files_external/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Priėjimas suteiktas",
"Error configuring Dropbox storage" => "Klaida nustatinėjant Dropbox talpyklą",
"Grant access" => "Suteikti priėjimą",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL sertifikatas",
"Import Root Certificate" => "Įkelti pagrindinį sertifikatą"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/lv.php b/apps/files_external/l10n/lv.php
index b37dbcbdc16..d0db01a22b5 100644
--- a/apps/files_external/l10n/lv.php
+++ b/apps/files_external/l10n/lv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Piešķirta pieeja",
"Error configuring Dropbox storage" => "Kļūda, konfigurējot Dropbox krātuvi",
"Grant access" => "Piešķirt pieeju",
@@ -6,6 +7,7 @@
"Error configuring Google Drive storage" => "Kļūda, konfigurējot Google Drive krātuvi",
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Brīdinājums:</b> nav uzinstalēts “smbclient”. Nevar montēt CIFS/SMB koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē.",
"<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>Brīdinājums: </b> uz PHP nav aktivēts vai instalēts FTP atbalsts. Nevar montēt FTP koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Brīdinājums:</b> PHP Curl atbalsts nav instalēts. OwnCloud / WebDAV vai GoogleDrive montēšana nav iespējama. Lūdziet sistēmas administratoram lai tas tiek uzstādīts.",
"External Storage" => "Ārējā krātuve",
"Folder name" => "Mapes nosaukums",
"External storage" => "Ārējā krātuve",
@@ -23,3 +25,4 @@
"SSL root certificates" => "SSL saknes sertifikāti",
"Import Root Certificate" => "Importēt saknes sertifikātus"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_external/l10n/mk.php b/apps/files_external/l10n/mk.php
index 1f1a1c27831..e410b398ac9 100644
--- a/apps/files_external/l10n/mk.php
+++ b/apps/files_external/l10n/mk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Пристапот е дозволен",
"Error configuring Dropbox storage" => "Грешка при конфигурација на Dropbox",
"Grant access" => "Дозволи пристап",
@@ -21,3 +22,4 @@
"SSL root certificates" => "SSL root сертификати",
"Import Root Certificate" => "Увези"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_external/l10n/ms_MY.php b/apps/files_external/l10n/ms_MY.php
index 2fdb089ebc6..4e33263a863 100644
--- a/apps/files_external/l10n/ms_MY.php
+++ b/apps/files_external/l10n/ms_MY.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Groups" => "Kumpulan",
"Users" => "Pengguna",
"Delete" => "Padam"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/my_MM.php b/apps/files_external/l10n/my_MM.php
index 5acfbb0321e..1cbe5f0fe52 100644
--- a/apps/files_external/l10n/my_MM.php
+++ b/apps/files_external/l10n/my_MM.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Users" => "သုံးစွဲသူ"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
index ea8648303d1..cb31ac89227 100644
--- a/apps/files_external/l10n/nb_NO.php
+++ b/apps/files_external/l10n/nb_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Tilgang innvilget",
"Error configuring Dropbox storage" => "Feil ved konfigurering av Dropbox-lagring",
"Grant access" => "Gi tilgang",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL root-sertifikater",
"Import Root Certificate" => "Importer root-sertifikat"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
index ded5a861a8b..35e63b09a35 100644
--- a/apps/files_external/l10n/nl.php
+++ b/apps/files_external/l10n/nl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Toegang toegestaan",
"Error configuring Dropbox storage" => "Fout tijdens het configureren van Dropbox opslag",
"Grant access" => "Sta toegang toe",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL root certificaten",
"Import Root Certificate" => "Importeer root certificaat"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/nn_NO.php b/apps/files_external/l10n/nn_NO.php
index 998c3f82457..7bb38f14cee 100644
--- a/apps/files_external/l10n/nn_NO.php
+++ b/apps/files_external/l10n/nn_NO.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Configuration" => "Innstillingar",
"Groups" => "Grupper",
"Users" => "Brukarar",
"Delete" => "Slett"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/oc.php b/apps/files_external/l10n/oc.php
index 47db011473f..99f2fd507d2 100644
--- a/apps/files_external/l10n/oc.php
+++ b/apps/files_external/l10n/oc.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Groups" => "Grops",
"Users" => "Usancièrs",
"Delete" => "Escafa"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
index e03ded1e70a..f5501b9755b 100644
--- a/apps/files_external/l10n/pl.php
+++ b/apps/files_external/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Dostęp do",
"Error configuring Dropbox storage" => "Wystąpił błąd podczas konfigurowania zasobu Dropbox",
"Grant access" => "Udziel dostępu",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Główny certyfikat SSL",
"Import Root Certificate" => "Importuj główny certyfikat"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/pt_BR.php b/apps/files_external/l10n/pt_BR.php
index bc3c356a517..f69bbc1ebe6 100644
--- a/apps/files_external/l10n/pt_BR.php
+++ b/apps/files_external/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Acesso concedido",
"Error configuring Dropbox storage" => "Erro ao configurar armazenamento do Dropbox",
"Grant access" => "Permitir acesso",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificados SSL raíz",
"Import Root Certificate" => "Importar Certificado Raíz"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index 0a05d1f8825..3f2afd33f07 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Acesso autorizado",
"Error configuring Dropbox storage" => "Erro ao configurar o armazenamento do Dropbox",
"Grant access" => "Conceder acesso",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificados SSL de raiz",
"Import Root Certificate" => "Importar Certificado Root"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ro.php b/apps/files_external/l10n/ro.php
index ed23b4cca8f..7115d09ea94 100644
--- a/apps/files_external/l10n/ro.php
+++ b/apps/files_external/l10n/ro.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Acces permis",
"Error configuring Dropbox storage" => "Eroare la configurarea mediului de stocare Dropbox",
"Grant access" => "Permite accesul",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Certificate SSL root",
"Import Root Certificate" => "Importă certificat root"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index d2c5292bac4..50c25acba06 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Доступ предоставлен",
"Error configuring Dropbox storage" => "Ошибка при настройке хранилища Dropbox",
"Grant access" => "Предоставление доступа",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Корневые сертификаты SSL",
"Import Root Certificate" => "Импортировать корневые сертификаты"
);
+$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);";
diff --git a/apps/files_external/l10n/ru_RU.php b/apps/files_external/l10n/ru_RU.php
deleted file mode 100644
index a43417dfbc1..00000000000
--- a/apps/files_external/l10n/ru_RU.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Groups" => "Группы",
-"Delete" => "Удалить"
-);
diff --git a/apps/files_external/l10n/si_LK.php b/apps/files_external/l10n/si_LK.php
index cc9cb9b9ce5..cad928accef 100644
--- a/apps/files_external/l10n/si_LK.php
+++ b/apps/files_external/l10n/si_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "පිවිසීමට හැක",
"Error configuring Dropbox storage" => "Dropbox ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
"Grant access" => "පිවිසුම ලබාදෙන්න",
@@ -19,3 +20,4 @@
"SSL root certificates" => "SSL මූල සහතිකයන්",
"Import Root Certificate" => "මූල සහතිකය ආයාත කරන්න"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index 33edcb9d4c8..ca445387bca 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Prístup povolený",
"Error configuring Dropbox storage" => "Chyba pri konfigurácii úložiska Dropbox",
"Grant access" => "Povoliť prístup",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Koreňové SSL certifikáty",
"Import Root Certificate" => "Importovať koreňový certifikát"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index 09b91b913e9..b0fcbf9eb69 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Dostop je odobren",
"Error configuring Dropbox storage" => "Napaka nastavljanja shrambe Dropbox",
"Grant access" => "Odobri dostop",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Korenska potrdila SSL",
"Import Root Certificate" => "Uvozi korensko potrdilo"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_external/l10n/sq.php b/apps/files_external/l10n/sq.php
index d5393aa3852..42de15edadc 100644
--- a/apps/files_external/l10n/sq.php
+++ b/apps/files_external/l10n/sq.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Users" => "Përdoruesit",
"Delete" => "Elimino"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/sr.php b/apps/files_external/l10n/sr.php
index 2554c498dda..c456daa004d 100644
--- a/apps/files_external/l10n/sr.php
+++ b/apps/files_external/l10n/sr.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Groups" => "Групе",
"Users" => "Корисници",
"Delete" => "Обриши"
);
+$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);";
diff --git a/apps/files_external/l10n/sr@latin.php b/apps/files_external/l10n/sr@latin.php
index 24f27ddf81b..a2489bbc64b 100644
--- a/apps/files_external/l10n/sr@latin.php
+++ b/apps/files_external/l10n/sr@latin.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Groups" => "Grupe",
"Users" => "Korisnici",
"Delete" => "Obriši"
);
+$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);";
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
index 80e68ab6e06..2c0b0ab69e4 100644
--- a/apps/files_external/l10n/sv.php
+++ b/apps/files_external/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Åtkomst beviljad",
"Error configuring Dropbox storage" => "Fel vid konfigurering av Dropbox",
"Grant access" => "Bevilja åtkomst",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL rotcertifikat",
"Import Root Certificate" => "Importera rotcertifikat"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ta_LK.php b/apps/files_external/l10n/ta_LK.php
index cee3b6edb8a..bb663a4fcb6 100644
--- a/apps/files_external/l10n/ta_LK.php
+++ b/apps/files_external/l10n/ta_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "அனுமதி வழங்கப்பட்டது",
"Error configuring Dropbox storage" => "Dropbox சேமிப்பை தகவமைப்பதில் வழு",
"Grant access" => "அனுமதியை வழங்கல்",
@@ -19,3 +20,4 @@
"SSL root certificates" => "SSL வேர் சான்றிதழ்கள்",
"Import Root Certificate" => "வேர் சான்றிதழை இறக்குமதி செய்க"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/te.php b/apps/files_external/l10n/te.php
index 3d31f6438f5..7f8d893d463 100644
--- a/apps/files_external/l10n/te.php
+++ b/apps/files_external/l10n/te.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Folder name" => "సంచయం పేరు",
"Users" => "వాడుకరులు",
"Delete" => "తొలగించు"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php
index 2f733eab9e8..f2ea35f10f4 100644
--- a/apps/files_external/l10n/th_TH.php
+++ b/apps/files_external/l10n/th_TH.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "การเข้าถึงได้รับอนุญาตแล้ว",
"Error configuring Dropbox storage" => "เกิดข้อผิดพลาดในการกำหนดค่าพื้นที่จัดเก็บข้อมูล Dropbox",
"Grant access" => "อนุญาตให้เข้าถึงได้",
@@ -21,3 +22,4 @@
"SSL root certificates" => "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
"Import Root Certificate" => "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php
index 3c3c0c24f97..cc52c425b8d 100644
--- a/apps/files_external/l10n/tr.php
+++ b/apps/files_external/l10n/tr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Giriş kabul edildi",
"Error configuring Dropbox storage" => "Dropbox depo yapılandırma hatası",
"Grant access" => "Erişim sağlandı",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL kök sertifikaları",
"Import Root Certificate" => "Kök Sertifikalarını İçe Aktar"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/ug.php b/apps/files_external/l10n/ug.php
index 2d1dea98906..ae20f7424da 100644
--- a/apps/files_external/l10n/ug.php
+++ b/apps/files_external/l10n/ug.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Folder name" => "قىسقۇچ ئاتى",
"External storage" => "سىرتقى ساقلىغۇچ",
"Configuration" => "سەپلىمە",
@@ -7,3 +8,4 @@
"Users" => "ئىشلەتكۈچىلەر",
"Delete" => "ئۆچۈر"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php
index 8783896d289..e535b455d10 100644
--- a/apps/files_external/l10n/uk.php
+++ b/apps/files_external/l10n/uk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Доступ дозволено",
"Error configuring Dropbox storage" => "Помилка при налаштуванні сховища Dropbox",
"Grant access" => "Дозволити доступ",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL корневі сертифікати",
"Import Root Certificate" => "Імпортувати корневі сертифікати"
);
+$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);";
diff --git a/apps/files_external/l10n/ur_PK.php b/apps/files_external/l10n/ur_PK.php
index 278357b4d68..56df17991bc 100644
--- a/apps/files_external/l10n/ur_PK.php
+++ b/apps/files_external/l10n/ur_PK.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Users" => "یوزرز"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php
index 769f9e2a097..da8ac419cda 100644
--- a/apps/files_external/l10n/vi.php
+++ b/apps/files_external/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "Đã cấp quyền truy cập",
"Error configuring Dropbox storage" => "Lỗi cấu hình lưu trữ Dropbox ",
"Grant access" => "Cấp quyền truy cập",
@@ -24,3 +25,4 @@
"SSL root certificates" => "Chứng chỉ SSL root",
"Import Root Certificate" => "Nhập Root Certificate"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_CN.GB2312.php b/apps/files_external/l10n/zh_CN.GB2312.php
index 47298f8007d..3633de6314e 100644
--- a/apps/files_external/l10n/zh_CN.GB2312.php
+++ b/apps/files_external/l10n/zh_CN.GB2312.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "已授予权限",
"Error configuring Dropbox storage" => "配置 Dropbox 存储出错",
"Grant access" => "授予权限",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL 根证书",
"Import Root Certificate" => "导入根证书"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
index 8157923183c..5e2c2e4fe0c 100644
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "权限已授予。",
"Error configuring Dropbox storage" => "配置Dropbox存储时出错",
"Grant access" => "授权",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL根证书",
"Import Root Certificate" => "导入根证书"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_HK.php b/apps/files_external/l10n/zh_HK.php
index a85b5a03b8a..76e0ed69d27 100644
--- a/apps/files_external/l10n/zh_HK.php
+++ b/apps/files_external/l10n/zh_HK.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Groups" => "群組",
"Users" => "用戶",
"Delete" => "刪除"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
index a8314dcef03..d85d18a1c32 100644
--- a/apps/files_external/l10n/zh_TW.php
+++ b/apps/files_external/l10n/zh_TW.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Access granted" => "允許存取",
"Error configuring Dropbox storage" => "設定 Dropbox 儲存時發生錯誤",
"Grant access" => "允許存取",
@@ -24,3 +25,4 @@
"SSL root certificates" => "SSL 根憑證",
"Import Root Certificate" => "匯入根憑證"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index f4d1940b184..2d7bcd4ac37 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -79,7 +79,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$this->bucket = $params['bucket'];
$scheme = ($params['use_ssl'] === 'false') ? 'http' : 'https';
- $this->test = ( isset($params['test'])) ? true : false;
+ $this->test = isset($params['test']);
$this->timeout = ( ! isset($params['timeout'])) ? 15 : $params['timeout'];
$params['region'] = ( ! isset($params['region'])) ? 'eu-west-1' : $params['region'];
$params['hostname'] = ( !isset($params['hostname'])) ? 's3.amazonaws.com' : $params['hostname'];
@@ -183,7 +183,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
}
$dh = $this->opendir($path);
- while ($file = readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if ($file === '.' || $file === '..') {
continue;
}
@@ -464,7 +464,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
}
$dh = $this->opendir($path1);
- while ($file = readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if ($file === '.' || $file === '..') {
continue;
}
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index e3a2cf0b30b..1935740cd2e 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -93,14 +93,18 @@ class OC_Mount_Config {
'root' => '&Root',
'secure' => '!Secure ftps://'));
- if(OC_Mount_Config::checksmbclient()) $backends['\OC\Files\Storage\SMB']=array(
- 'backend' => 'SMB / CIFS',
- 'configuration' => array(
- 'host' => 'URL',
- 'user' => 'Username',
- 'password' => '*Password',
- 'share' => 'Share',
- 'root' => '&Root'));
+ if (!OC_Util::runningOnWindows()) {
+ if (OC_Mount_Config::checksmbclient()) {
+ $backends['\OC\Files\Storage\SMB'] = array(
+ 'backend' => 'SMB / CIFS',
+ 'configuration' => array(
+ 'host' => 'URL',
+ 'user' => 'Username',
+ 'password' => '*Password',
+ 'share' => 'Share',
+ 'root' => '&Root'));
+ }
+ }
if(OC_Mount_Config::checkcurl()) $backends['\OC\Files\Storage\DAV']=array(
'backend' => 'ownCloud / WebDAV',
@@ -414,9 +418,9 @@ class OC_Mount_Config {
public static function checksmbclient() {
if(function_exists('shell_exec')) {
$output=shell_exec('which smbclient');
- return (empty($output)?false:true);
+ return !empty($output);
}else{
- return(false);
+ return false;
}
}
@@ -425,9 +429,9 @@ class OC_Mount_Config {
*/
public static function checkphpftp() {
if(function_exists('ftp_login')) {
- return(true);
+ return true;
}else{
- return(false);
+ return false;
}
}
@@ -435,7 +439,7 @@ class OC_Mount_Config {
* check if curl is installed
*/
public static function checkcurl() {
- return (function_exists('curl_init'));
+ return function_exists('curl_init');
}
/**
@@ -444,8 +448,10 @@ class OC_Mount_Config {
public static function checkDependencies() {
$l= new OC_L10N('files_external');
$txt='';
- if(!OC_Mount_Config::checksmbclient()) {
- $txt.=$l->t('<b>Warning:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'<br />';
+ if (!OC_Util::runningOnWindows()) {
+ if(!OC_Mount_Config::checksmbclient()) {
+ $txt.=$l->t('<b>Warning:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'<br />';
+ }
}
if(!OC_Mount_Config::checkphpftp()) {
$txt.=$l->t('<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.').'<br />';
@@ -454,6 +460,6 @@ class OC_Mount_Config {
$txt.=$l->t('<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it.').'<br />';
}
- return($txt);
+ return $txt;
}
}
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index ef8dd6d8cad..215bdcda6c2 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -206,7 +206,7 @@ class Google extends \OC\Files\Storage\Common {
public function rmdir($path) {
if (trim($path, '/') === '') {
$dir = $this->opendir($path);
- while ($file = readdir($dir)) {
+ while (($file = readdir($dh)) !== false) {
if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
if (!$this->unlink($path.'/'.$file)) {
return false;
@@ -284,7 +284,7 @@ class Google extends \OC\Files\Storage\Common {
// Check if this is a Google Doc
if ($this->getMimeType($path) !== $file->getMimeType()) {
// Return unknown file size
- $stat['size'] = \OC\Files\FREE_SPACE_UNKNOWN;
+ $stat['size'] = \OC\Files\SPACE_UNKNOWN;
} else {
$stat['size'] = $file->getFileSize();
}
@@ -587,4 +587,4 @@ class Google extends \OC\Files\Storage\Common {
return false;
}
-} \ No newline at end of file
+}
diff --git a/apps/files_external/lib/irods.php b/apps/files_external/lib/irods.php
index a343ac5fb27..7ec3b3a0cfc 100644
--- a/apps/files_external/lib/irods.php
+++ b/apps/files_external/lib/irods.php
@@ -137,7 +137,7 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{
private function collectionMTime($path) {
$dh = $this->opendir($path);
$lastCTime = $this->filemtime($path);
- while ($file = readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if ($file != '.' and $file != '..') {
$time = $this->filemtime($file);
if ($time > $lastCTime) {
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index 4fd36096463..f7f329b8993 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -170,7 +170,7 @@ class SFTP extends \OC\Files\Storage\Common {
public function file_exists($path) {
try {
- return $this->client->stat($this->abs_path($path)) === false ? false : true;
+ return $this->client->stat($this->abs_path($path)) !== false;
} catch (\Exception $e) {
return false;
}
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 81a6c956385..dc4e02731f1 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -99,7 +99,7 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
private function shareMTime() {
$dh=$this->opendir('');
$lastCtime=0;
- while($file=readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if ($file!='.' and $file!='..') {
$ctime=$this->filemtime($file);
if ($ctime>$lastCtime) {
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 4869322d87a..66920fc9f64 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -171,8 +171,9 @@ class DAV extends \OC\Files\Storage\Common{
$curl = curl_init();
$fp = fopen('php://temp', 'r+');
curl_setopt($curl, CURLOPT_USERPWD, $this->user.':'.$this->password);
- curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$path);
+ curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().str_replace(' ', '%20', $path));
curl_setopt($curl, CURLOPT_FILE, $fp);
+ curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
curl_exec ($curl);
curl_close ($curl);
@@ -224,7 +225,7 @@ class DAV extends \OC\Files\Storage\Common{
return 0;
}
} catch(\Exception $e) {
- return \OC\Files\FREE_SPACE_UNKNOWN;
+ return \OC\Files\SPACE_UNKNOWN;
}
}
@@ -255,7 +256,7 @@ class DAV extends \OC\Files\Storage\Common{
$curl = curl_init();
curl_setopt($curl, CURLOPT_USERPWD, $this->user.':'.$this->password);
- curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$target);
+ curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().str_replace(' ', '%20', $target));
curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
curl_setopt($curl, CURLOPT_INFILE, $source); // file pointer
curl_setopt($curl, CURLOPT_INFILESIZE, filesize($path));
diff --git a/apps/files_external/tests/google.php b/apps/files_external/tests/google.php
index 12faabb902d..d5495d49c5e 100644
--- a/apps/files_external/tests/google.php
+++ b/apps/files_external/tests/google.php
@@ -42,4 +42,4 @@ class Google extends Storage {
$this->instance->rmdir('/');
}
}
-} \ No newline at end of file
+}
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 9363a5431fa..895d446a336 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -15,4 +15,4 @@ OCP\Util::addScript('files_sharing', 'share');
\OC_Hook::connect('OC_Filesystem', 'delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook');
\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
\OC_Hook::connect('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'shareHook');
-\OC_Hook::connect('OCP\Share', 'pre_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook'); \ No newline at end of file
+\OC_Hook::connect('OCP\Share', 'pre_unshare', '\OC\Files\Cache\Shared_Updater', 'shareHook');
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 294223aa094..7ffd5e06873 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -31,19 +31,19 @@ $(document).ready(function() {
}
}
FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function(filename) {
- var tr = $('tr').filterAttr('data-file', filename)
+ var tr = $('tr').filterAttr('data-file', filename);
if (tr.length > 0) {
window.location = $(tr).find('a.name').attr('href');
}
});
FileActions.register('file', 'Download', OC.PERMISSION_READ, '', function(filename) {
- var tr = $('tr').filterAttr('data-file', filename)
+ var tr = $('tr').filterAttr('data-file', filename);
if (tr.length > 0) {
window.location = $(tr).find('a.name').attr('href');
}
});
FileActions.register('dir', 'Download', OC.PERMISSION_READ, '', function(filename) {
- var tr = $('tr').filterAttr('data-file', filename)
+ var tr = $('tr').filterAttr('data-file', filename);
if (tr.length > 0) {
window.location = $(tr).find('a.name').attr('href')+'&download';
}
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index eb5a6e8cb7f..3be89a39fa0 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -4,6 +4,10 @@ $(document).ready(function() {
if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !disableSharing) {
+ $('#fileList').one('fileActionsReady',function(){
+ OC.Share.loadIcons('file');
+ });
+
FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) {
if ($('#dir').val() == '/') {
var item = $('#dir').val() + filename;
@@ -33,6 +37,5 @@ $(document).ready(function() {
OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions);
}
});
- OC.Share.loadIcons('file');
}
});
diff --git a/apps/files_sharing/l10n/af_ZA.php b/apps/files_sharing/l10n/af_ZA.php
index 04e194530b1..946cc3a5bb8 100644
--- a/apps/files_sharing/l10n/af_ZA.php
+++ b/apps/files_sharing/l10n/af_ZA.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Wagwoord"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ar.php b/apps/files_sharing/l10n/ar.php
index 043c7ee1b27..ff7b40d16bc 100644
--- a/apps/files_sharing/l10n/ar.php
+++ b/apps/files_sharing/l10n/ar.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "كلمة المرور",
"Submit" => "تطبيق",
"%s shared the folder %s with you" => "%s شارك المجلد %s معك",
@@ -8,3 +9,4 @@
"Cancel upload" => "إلغاء رفع الملفات",
"No preview available for" => "لا يوجد عرض مسبق لـ"
);
+$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;";
diff --git a/apps/files_sharing/l10n/bg_BG.php b/apps/files_sharing/l10n/bg_BG.php
index 8e719ba2356..1094870fd0f 100644
--- a/apps/files_sharing/l10n/bg_BG.php
+++ b/apps/files_sharing/l10n/bg_BG.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Парола",
"Submit" => "Потвърждение",
"%s shared the folder %s with you" => "%s сподели папката %s с Вас",
@@ -8,3 +9,4 @@
"Cancel upload" => "Спри качването",
"No preview available for" => "Няма наличен преглед за"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php
index baa0c5c707c..71b948e347b 100644
--- a/apps/files_sharing/l10n/bn_BD.php
+++ b/apps/files_sharing/l10n/bn_BD.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "কূটশব্দ",
"Submit" => "জমা দিন",
"%s shared the folder %s with you" => "%s আপনার সাথে %s ফোল্ডারটি ভাগাভাগি করেছেন",
@@ -8,3 +9,4 @@
"Cancel upload" => "আপলোড বাতিল কর",
"No preview available for" => "এর জন্য কোন প্রাকবীক্ষণ সুলভ নয়"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index ccf7fc28ec1..cbe8f86e253 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "la contrasenya és incorrecta. Intenteu-ho de nou.",
"Password" => "Contrasenya",
"Submit" => "Envia",
@@ -15,3 +16,4 @@
"Cancel upload" => "Cancel·la la pujada",
"No preview available for" => "No hi ha vista prèvia disponible per a"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index bc9a645e112..7258dedcf6d 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Heslo není správné. Zkuste to znovu.",
"Password" => "Heslo",
"Submit" => "Odeslat",
@@ -15,3 +16,4 @@
"Cancel upload" => "Zrušit odesílání",
"No preview available for" => "Náhled není dostupný pro"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/cy_GB.php b/apps/files_sharing/l10n/cy_GB.php
index 6ff3e274c39..66fbc4e1d1c 100644
--- a/apps/files_sharing/l10n/cy_GB.php
+++ b/apps/files_sharing/l10n/cy_GB.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Cyfrinair",
"Submit" => "Cyflwyno",
"%s shared the folder %s with you" => "Rhannodd %s blygell %s â chi",
@@ -8,3 +9,4 @@
"Cancel upload" => "Diddymu llwytho i fyny",
"No preview available for" => "Does dim rhagolwg ar gael ar gyfer"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php
index f9ee949484d..0ca0f38161a 100644
--- a/apps/files_sharing/l10n/da.php
+++ b/apps/files_sharing/l10n/da.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Kodeordet er forkert. Prøv igen.",
"Password" => "Kodeord",
"Submit" => "Send",
@@ -15,3 +16,4 @@
"Cancel upload" => "Fortryd upload",
"No preview available for" => "Forhåndsvisning ikke tilgængelig for"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index 9b0184f3104..afed17d8839 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Bitte überprüfen sie Ihr Passwort und versuchen Sie es erneut.",
"Password" => "Passwort",
"Submit" => "Absenden",
@@ -15,3 +16,4 @@
"Cancel upload" => "Upload abbrechen",
"No preview available for" => "Es ist keine Vorschau verfügbar für"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
index 8661e3ee94d..1bd24f9d9c4 100644
--- a/apps/files_sharing/l10n/de_DE.php
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
"Password" => "Passwort",
"Submit" => "Bestätigen",
@@ -15,3 +16,4 @@
"Cancel upload" => "Upload abbrechen",
"No preview available for" => "Es ist keine Vorschau verfügbar für"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
index 8f68ae5818f..93486a831b1 100644
--- a/apps/files_sharing/l10n/el.php
+++ b/apps/files_sharing/l10n/el.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Εσφαλμένο συνθηματικό. Προσπαθήστε ξανά.",
"Password" => "Συνθηματικό",
"Submit" => "Καταχώρηση",
@@ -15,3 +16,4 @@
"Cancel upload" => "Ακύρωση αποστολής",
"No preview available for" => "Δεν υπάρχει διαθέσιμη προεπισκόπηση για"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/en@pirate.php b/apps/files_sharing/l10n/en@pirate.php
index cb40c5a1680..a60f1fe72f2 100644
--- a/apps/files_sharing/l10n/en@pirate.php
+++ b/apps/files_sharing/l10n/en@pirate.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Secret Code",
"Submit" => "Submit",
"%s shared the folder %s with you" => "%s shared the folder %s with you",
@@ -6,3 +7,4 @@
"Download" => "Download",
"No preview available for" => "No preview available for"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index d3ca5370a2c..70e703bda91 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Pasvorto",
"Submit" => "Sendi",
"%s shared the folder %s with you" => "%s kunhavigis la dosierujon %s kun vi",
@@ -8,3 +9,4 @@
"Cancel upload" => "Nuligi alŝuton",
"No preview available for" => "Ne haveblas antaŭvido por"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
index 2a006630ab0..1f238d083fb 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.",
"Password" => "Contraseña",
"Submit" => "Enviar",
@@ -15,3 +16,4 @@
"Cancel upload" => "Cancelar subida",
"No preview available for" => "No hay vista previa disponible para"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php
index 90bfe704d22..fed0b1e7b30 100644
--- a/apps/files_sharing/l10n/es_AR.php
+++ b/apps/files_sharing/l10n/es_AR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "La contraseña no es correcta. Probá de nuevo.",
"Password" => "Contraseña",
"Submit" => "Enviar",
@@ -9,3 +10,4 @@
"Cancel upload" => "Cancelar subida",
"No preview available for" => "La vista preliminar no está disponible para"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index 78fe436398c..fe230902ff1 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -1,7 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Parool on vale. Proovi uuesti.",
"Password" => "Parool",
"Submit" => "Saada",
+"Sorry, this link doesn’t seem to work anymore." => "Vabandust, see link ei tundu enam toimivat.",
+"Reasons might be:" => "Põhjused võivad olla:",
+"the item was removed" => "üksus on eemaldatud",
+"the link expired" => "link on aegunud",
+"sharing is disabled" => "jagamine on peatatud",
+"For more info, please ask the person who sent this link." => "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole.",
"%s shared the folder %s with you" => "%s jagas sinuga kausta %s",
"%s shared the file %s with you" => "%s jagas sinuga faili %s",
"Download" => "Lae alla",
@@ -9,3 +16,4 @@
"Cancel upload" => "Tühista üleslaadimine",
"No preview available for" => "Eelvaadet pole saadaval"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index 1d8891792fb..8e13c24a926 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Pasahitza ez da egokia. Saiatu berriro.",
"Password" => "Pasahitza",
"Submit" => "Bidali",
@@ -9,3 +10,4 @@
"Cancel upload" => "Ezeztatu igoera",
"No preview available for" => "Ez dago aurrebista eskuragarririk hauentzat "
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php
index 7a744c8463d..48888f798a0 100644
--- a/apps/files_sharing/l10n/fa.php
+++ b/apps/files_sharing/l10n/fa.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "رمزعبور اشتباه می باشد. دوباره امتحان کنید.",
"Password" => "گذرواژه",
"Submit" => "ثبت",
@@ -9,3 +10,4 @@
"Cancel upload" => "متوقف کردن بار گذاری",
"No preview available for" => "هیچگونه پیش نمایشی موجود نیست"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index 59c951b7248..42905be57a6 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Väärä salasana. Yritä uudelleen.",
"Password" => "Salasana",
"Submit" => "Lähetä",
@@ -15,3 +16,4 @@
"Cancel upload" => "Peru lähetys",
"No preview available for" => "Ei esikatselua kohteelle"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index 32aa6e0065a..b263cd87959 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Le mot de passe est incorrect. Veuillez réessayer.",
"Password" => "Mot de passe",
"Submit" => "Envoyer",
@@ -9,3 +10,4 @@
"Cancel upload" => "Annuler l'envoi",
"No preview available for" => "Pas d'aperçu disponible pour"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php
index c90f5b0760e..66b1f0e5ffc 100644
--- a/apps/files_sharing/l10n/gl.php
+++ b/apps/files_sharing/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "O contrasinal é incorrecto. Ténteo de novo.",
"Password" => "Contrasinal",
"Submit" => "Enviar",
@@ -15,3 +16,4 @@
"Cancel upload" => "Cancelar o envío",
"No preview available for" => "Sen vista previa dispoñíbel para"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php
index 41fc314f3c2..f8b304898ce 100644
--- a/apps/files_sharing/l10n/he.php
+++ b/apps/files_sharing/l10n/he.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "סיסמא",
"Submit" => "שליחה",
"%s shared the folder %s with you" => "%s שיתף עמך את התיקייה %s",
@@ -8,3 +9,4 @@
"Cancel upload" => "ביטול ההעלאה",
"No preview available for" => "אין תצוגה מקדימה זמינה עבור"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hi.php b/apps/files_sharing/l10n/hi.php
index 560df54fc94..74a2c320438 100644
--- a/apps/files_sharing/l10n/hi.php
+++ b/apps/files_sharing/l10n/hi.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "पासवर्ड"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hr.php b/apps/files_sharing/l10n/hr.php
index d5763a8ddb8..87eb9567067 100644
--- a/apps/files_sharing/l10n/hr.php
+++ b/apps/files_sharing/l10n/hr.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Lozinka",
"Submit" => "Pošalji",
"Download" => "Preuzimanje",
"Upload" => "Učitaj",
"Cancel upload" => "Prekini upload"
);
+$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;";
diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php
index 15ff6ff3c2b..7ef69b1e0b6 100644
--- a/apps/files_sharing/l10n/hu_HU.php
+++ b/apps/files_sharing/l10n/hu_HU.php
@@ -1,7 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "A megadott jelszó nem megfelelő. Próbálja újra!",
"Password" => "Jelszó",
"Submit" => "Elküld",
+"Sorry, this link doesn’t seem to work anymore." => "Sajnos úgy tűnik, ez a link már nem működik.",
+"Reasons might be:" => "Ennek az oka a következő lehet:",
+"the item was removed" => "az állományt időközben eltávolították",
+"the link expired" => "lejárt a link érvényességi ideje",
+"sharing is disabled" => "letiltásra került a megosztás",
+"For more info, please ask the person who sent this link." => "További információért forduljon ahhoz, aki ezt a linket küldte Önnek!",
"%s shared the folder %s with you" => "%s megosztotta Önnel ezt a mappát: %s",
"%s shared the file %s with you" => "%s megosztotta Önnel ezt az állományt: %s",
"Download" => "Letöltés",
@@ -9,3 +16,4 @@
"Cancel upload" => "A feltöltés megszakítása",
"No preview available for" => "Nem áll rendelkezésre előnézet ehhez: "
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hy.php b/apps/files_sharing/l10n/hy.php
index 438e8a7433c..d4cb416f45a 100644
--- a/apps/files_sharing/l10n/hy.php
+++ b/apps/files_sharing/l10n/hy.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Submit" => "Հաստատել",
"Download" => "Բեռնել"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ia.php b/apps/files_sharing/l10n/ia.php
index 01acba5108a..5112501073d 100644
--- a/apps/files_sharing/l10n/ia.php
+++ b/apps/files_sharing/l10n/ia.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Contrasigno",
"Submit" => "Submitter",
"Download" => "Discargar",
"Upload" => "Incargar"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/id.php b/apps/files_sharing/l10n/id.php
index cc6e591834c..a4d73bd2b75 100644
--- a/apps/files_sharing/l10n/id.php
+++ b/apps/files_sharing/l10n/id.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Sandi",
"Submit" => "Kirim",
"%s shared the folder %s with you" => "%s membagikan folder %s dengan Anda",
@@ -8,3 +9,4 @@
"Cancel upload" => "Batal pengunggahan",
"No preview available for" => "Tidak ada pratinjau tersedia untuk"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/is.php b/apps/files_sharing/l10n/is.php
index 222459f7a00..05241d3f9e6 100644
--- a/apps/files_sharing/l10n/is.php
+++ b/apps/files_sharing/l10n/is.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Lykilorð",
"Submit" => "Senda",
"%s shared the folder %s with you" => "%s deildi möppunni %s með þér",
@@ -8,3 +9,4 @@
"Cancel upload" => "Hætta við innsendingu",
"No preview available for" => "Yfirlit ekki í boði fyrir"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index 5bd18795715..a611e0641c8 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "La password è errata. Prova ancora.",
"Password" => "Password",
"Submit" => "Invia",
@@ -15,3 +16,4 @@
"Cancel upload" => "Annulla il caricamento",
"No preview available for" => "Nessuna anteprima disponibile per"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index d2bc2d11245..4f7d5b31c2f 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -1,7 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "パスワードが間違っています。再試行してください。",
"Password" => "パスワード",
"Submit" => "送信",
+"Sorry, this link doesn’t seem to work anymore." => "申し訳ございません。このリンクはもう利用できません。",
+"Reasons might be:" => "理由は以下の通りと考えられます:",
+"the item was removed" => "アイテムが削除されました",
+"the link expired" => "リンクの期限が切れています",
+"sharing is disabled" => "共有が無効になっています",
+"For more info, please ask the person who sent this link." => "不明な点は、こちらのリンクの提供者に確認をお願いします。",
"%s shared the folder %s with you" => "%s はフォルダー %s をあなたと共有中です",
"%s shared the file %s with you" => "%s はファイル %s をあなたと共有中です",
"Download" => "ダウンロード",
@@ -9,3 +16,4 @@
"Cancel upload" => "アップロードをキャンセル",
"No preview available for" => "プレビューはありません"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ka.php b/apps/files_sharing/l10n/ka.php
index 0270d5d6f8c..a9b046e03b6 100644
--- a/apps/files_sharing/l10n/ka.php
+++ b/apps/files_sharing/l10n/ka.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "პაროლი",
"Download" => "გადმოწერა"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ka_GE.php b/apps/files_sharing/l10n/ka_GE.php
index c88cc59cf8d..a5a80b3c5a1 100644
--- a/apps/files_sharing/l10n/ka_GE.php
+++ b/apps/files_sharing/l10n/ka_GE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "პაროლი",
"Submit" => "გაგზავნა",
"%s shared the folder %s with you" => "%s–მა გაგიზიარათ ფოლდერი %s",
@@ -8,3 +9,4 @@
"Cancel upload" => "ატვირთვის გაუქმება",
"No preview available for" => "წინასწარი დათვალიერება შეუძლებელია"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ko.php b/apps/files_sharing/l10n/ko.php
index d2cf52447f1..f3a94a70979 100644
--- a/apps/files_sharing/l10n/ko.php
+++ b/apps/files_sharing/l10n/ko.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "암호",
"Submit" => "제출",
"%s shared the folder %s with you" => "%s 님이 폴더 %s을(를) 공유하였습니다",
@@ -8,3 +9,4 @@
"Cancel upload" => "업로드 취소",
"No preview available for" => "다음 항목을 미리 볼 수 없음:"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ku_IQ.php b/apps/files_sharing/l10n/ku_IQ.php
index 576671aaa75..55576a19c36 100644
--- a/apps/files_sharing/l10n/ku_IQ.php
+++ b/apps/files_sharing/l10n/ku_IQ.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "وشەی تێپەربو",
"Submit" => "ناردن",
"%s shared the folder %s with you" => "%s دابه‌شی کردووه‌ بوخچه‌ی %s له‌گه‌ڵ تۆ",
@@ -7,3 +8,4 @@
"Upload" => "بارکردن",
"No preview available for" => "هیچ پێشبینیه‌ك ئاماده‌ نیه بۆ"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php
index a604affee64..d37a1d9d22a 100644
--- a/apps/files_sharing/l10n/lb.php
+++ b/apps/files_sharing/l10n/lb.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Den Passwuert ass incorrect. Probeier ed nach eng keier.",
"Password" => "Passwuert",
"Submit" => "Fortschécken",
@@ -9,3 +10,4 @@
"Cancel upload" => "Upload ofbriechen",
"No preview available for" => "Keeng Preview do fir"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
index 0f9347377c9..5d0e58e2fb2 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Slaptažodis",
"Submit" => "Išsaugoti",
"%s shared the folder %s with you" => "%s pasidalino su jumis %s aplanku",
@@ -8,3 +9,4 @@
"Cancel upload" => "Atšaukti siuntimą",
"No preview available for" => "Peržiūra nėra galima"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/lv.php b/apps/files_sharing/l10n/lv.php
index be021b8e7a0..0eb04fb966f 100644
--- a/apps/files_sharing/l10n/lv.php
+++ b/apps/files_sharing/l10n/lv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Parole",
"Submit" => "Iesniegt",
"%s shared the folder %s with you" => "%s ar jums dalījās ar mapi %s",
@@ -8,3 +9,4 @@
"Cancel upload" => "Atcelt augšupielādi",
"No preview available for" => "Nav pieejams priekšskatījums priekš"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/mk.php b/apps/files_sharing/l10n/mk.php
index ed04035ea5d..c913b2beaf7 100644
--- a/apps/files_sharing/l10n/mk.php
+++ b/apps/files_sharing/l10n/mk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Лозинка",
"Submit" => "Прати",
"%s shared the folder %s with you" => "%s ја сподели папката %s со Вас",
@@ -8,3 +9,4 @@
"Cancel upload" => "Откажи прикачување",
"No preview available for" => "Нема достапно преглед за"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_sharing/l10n/ms_MY.php b/apps/files_sharing/l10n/ms_MY.php
index 0a6a05b7781..0a3d08bbc17 100644
--- a/apps/files_sharing/l10n/ms_MY.php
+++ b/apps/files_sharing/l10n/ms_MY.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Kata laluan",
"Submit" => "Hantar",
"Download" => "Muat turun",
"Upload" => "Muat naik",
"Cancel upload" => "Batal muat naik"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/my_MM.php b/apps/files_sharing/l10n/my_MM.php
index 4b37ab8b48a..f44010004cd 100644
--- a/apps/files_sharing/l10n/my_MM.php
+++ b/apps/files_sharing/l10n/my_MM.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "စကားဝှက်",
"Submit" => "ထည့်သွင်းမည်",
"Download" => "ဒေါင်းလုတ်"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php
index 65eadd3ccae..dd8a8edf313 100644
--- a/apps/files_sharing/l10n/nb_NO.php
+++ b/apps/files_sharing/l10n/nb_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Passordet er feil. Prøv på nytt.",
"Password" => "Passord",
"Submit" => "Send inn",
@@ -9,3 +10,4 @@
"Cancel upload" => "Avbryt opplasting",
"No preview available for" => "Forhåndsvisning ikke tilgjengelig for"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php
index 90f2f2290ff..9c46a1ab4b3 100644
--- a/apps/files_sharing/l10n/nl.php
+++ b/apps/files_sharing/l10n/nl.php
@@ -1,7 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Wachtwoord ongeldig. Probeer het nogmaals.",
"Password" => "Wachtwoord",
"Submit" => "Verzenden",
+"Sorry, this link doesn’t seem to work anymore." => "Sorry, deze link lijkt niet meer in gebruik te zijn.",
+"Reasons might be:" => "Redenen kunnen zijn:",
+"the item was removed" => "bestand was verwijderd",
+"the link expired" => "de link is verlopen",
+"sharing is disabled" => "delen is uitgeschakeld",
+"For more info, please ask the person who sent this link." => "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd.",
"%s shared the folder %s with you" => "%s deelt de map %s met u",
"%s shared the file %s with you" => "%s deelt het bestand %s met u",
"Download" => "Downloaden",
@@ -9,3 +16,4 @@
"Cancel upload" => "Upload afbreken",
"No preview available for" => "Geen voorbeeldweergave beschikbaar voor"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
index afa3eabe8cf..bcb6538b09f 100644
--- a/apps/files_sharing/l10n/nn_NO.php
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Passord",
"Submit" => "Send",
"%s shared the folder %s with you" => "%s delte mappa %s med deg",
@@ -8,3 +9,4 @@
"Cancel upload" => "Avbryt opplasting",
"No preview available for" => "Inga førehandsvising tilgjengeleg for"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/oc.php b/apps/files_sharing/l10n/oc.php
index 4ec48b151a8..493ddb4dfd3 100644
--- a/apps/files_sharing/l10n/oc.php
+++ b/apps/files_sharing/l10n/oc.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Senhal",
"Submit" => "Sosmetre",
"Download" => "Avalcarga",
"Upload" => "Amontcarga",
"Cancel upload" => " Anulla l'amontcargar"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
index 3f72403116a..43c7e2e3144 100644
--- a/apps/files_sharing/l10n/pl.php
+++ b/apps/files_sharing/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "To hasło jest niewłaściwe. Spróbuj ponownie.",
"Password" => "Hasło",
"Submit" => "Wyślij",
@@ -15,3 +16,4 @@
"Cancel upload" => "Anuluj wysyłanie",
"No preview available for" => "Podgląd nie jest dostępny dla"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
index ffd068f4fc5..9fc1cacf7cb 100644
--- a/apps/files_sharing/l10n/pt_BR.php
+++ b/apps/files_sharing/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Senha incorreta. Tente novamente.",
"Password" => "Senha",
"Submit" => "Submeter",
@@ -15,3 +16,4 @@
"Cancel upload" => "Cancelar upload",
"No preview available for" => "Nenhuma visualização disponível para"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index 8b02e736062..73dc2a3e1f3 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -1,7 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Password errada, por favor tente de novo",
"Password" => "Password",
"Submit" => "Submeter",
+"Sorry, this link doesn’t seem to work anymore." => "Desculpe, mas este link parece não estar a funcionar.",
+"Reasons might be:" => "As razões poderão ser:",
+"the item was removed" => "O item foi removido",
+"the link expired" => "O link expirou",
+"sharing is disabled" => "A partilha está desativada",
+"For more info, please ask the person who sent this link." => "Para mais informações, por favor questione a pessoa que lhe enviou este link",
"%s shared the folder %s with you" => "%s partilhou a pasta %s consigo",
"%s shared the file %s with you" => "%s partilhou o ficheiro %s consigo",
"Download" => "Transferir",
@@ -9,3 +16,4 @@
"Cancel upload" => "Cancelar envio",
"No preview available for" => "Não há pré-visualização para"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ro.php b/apps/files_sharing/l10n/ro.php
index 3197068cdd1..d17152ff1b1 100644
--- a/apps/files_sharing/l10n/ro.php
+++ b/apps/files_sharing/l10n/ro.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Parola este incorectă. Încercaţi din nou.",
"Password" => "Parolă",
"Submit" => "Trimite",
@@ -9,3 +10,4 @@
"Cancel upload" => "Anulează încărcarea",
"No preview available for" => "Nici o previzualizare disponibilă pentru "
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
index 601518e705d..f42f1d9aeb6 100644
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Неверный пароль. Попробуйте еще раз.",
"Password" => "Пароль",
"Submit" => "Отправить",
@@ -15,3 +16,4 @@
"Cancel upload" => "Отмена загрузки",
"No preview available for" => "Предпросмотр недоступен для"
);
+$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);";
diff --git a/apps/files_sharing/l10n/ru_RU.php b/apps/files_sharing/l10n/ru_RU.php
deleted file mode 100644
index 2cadd163462..00000000000
--- a/apps/files_sharing/l10n/ru_RU.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Download" => "Загрузка"
-);
diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php
index 27b9d649a0a..6135f092139 100644
--- a/apps/files_sharing/l10n/si_LK.php
+++ b/apps/files_sharing/l10n/si_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "මුර පදය",
"Submit" => "යොමු කරන්න",
"%s shared the folder %s with you" => "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය",
@@ -8,3 +9,4 @@
"Cancel upload" => "උඩුගත කිරීම අත් හරින්න",
"No preview available for" => "පූර්වදර්ශනයක් නොමැත"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php
index 77173b44345..31ecb28b602 100644
--- a/apps/files_sharing/l10n/sk_SK.php
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -1,6 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "Heslo je chybné. Skúste to znova.",
"Password" => "Heslo",
"Submit" => "Odoslať",
+"Sorry, this link doesn’t seem to work anymore." => "To je nepríjemné, ale tento odkaz už nie je funkčný.",
+"Reasons might be:" => "Možné dôvody:",
+"the item was removed" => "položka bola presunutá",
+"the link expired" => "linke vypršala platnosť",
+"sharing is disabled" => "zdieľanie je zakázané",
+"For more info, please ask the person who sent this link." => "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz.",
"%s shared the folder %s with you" => "%s zdieľa s vami priečinok %s",
"%s shared the file %s with you" => "%s zdieľa s vami súbor %s",
"Download" => "Sťahovanie",
@@ -8,3 +16,4 @@
"Cancel upload" => "Zrušiť odosielanie",
"No preview available for" => "Žiaden náhľad k dispozícii pre"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index 39d2fca81cb..cbd4f5fea22 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Geslo",
"Submit" => "Pošlji",
"%s shared the folder %s with you" => "Oseba %s je določila mapo %s za souporabo",
@@ -8,3 +9,4 @@
"Cancel upload" => "Prekliči pošiljanje",
"No preview available for" => "Predogled ni na voljo za"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_sharing/l10n/sq.php b/apps/files_sharing/l10n/sq.php
index 1c0e0aa2bd1..ae29e5738ff 100644
--- a/apps/files_sharing/l10n/sq.php
+++ b/apps/files_sharing/l10n/sq.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Kodi",
"Submit" => "Parashtro",
"%s shared the folder %s with you" => "%s ndau me ju dosjen %s",
@@ -8,3 +9,4 @@
"Cancel upload" => "Anulo ngarkimin",
"No preview available for" => "Shikimi paraprak nuk është i mundur për"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index f893ec0ab42..3b97d15419a 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Лозинка",
"Submit" => "Пошаљи",
"Download" => "Преузми",
"Upload" => "Отпреми",
"Cancel upload" => "Прекини отпремање"
);
+$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);";
diff --git a/apps/files_sharing/l10n/sr@latin.php b/apps/files_sharing/l10n/sr@latin.php
index c45f711e15f..1a6be625761 100644
--- a/apps/files_sharing/l10n/sr@latin.php
+++ b/apps/files_sharing/l10n/sr@latin.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Lozinka",
"Submit" => "Pošalji",
"Download" => "Preuzmi",
"Upload" => "Pošalji"
);
+$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);";
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index 434a81ac28a..b8a5f8629a6 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"The password is wrong. Try again." => "Lösenordet är fel. Försök igen.",
"Password" => "Lösenord",
"Submit" => "Skicka",
@@ -15,3 +16,4 @@
"Cancel upload" => "Avbryt uppladdning",
"No preview available for" => "Ingen förhandsgranskning tillgänglig för"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ta_LK.php b/apps/files_sharing/l10n/ta_LK.php
index 6e69855be11..b4eb0fb7fb8 100644
--- a/apps/files_sharing/l10n/ta_LK.php
+++ b/apps/files_sharing/l10n/ta_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "கடவுச்சொல்",
"Submit" => "சமர்ப்பிக்குக",
"%s shared the folder %s with you" => "%s கோப்புறையானது %s உடன் பகிரப்பட்டது",
@@ -8,3 +9,4 @@
"Cancel upload" => "பதிவேற்றலை இரத்து செய்க",
"No preview available for" => "அதற்கு முன்னோக்கு ஒன்றும் இல்லை"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/te.php b/apps/files_sharing/l10n/te.php
index 1e2eedc6844..94ca7650e5f 100644
--- a/apps/files_sharing/l10n/te.php
+++ b/apps/files_sharing/l10n/te.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "సంకేతపదం"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
index 608c86d586a..060bd8bed94 100644
--- a/apps/files_sharing/l10n/th_TH.php
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "รหัสผ่าน",
"Submit" => "ส่ง",
"%s shared the folder %s with you" => "%s ได้แชร์โฟลเดอร์ %s ให้กับคุณ",
@@ -8,3 +9,4 @@
"Cancel upload" => "ยกเลิกการอัพโหลด",
"No preview available for" => "ไม่สามารถดูตัวอย่างได้สำหรับ"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php
index 4da9c17c7e8..a5bcff82cf3 100644
--- a/apps/files_sharing/l10n/tr.php
+++ b/apps/files_sharing/l10n/tr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Parola",
"Submit" => "Gönder",
"%s shared the folder %s with you" => "%s sizinle paylaşılan %s klasör",
@@ -8,3 +9,4 @@
"Cancel upload" => "Yüklemeyi iptal et",
"No preview available for" => "Kullanılabilir önizleme yok"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/ug.php b/apps/files_sharing/l10n/ug.php
index 9f9c7beb410..43ee9f77bcd 100644
--- a/apps/files_sharing/l10n/ug.php
+++ b/apps/files_sharing/l10n/ug.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "ئىم",
"Submit" => "تاپشۇر",
"Download" => "چۈشۈر",
"Upload" => "يۈكلە",
"Cancel upload" => "يۈكلەشتىن ۋاز كەچ"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
index 8ef7f1bd8ad..b6a7784c690 100644
--- a/apps/files_sharing/l10n/uk.php
+++ b/apps/files_sharing/l10n/uk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Пароль",
"Submit" => "Передати",
"%s shared the folder %s with you" => "%s опублікував каталог %s для Вас",
@@ -8,3 +9,4 @@
"Cancel upload" => "Перервати завантаження",
"No preview available for" => "Попередній перегляд недоступний для"
);
+$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);";
diff --git a/apps/files_sharing/l10n/ur_PK.php b/apps/files_sharing/l10n/ur_PK.php
index 745f2f930d1..4f6767c26a1 100644
--- a/apps/files_sharing/l10n/ur_PK.php
+++ b/apps/files_sharing/l10n/ur_PK.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "پاسورڈ"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/vi.php b/apps/files_sharing/l10n/vi.php
index d75fb1dc53f..00e8e094c36 100644
--- a/apps/files_sharing/l10n/vi.php
+++ b/apps/files_sharing/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Mật khẩu",
"Submit" => "Xác nhận",
"%s shared the folder %s with you" => "%s đã chia sẻ thư mục %s với bạn",
@@ -8,3 +9,4 @@
"Cancel upload" => "Hủy upload",
"No preview available for" => "Không có xem trước cho"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_CN.GB2312.php b/apps/files_sharing/l10n/zh_CN.GB2312.php
index 2dd79ec38d4..5c426672c88 100644
--- a/apps/files_sharing/l10n/zh_CN.GB2312.php
+++ b/apps/files_sharing/l10n/zh_CN.GB2312.php
@@ -1,6 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "密码错误。请重试。",
"Password" => "密码",
"Submit" => "提交",
+"Sorry, this link doesn’t seem to work anymore." => "对不起,这个链接看起来是错误的。",
+"Reasons might be:" => "原因可能是:",
+"the item was removed" => "项目已经移除",
+"the link expired" => "链接已过期",
+"sharing is disabled" => "分享已经被禁用",
+"For more info, please ask the person who sent this link." => "欲了解更多信息,请联系将此链接发送给你的人。",
"%s shared the folder %s with you" => "%s 与您分享了文件夹 %s",
"%s shared the file %s with you" => "%s 与您分享了文件 %s",
"Download" => "下载",
@@ -8,3 +16,4 @@
"Cancel upload" => "取消上传",
"No preview available for" => "没有预览可用于"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php
index c7fa08b81f0..f541d6c155a 100644
--- a/apps/files_sharing/l10n/zh_CN.php
+++ b/apps/files_sharing/l10n/zh_CN.php
@@ -1,6 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"The password is wrong. Try again." => "用户名或密码错误!请重试",
"Password" => "密码",
"Submit" => "提交",
+"Sorry, this link doesn’t seem to work anymore." => "抱歉,此链接已失效",
+"Reasons might be:" => "可能原因是:",
+"the item was removed" => "此项已移除",
+"the link expired" => "链接过期",
+"sharing is disabled" => "共享已禁用",
+"For more info, please ask the person who sent this link." => "欲知详情,请联系发给你链接的人。",
"%s shared the folder %s with you" => "%s与您共享了%s文件夹",
"%s shared the file %s with you" => "%s与您共享了%s文件",
"Download" => "下载",
@@ -8,3 +16,4 @@
"Cancel upload" => "取消上传",
"No preview available for" => "没有预览"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_HK.php b/apps/files_sharing/l10n/zh_HK.php
index 8f9b7900c2c..434420264ea 100644
--- a/apps/files_sharing/l10n/zh_HK.php
+++ b/apps/files_sharing/l10n/zh_HK.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "密碼",
"Download" => "下載",
"Upload" => "上傳"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index b172879469f..b950cbf8c9e 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "密碼",
"Submit" => "送出",
"%s shared the folder %s with you" => "%s 和您分享了資料夾 %s ",
@@ -8,3 +9,4 @@
"Cancel upload" => "取消上傳",
"No preview available for" => "無法預覽"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 2160fe9a393..33cd1428899 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -288,4 +288,4 @@ class Shared_Cache extends Cache {
return false;
}
-} \ No newline at end of file
+}
diff --git a/apps/files_sharing/lib/permissions.php b/apps/files_sharing/lib/permissions.php
index b6638564cd8..e2978e12bfb 100644
--- a/apps/files_sharing/lib/permissions.php
+++ b/apps/files_sharing/lib/permissions.php
@@ -106,4 +106,4 @@ class Shared_Permissions extends Permissions {
// Not a valid action for Shared Permissions
}
-} \ No newline at end of file
+}
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 5c23a9eb0d0..7384b094cb0 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -391,7 +391,7 @@ class Shared extends \OC\Files\Storage\Common {
public function free_space($path) {
if ($path == '') {
- return \OC\Files\FREE_SPACE_UNKNOWN;
+ return \OC\Files\SPACE_UNKNOWN;
}
$source = $this->getSourcePath($path);
if ($source) {
diff --git a/apps/files_sharing/lib/watcher.php b/apps/files_sharing/lib/watcher.php
index e67d1ee9086..6fdfc1db36d 100644
--- a/apps/files_sharing/lib/watcher.php
+++ b/apps/files_sharing/lib/watcher.php
@@ -48,4 +48,4 @@ class Shared_Watcher extends Watcher {
}
}
-} \ No newline at end of file
+}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 741ab145384..e9fdf6e4c95 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -112,9 +112,9 @@ if (isset($path)) {
if ($files_list === NULL ) {
$files_list = array($files);
}
- OC_Files::get($path, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+ OC_Files::get($path, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD');
} else {
- OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+ OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD');
}
exit();
} else {
@@ -133,7 +133,7 @@ if (isset($path)) {
$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
$tmpl->assign('fileTarget', basename($linkItem['file_target']));
$tmpl->assign('dirToken', $linkItem['token']);
- $allowPublicUploadEnabled = (($linkItem['permissions'] & OCP\PERMISSION_CREATE) ? true : false );
+ $allowPublicUploadEnabled = (bool) ($linkItem['permissions'] & OCP\PERMISSION_CREATE);
if (\OCP\App::isEnabled('files_encryption')) {
$allowPublicUploadEnabled = false;
}
diff --git a/apps/files_sharing/templates/part.404.php b/apps/files_sharing/templates/part.404.php
index b5152e1511a..3ef117d7524 100644
--- a/apps/files_sharing/templates/part.404.php
+++ b/apps/files_sharing/templates/part.404.php
@@ -9,4 +9,4 @@
</ul>
<p><?php p($l->t('For more info, please ask the person who sent this link.')); ?></p>
</li>
-</ul> \ No newline at end of file
+</ul>
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index 3b1e0ac30cc..2c101f0a723 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -4,4 +4,4 @@ OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
// register hooks
-\OCA\Files_Trashbin\Trashbin::registerHooks(); \ No newline at end of file
+\OCA\Files_Trashbin\Trashbin::registerHooks();
diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php
index f4dad7b26bf..0ca232668d7 100644
--- a/apps/files_trashbin/appinfo/update.php
+++ b/apps/files_trashbin/appinfo/update.php
@@ -7,4 +7,4 @@ if (version_compare($installedVersion, '0.4', '<')) {
//enforce a recalculation during next usage.
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trashsize`');
$result = $query->execute();
-} \ No newline at end of file
+}
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 2dbaefe7a78..27f8407db06 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -23,7 +23,7 @@ if ($dir) {
$dirlisting = true;
$dirContent = $view->opendir($dir);
$i = 0;
- while($entryName = readdir($dirContent)) {
+ while(($entryName = readdir($dirContent)) !== false) {
if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) {
$pos = strpos($dir.'/', '/', 1);
$tmp = substr($dir, 0, $pos);
diff --git a/apps/files_trashbin/js/disableDefaultActions.js b/apps/files_trashbin/js/disableDefaultActions.js
index df08bfb1a50..afa80cacd6b 100644
--- a/apps/files_trashbin/js/disableDefaultActions.js
+++ b/apps/files_trashbin/js/disableDefaultActions.js
@@ -1,4 +1,4 @@
/* disable download and sharing actions */
var disableDownloadActions = true;
var disableSharing = true;
-var trashBinApp = true; \ No newline at end of file
+var trashBinApp = true;
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index c3c958b07a7..b14a7240cbe 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -188,21 +188,13 @@ function processSelection(){
$('.selectedActions').show();
var selection='';
if(selectedFolders.length>0){
- if(selectedFolders.length === 1){
- selection+=t('files','1 folder');
- }else{
- selection+=t('files','{count} folders',{count: selectedFolders.length});
- }
+ selection += n('files', '%n folder', '%n folders', selectedFolders.length);
if(selectedFiles.length>0){
selection+=' & ';
}
}
if(selectedFiles.length>0){
- if(selectedFiles.length === 1){
- selection+=t('files','1 file');
- }else{
- selection+=t('files','{count} files',{count: selectedFiles.length});
- }
+ selection += n('files', '%n file', '%n files', selectedFiles.length);
}
$('#headerName>span.name').text(selection);
$('#modified').text('');
diff --git a/apps/files_trashbin/l10n/ar.php b/apps/files_trashbin/l10n/ar.php
index f36133db547..710a9d14196 100644
--- a/apps/files_trashbin/l10n/ar.php
+++ b/apps/files_trashbin/l10n/ar.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "تعذّر حذف%s بشكل دائم",
"Couldn't restore %s" => "تعذّر استرجاع %s ",
"perform restore operation" => "إبدء عملية الإستعادة",
@@ -7,12 +8,11 @@
"Delete permanently" => "حذف بشكل دائم",
"Name" => "اسم",
"Deleted" => "تم الحذف",
-"1 folder" => "مجلد عدد 1",
-"{count} folders" => "{count} مجلدات",
-"1 file" => "ملف واحد",
-"{count} files" => "{count} ملفات",
+"_%n folder_::_%n folders_" => array("","","","","",""),
+"_%n file_::_%n files_" => array("","","","","",""),
"Nothing in here. Your trash bin is empty!" => "لا يوجد شيء هنا. سلة المهملات خاليه.",
"Restore" => "استعيد",
"Delete" => "إلغاء",
"Deleted Files" => "الملفات المحذوفه"
);
+$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;";
diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php
index 1e0953b013a..3c12e6906ed 100644
--- a/apps/files_trashbin/l10n/bg_BG.php
+++ b/apps/files_trashbin/l10n/bg_BG.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Невъзможно перманентното изтриване на %s",
"Couldn't restore %s" => "Невъзможно възтановяване на %s",
"perform restore operation" => "извършване на действие по възстановяване",
@@ -7,12 +8,11 @@
"Delete permanently" => "Изтриване завинаги",
"Name" => "Име",
"Deleted" => "Изтрито",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папки",
-"1 file" => "1 файл",
-"{count} files" => "{count} файла",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "Няма нищо. Кофата е празна!",
"Restore" => "Възтановяване",
"Delete" => "Изтриване",
"Deleted Files" => "Изтрити файлове"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/bn_BD.php b/apps/files_trashbin/l10n/bn_BD.php
index 75b071bfa74..c3741dbd1db 100644
--- a/apps/files_trashbin/l10n/bn_BD.php
+++ b/apps/files_trashbin/l10n/bn_BD.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "সমস্যা",
"Name" => "রাম",
-"1 folder" => "১টি ফোল্ডার",
-"{count} folders" => "{count} টি ফোল্ডার",
-"1 file" => "১টি ফাইল",
-"{count} files" => "{count} টি ফাইল",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "মুছে"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php
index 2f15068cb50..eb57aa16aa5 100644
--- a/apps/files_trashbin/l10n/ca.php
+++ b/apps/files_trashbin/l10n/ca.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "No s'ha pogut esborrar permanentment %s",
"Couldn't restore %s" => "No s'ha pogut restaurar %s",
"perform restore operation" => "executa l'operació de restauració",
@@ -7,13 +8,12 @@
"Delete permanently" => "Esborra permanentment",
"Name" => "Nom",
"Deleted" => "Eliminat",
-"1 folder" => "1 carpeta",
-"{count} folders" => "{count} carpetes",
-"1 file" => "1 fitxer",
-"{count} files" => "{count} fitxers",
+"_%n folder_::_%n folders_" => array("","%n carpetes"),
+"_%n file_::_%n files_" => array("","%n fitxers"),
"restored" => "restaurat",
"Nothing in here. Your trash bin is empty!" => "La paperera està buida!",
"Restore" => "Recupera",
"Delete" => "Esborra",
"Deleted Files" => "Fitxers eliminats"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php
index 6429c90cf5f..f0bebee742f 100644
--- a/apps/files_trashbin/l10n/cs_CZ.php
+++ b/apps/files_trashbin/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Nelze trvale odstranit %s",
"Couldn't restore %s" => "Nelze obnovit %s",
"perform restore operation" => "provést obnovu",
@@ -7,13 +8,12 @@
"Delete permanently" => "Trvale odstranit",
"Name" => "Název",
"Deleted" => "Smazáno",
-"1 folder" => "1 složka",
-"{count} folders" => "{count} složky",
-"1 file" => "1 soubor",
-"{count} files" => "{count} soubory",
+"_%n folder_::_%n folders_" => array("%n adresář","%n adresáře","%n adresářů"),
+"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
"restored" => "obnoveno",
"Nothing in here. Your trash bin is empty!" => "Žádný obsah. Váš koš je prázdný.",
"Restore" => "Obnovit",
"Delete" => "Smazat",
"Deleted Files" => "Smazané soubory"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_trashbin/l10n/cy_GB.php b/apps/files_trashbin/l10n/cy_GB.php
index 055e8d8654d..123a445c2c1 100644
--- a/apps/files_trashbin/l10n/cy_GB.php
+++ b/apps/files_trashbin/l10n/cy_GB.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Methwyd dileu %s yn barhaol",
"Couldn't restore %s" => "Methwyd adfer %s",
"perform restore operation" => "gweithrediad adfer",
@@ -7,12 +8,11 @@
"Delete permanently" => "Dileu'n barhaol",
"Name" => "Enw",
"Deleted" => "Wedi dileu",
-"1 folder" => "1 blygell",
-"{count} folders" => "{count} plygell",
-"1 file" => "1 ffeil",
-"{count} files" => "{count} ffeil",
+"_%n folder_::_%n folders_" => array("","","",""),
+"_%n file_::_%n files_" => array("","","",""),
"Nothing in here. Your trash bin is empty!" => "Does dim byd yma. Mae eich bin sbwriel yn wag!",
"Restore" => "Adfer",
"Delete" => "Dileu",
"Deleted Files" => "Ffeiliau Ddilewyd"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_trashbin/l10n/da.php b/apps/files_trashbin/l10n/da.php
index ff114a10e7e..2fbc0893878 100644
--- a/apps/files_trashbin/l10n/da.php
+++ b/apps/files_trashbin/l10n/da.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Kunne ikke slette %s permanent",
"Couldn't restore %s" => "Kunne ikke gendanne %s",
"perform restore operation" => "udfør gendannelsesoperation",
@@ -7,13 +8,12 @@
"Delete permanently" => "Slet permanent",
"Name" => "Navn",
"Deleted" => "Slettet",
-"1 folder" => "1 mappe",
-"{count} folders" => "{count} mapper",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
"restored" => "Gendannet",
"Nothing in here. Your trash bin is empty!" => "Intet at se her. Din papirkurv er tom!",
"Restore" => "Gendan",
"Delete" => "Slet",
"Deleted Files" => "Slettede filer"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php
index 3c643874723..ad6e0839bd6 100644
--- a/apps/files_trashbin/l10n/de.php
+++ b/apps/files_trashbin/l10n/de.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
"Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
"perform restore operation" => "Wiederherstellung ausführen",
@@ -7,13 +8,12 @@
"Delete permanently" => "Endgültig löschen",
"Name" => "Name",
"Deleted" => "gelöscht",
-"1 folder" => "1 Ordner",
-"{count} folders" => "{count} Ordner",
-"1 file" => "1 Datei",
-"{count} files" => "{count} Dateien",
+"_%n folder_::_%n folders_" => array("","%n Ordner"),
+"_%n file_::_%n files_" => array("","%n Dateien"),
"restored" => "Wiederhergestellt",
"Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, der Papierkorb ist leer!",
"Restore" => "Wiederherstellen",
"Delete" => "Löschen",
"Deleted Files" => "Gelöschte Dateien"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php
index 47dcedd4bf3..0df69412801 100644
--- a/apps/files_trashbin/l10n/de_DE.php
+++ b/apps/files_trashbin/l10n/de_DE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
"Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
"perform restore operation" => "Wiederherstellung ausführen",
@@ -7,13 +8,12 @@
"Delete permanently" => "Endgültig löschen",
"Name" => "Name",
"Deleted" => "Gelöscht",
-"1 folder" => "1 Ordner",
-"{count} folders" => "{count} Ordner",
-"1 file" => "1 Datei",
-"{count} files" => "{count} Dateien",
+"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
+"_%n file_::_%n files_" => array("%n Dateien","%n Dateien"),
"restored" => "Wiederhergestellt",
"Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!",
"Restore" => "Wiederherstellen",
"Delete" => "Löschen",
"Deleted Files" => "Gelöschte Dateien"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php
index ad48038ff62..759e5299e42 100644
--- a/apps/files_trashbin/l10n/el.php
+++ b/apps/files_trashbin/l10n/el.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Αδύνατη η μόνιμη διαγραφή του %s",
"Couldn't restore %s" => "Αδυναμία επαναφοράς %s",
"perform restore operation" => "εκτέλεση λειτουργία επαναφοράς",
@@ -7,13 +8,12 @@
"Delete permanently" => "Μόνιμη διαγραφή",
"Name" => "Όνομα",
"Deleted" => "Διαγράφηκε",
-"1 folder" => "1 φάκελος",
-"{count} folders" => "{count} φάκελοι",
-"1 file" => "1 αρχείο",
-"{count} files" => "{count} αρχεία",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"restored" => "έγινε επαναφορά",
"Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!",
"Restore" => "Επαναφορά",
"Delete" => "Διαγραφή",
"Deleted Files" => "Διαγραμμένα Αρχεία"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php
index 161e9c3e88a..d1e30cba588 100644
--- a/apps/files_trashbin/l10n/eo.php
+++ b/apps/files_trashbin/l10n/eo.php
@@ -1,12 +1,12 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "Eraro",
"Delete permanently" => "Forigi por ĉiam",
"Name" => "Nomo",
-"1 folder" => "1 dosierujo",
-"{count} folders" => "{count} dosierujoj",
-"1 file" => "1 dosiero",
-"{count} files" => "{count} dosierujoj",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Restore" => "Restaŭri",
"Delete" => "Forigi",
"Deleted Files" => "Forigitaj dosieroj"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index d6591713e3b..956d89ae688 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente",
"Couldn't restore %s" => "No se puede restaurar %s",
"perform restore operation" => "restaurar",
@@ -7,13 +8,12 @@
"Delete permanently" => "Eliminar permanentemente",
"Name" => "Nombre",
"Deleted" => "Eliminado",
-"1 folder" => "1 carpeta",
-"{count} folders" => "{count} carpetas",
-"1 file" => "1 archivo",
-"{count} files" => "{count} archivos",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"restored" => "recuperado",
"Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!",
"Restore" => "Recuperar",
"Delete" => "Eliminar",
"Deleted Files" => "Archivos Eliminados"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php
index de7494ca69e..6f47255b506 100644
--- a/apps/files_trashbin/l10n/es_AR.php
+++ b/apps/files_trashbin/l10n/es_AR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "No fue posible borrar %s de manera permanente",
"Couldn't restore %s" => "No se pudo restaurar %s",
"perform restore operation" => "Restaurar",
@@ -7,12 +8,11 @@
"Delete permanently" => "Borrar de manera permanente",
"Name" => "Nombre",
"Deleted" => "Borrado",
-"1 folder" => "1 directorio",
-"{count} folders" => "{count} directorios",
-"1 file" => "1 archivo",
-"{count} files" => "{count} archivos",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "No hay nada acá. ¡La papelera está vacía!",
"Restore" => "Recuperar",
"Delete" => "Borrar",
"Deleted Files" => "Archivos eliminados"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/et_EE.php b/apps/files_trashbin/l10n/et_EE.php
index 3d3b46a1808..43c182ea7b3 100644
--- a/apps/files_trashbin/l10n/et_EE.php
+++ b/apps/files_trashbin/l10n/et_EE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "%s jäädavalt kustutamine ebaõnnestus",
"Couldn't restore %s" => "%s ei saa taastada",
"perform restore operation" => "soorita taastamine",
@@ -7,12 +8,12 @@
"Delete permanently" => "Kustuta jäädavalt",
"Name" => "Nimi",
"Deleted" => "Kustutatud",
-"1 folder" => "1 kaust",
-"{count} folders" => "{count} kausta",
-"1 file" => "1 fail",
-"{count} files" => "{count} faili",
+"_%n folder_::_%n folders_" => array("","%n kataloogi"),
+"_%n file_::_%n files_" => array("%n fail","%n faili"),
+"restored" => "taastatud",
"Nothing in here. Your trash bin is empty!" => "Siin pole midagi. Sinu prügikast on tühi!",
"Restore" => "Taasta",
"Delete" => "Kustuta",
"Deleted Files" => "Kustutatud failid"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/eu.php b/apps/files_trashbin/l10n/eu.php
index 45b77b7990c..b114dc3386a 100644
--- a/apps/files_trashbin/l10n/eu.php
+++ b/apps/files_trashbin/l10n/eu.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Ezin izan da %s betirako ezabatu",
"Couldn't restore %s" => "Ezin izan da %s berreskuratu",
"perform restore operation" => "berreskuratu",
@@ -7,12 +8,11 @@
"Delete permanently" => "Ezabatu betirako",
"Name" => "Izena",
"Deleted" => "Ezabatuta",
-"1 folder" => "karpeta bat",
-"{count} folders" => "{count} karpeta",
-"1 file" => "fitxategi bat",
-"{count} files" => "{count} fitxategi",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "Ez dago ezer ez. Zure zakarrontzia hutsik dago!",
"Restore" => "Berrezarri",
"Delete" => "Ezabatu",
"Deleted Files" => "Ezabatutako Fitxategiak"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/fa.php b/apps/files_trashbin/l10n/fa.php
index 6ecc6feacbf..654f20a5f1c 100644
--- a/apps/files_trashbin/l10n/fa.php
+++ b/apps/files_trashbin/l10n/fa.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "%s را نمی توان برای همیشه حذف کرد",
"Couldn't restore %s" => "%s را نمی توان بازگرداند",
"perform restore operation" => "انجام عمل بازگرداندن",
@@ -7,12 +8,11 @@
"Delete permanently" => "حذف قطعی",
"Name" => "نام",
"Deleted" => "حذف شده",
-"1 folder" => "1 پوشه",
-"{count} folders" => "{ شمار} پوشه ها",
-"1 file" => "1 پرونده",
-"{count} files" => "{ شمار } فایل ها",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "هیچ چیزی اینجا نیست. سطل زباله ی شما خالی است.",
"Restore" => "بازیابی",
"Delete" => "حذف",
"Deleted Files" => "فایلهای حذف شده"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/fi_FI.php b/apps/files_trashbin/l10n/fi_FI.php
index 646a000c0d1..f03950981c0 100644
--- a/apps/files_trashbin/l10n/fi_FI.php
+++ b/apps/files_trashbin/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Kohdetta %s ei voitu poistaa pysyvästi",
"Couldn't restore %s" => "Kohteen %s palautus epäonnistui",
"perform restore operation" => "suorita palautustoiminto",
@@ -7,13 +8,12 @@
"Delete permanently" => "Poista pysyvästi",
"Name" => "Nimi",
"Deleted" => "Poistettu",
-"1 folder" => "1 kansio",
-"{count} folders" => "{count} kansiota",
-"1 file" => "1 tiedosto",
-"{count} files" => "{count} tiedostoa",
+"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
+"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
"restored" => "palautettu",
"Nothing in here. Your trash bin is empty!" => "Tyhjää täynnä! Roskakorissa ei ole mitään.",
"Restore" => "Palauta",
"Delete" => "Poista",
"Deleted Files" => "Poistetut tiedostot"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php
index 8198e3e32a8..8854190e2ce 100644
--- a/apps/files_trashbin/l10n/fr.php
+++ b/apps/files_trashbin/l10n/fr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Impossible d'effacer %s de façon permanente",
"Couldn't restore %s" => "Impossible de restaurer %s",
"perform restore operation" => "effectuer l'opération de restauration",
@@ -7,12 +8,11 @@
"Delete permanently" => "Supprimer de façon définitive",
"Name" => "Nom",
"Deleted" => "Effacé",
-"1 folder" => "1 dossier",
-"{count} folders" => "{count} dossiers",
-"1 file" => "1 fichier",
-"{count} files" => "{count} fichiers",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !",
"Restore" => "Restaurer",
"Delete" => "Supprimer",
"Deleted Files" => "Fichiers effacés"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/gl.php b/apps/files_trashbin/l10n/gl.php
index d22277c28f5..568c17607fe 100644
--- a/apps/files_trashbin/l10n/gl.php
+++ b/apps/files_trashbin/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Non foi posíbel eliminar %s permanente",
"Couldn't restore %s" => "Non foi posíbel restaurar %s",
"perform restore operation" => "realizar a operación de restauración",
@@ -7,13 +8,12 @@
"Delete permanently" => "Eliminar permanentemente",
"Name" => "Nome",
"Deleted" => "Eliminado",
-"1 folder" => "1 cartafol",
-"{count} folders" => "{count} cartafoles",
-"1 file" => "1 ficheiro",
-"{count} files" => "{count} ficheiros",
+"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
+"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
"restored" => "restaurado",
"Nothing in here. Your trash bin is empty!" => "Aquí non hai nada. O cesto do lixo está baleiro!",
"Restore" => "Restablecer",
"Delete" => "Eliminar",
"Deleted Files" => "Ficheiros eliminados"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/he.php b/apps/files_trashbin/l10n/he.php
index 853d4e1925a..6aa6264a315 100644
--- a/apps/files_trashbin/l10n/he.php
+++ b/apps/files_trashbin/l10n/he.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "לא ניתן למחוק את %s לצמיתות",
"Couldn't restore %s" => "לא ניתן לשחזר את %s",
"perform restore operation" => "ביצוע פעולת שחזור",
@@ -7,12 +8,11 @@
"Delete permanently" => "מחיקה לצמיתות",
"Name" => "שם",
"Deleted" => "נמחק",
-"1 folder" => "תיקייה אחת",
-"{count} folders" => "{count} תיקיות",
-"1 file" => "קובץ אחד",
-"{count} files" => "{count} קבצים",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "אין כאן שום דבר. סל המיחזור שלך ריק!",
"Restore" => "שחזור",
"Delete" => "מחיקה",
"Deleted Files" => "קבצים שנמחקו"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/hr.php b/apps/files_trashbin/l10n/hr.php
index a65d876e1f0..d227b4979aa 100644
--- a/apps/files_trashbin/l10n/hr.php
+++ b/apps/files_trashbin/l10n/hr.php
@@ -1,5 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "Greška",
"Name" => "Ime",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Delete" => "Obriši"
);
+$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;";
diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php
index 5e64bc04e03..aac6cf78000 100644
--- a/apps/files_trashbin/l10n/hu_HU.php
+++ b/apps/files_trashbin/l10n/hu_HU.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Nem sikerült %s végleges törlése",
"Couldn't restore %s" => "Nem sikerült %s visszaállítása",
"perform restore operation" => "a visszaállítás végrehajtása",
@@ -7,12 +8,12 @@
"Delete permanently" => "Végleges törlés",
"Name" => "Név",
"Deleted" => "Törölve",
-"1 folder" => "1 mappa",
-"{count} folders" => "{count} mappa",
-"1 file" => "1 fájl",
-"{count} files" => "{count} fájl",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"restored" => "visszaállítva",
"Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ön szemetes mappája üres!",
"Restore" => "Visszaállítás",
"Delete" => "Törlés",
"Deleted Files" => "Törölt fájlok"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/hy.php b/apps/files_trashbin/l10n/hy.php
index 3b80487278a..6ff58b56202 100644
--- a/apps/files_trashbin/l10n/hy.php
+++ b/apps/files_trashbin/l10n/hy.php
@@ -1,3 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "Ջնջել"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ia.php b/apps/files_trashbin/l10n/ia.php
index dea25b30ba4..c583344a81e 100644
--- a/apps/files_trashbin/l10n/ia.php
+++ b/apps/files_trashbin/l10n/ia.php
@@ -1,5 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "Error",
"Name" => "Nomine",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "Deler"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php
index 62a63d515a3..6aad1302f43 100644
--- a/apps/files_trashbin/l10n/id.php
+++ b/apps/files_trashbin/l10n/id.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s",
"Couldn't restore %s" => "Tidak dapat memulihkan %s",
"perform restore operation" => "jalankan operasi pemulihan",
@@ -7,12 +8,11 @@
"Delete permanently" => "Hapus secara permanen",
"Name" => "Nama",
"Deleted" => "Dihapus",
-"1 folder" => "1 folder",
-"{count} folders" => "{count} folder",
-"1 file" => "1 berkas",
-"{count} files" => "{count} berkas",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!",
"Restore" => "Pulihkan",
"Delete" => "Hapus",
"Deleted Files" => "Berkas yang Dihapus"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/is.php b/apps/files_trashbin/l10n/is.php
index 12267c6695a..55ae4336461 100644
--- a/apps/files_trashbin/l10n/is.php
+++ b/apps/files_trashbin/l10n/is.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "Villa",
"Name" => "Nafn",
-"1 folder" => "1 mappa",
-"{count} folders" => "{count} möppur",
-"1 file" => "1 skrá",
-"{count} files" => "{count} skrár",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "Eyða"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php
index 769971bb9c8..0dc2b938f8a 100644
--- a/apps/files_trashbin/l10n/it.php
+++ b/apps/files_trashbin/l10n/it.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Impossibile eliminare %s definitivamente",
"Couldn't restore %s" => "Impossibile ripristinare %s",
"perform restore operation" => "esegui operazione di ripristino",
@@ -7,13 +8,12 @@
"Delete permanently" => "Elimina definitivamente",
"Name" => "Nome",
"Deleted" => "Eliminati",
-"1 folder" => "1 cartella",
-"{count} folders" => "{count} cartelle",
-"1 file" => "1 file",
-"{count} files" => "{count} file",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"restored" => "ripristinati",
"Nothing in here. Your trash bin is empty!" => "Qui non c'è niente. Il tuo cestino è vuoto.",
"Restore" => "Ripristina",
"Delete" => "Elimina",
"Deleted Files" => "File eliminati"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ja_JP.php b/apps/files_trashbin/l10n/ja_JP.php
index db5783bf432..eb9748d57c0 100644
--- a/apps/files_trashbin/l10n/ja_JP.php
+++ b/apps/files_trashbin/l10n/ja_JP.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "%s を完全に削除出来ませんでした",
"Couldn't restore %s" => "%s を復元出来ませんでした",
"perform restore operation" => "復元操作を実行する",
@@ -7,12 +8,12 @@
"Delete permanently" => "完全に削除する",
"Name" => "名前",
"Deleted" => "削除済み",
-"1 folder" => "1 フォルダ",
-"{count} folders" => "{count} フォルダ",
-"1 file" => "1 ファイル",
-"{count} files" => "{count} ファイル",
+"_%n folder_::_%n folders_" => array("%n個のフォルダ"),
+"_%n file_::_%n files_" => array("%n個のファイル"),
+"restored" => "復元済",
"Nothing in here. Your trash bin is empty!" => "ここには何もありません。ゴミ箱は空です!",
"Restore" => "復元",
"Delete" => "削除",
"Deleted Files" => "削除されたファイル"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ka_GE.php b/apps/files_trashbin/l10n/ka_GE.php
index 667eb500eb9..236d8951e9d 100644
--- a/apps/files_trashbin/l10n/ka_GE.php
+++ b/apps/files_trashbin/l10n/ka_GE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "ფაილი %s–ის სრულად წაშლა ვერ მოხერხდა",
"Couldn't restore %s" => "%s–ის აღდგენა ვერ მოხერხდა",
"perform restore operation" => "მიმდინარეობს აღდგენის ოპერაცია",
@@ -7,12 +8,11 @@
"Delete permanently" => "სრულად წაშლა",
"Name" => "სახელი",
"Deleted" => "წაშლილი",
-"1 folder" => "1 საქაღალდე",
-"{count} folders" => "{count} საქაღალდე",
-"1 file" => "1 ფაილი",
-"{count} files" => "{count} ფაილი",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "აქ არაფერი არ არის. სანაგვე ყუთი ცარიელია!",
"Restore" => "აღდგენა",
"Delete" => "წაშლა",
"Deleted Files" => "წაშლილი ფაილები"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php
index 42ad87e98d2..f2e604d7591 100644
--- a/apps/files_trashbin/l10n/ko.php
+++ b/apps/files_trashbin/l10n/ko.php
@@ -1,11 +1,11 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "오류",
"Delete permanently" => "영원히 삭제",
"Name" => "이름",
-"1 folder" => "폴더 1개",
-"{count} folders" => "폴더 {count}개",
-"1 file" => "파일 1개",
-"{count} files" => "파일 {count}개",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Restore" => "복원",
"Delete" => "삭제"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ku_IQ.php b/apps/files_trashbin/l10n/ku_IQ.php
index 67fdd7d08fa..3f110f06002 100644
--- a/apps/files_trashbin/l10n/ku_IQ.php
+++ b/apps/files_trashbin/l10n/ku_IQ.php
@@ -1,4 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "هه‌ڵه",
-"Name" => "ناو"
+"Name" => "ناو",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/lb.php b/apps/files_trashbin/l10n/lb.php
index 2065ee03d32..cbfd515a8b3 100644
--- a/apps/files_trashbin/l10n/lb.php
+++ b/apps/files_trashbin/l10n/lb.php
@@ -1,5 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "Fehler",
"Name" => "Numm",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "Läschen"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php
index 7df63bd7f28..c4a12ff2175 100644
--- a/apps/files_trashbin/l10n/lt_LT.php
+++ b/apps/files_trashbin/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Nepavyko negrįžtamai ištrinti %s",
"Couldn't restore %s" => "Nepavyko atkurti %s",
"perform restore operation" => "atkurti",
@@ -7,12 +8,11 @@
"Delete permanently" => "Ištrinti negrįžtamai",
"Name" => "Pavadinimas",
"Deleted" => "Ištrinti",
-"1 folder" => "1 aplankalas",
-"{count} folders" => "{count} aplankalai",
-"1 file" => "1 failas",
-"{count} files" => "{count} failai",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Nothing in here. Your trash bin is empty!" => "Nieko nėra. Jūsų šiukšliadėžė tuščia!",
"Restore" => "Atstatyti",
"Delete" => "Ištrinti",
"Deleted Files" => "Ištrinti failai"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php
index b1b8c3e6b03..ca833b24208 100644
--- a/apps/files_trashbin/l10n/lv.php
+++ b/apps/files_trashbin/l10n/lv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Nevarēja pilnībā izdzēst %s",
"Couldn't restore %s" => "Nevarēja atjaunot %s",
"perform restore operation" => "veikt atjaunošanu",
@@ -7,12 +8,12 @@
"Delete permanently" => "Dzēst pavisam",
"Name" => "Nosaukums",
"Deleted" => "Dzēsts",
-"1 folder" => "1 mape",
-"{count} folders" => "{count} mapes",
-"1 file" => "1 datne",
-"{count} files" => "{count} datnes",
+"_%n folder_::_%n folders_" => array("Nekas, %n mapes","%n mape","%n mapes"),
+"_%n file_::_%n files_" => array("Neviens! %n faaili","%n fails","%n faili"),
+"restored" => "atjaunots",
"Nothing in here. Your trash bin is empty!" => "Šeit nekā nav. Jūsu miskaste ir tukša!",
"Restore" => "Atjaunot",
"Delete" => "Dzēst",
"Deleted Files" => "Dzēstās datnes"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_trashbin/l10n/mk.php b/apps/files_trashbin/l10n/mk.php
index 175399249e5..965518dbc86 100644
--- a/apps/files_trashbin/l10n/mk.php
+++ b/apps/files_trashbin/l10n/mk.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "Грешка",
"Name" => "Име",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папки",
-"1 file" => "1 датотека",
-"{count} files" => "{count} датотеки",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "Избриши"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_trashbin/l10n/ms_MY.php b/apps/files_trashbin/l10n/ms_MY.php
index 52a997aab15..1b5ca07c70c 100644
--- a/apps/files_trashbin/l10n/ms_MY.php
+++ b/apps/files_trashbin/l10n/ms_MY.php
@@ -1,5 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "Ralat",
"Name" => "Nama",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Delete" => "Padam"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index 43ad0180494..8eb3bc1846f 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Kunne ikke slette %s fullstendig",
"Couldn't restore %s" => "Kunne ikke gjenopprette %s",
"perform restore operation" => "utfør gjenopprettings operasjon",
@@ -7,12 +8,11 @@
"Delete permanently" => "Slett permanent",
"Name" => "Navn",
"Deleted" => "Slettet",
-"1 folder" => "1 mappe",
-"{count} folders" => "{count} mapper",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("","%n mapper"),
+"_%n file_::_%n files_" => array("","%n filer"),
"Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
"Restore" => "Gjenopprett",
"Delete" => "Slett",
"Deleted Files" => "Slettet filer"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php
index a0a55eced85..b3ae57da563 100644
--- a/apps/files_trashbin/l10n/nl.php
+++ b/apps/files_trashbin/l10n/nl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Kon %s niet permanent verwijderen",
"Couldn't restore %s" => "Kon %s niet herstellen",
"perform restore operation" => "uitvoeren restore operatie",
@@ -7,13 +8,12 @@
"Delete permanently" => "Verwijder definitief",
"Name" => "Naam",
"Deleted" => "Verwijderd",
-"1 folder" => "1 map",
-"{count} folders" => "{count} mappen",
-"1 file" => "1 bestand",
-"{count} files" => "{count} bestanden",
+"_%n folder_::_%n folders_" => array("%n map","%n mappen"),
+"_%n file_::_%n files_" => array("%n bestand","%n bestanden"),
"restored" => "hersteld",
"Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!",
"Restore" => "Herstellen",
"Delete" => "Verwijder",
"Deleted Files" => "Verwijderde bestanden"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 454ea2b0575..9e351668e33 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Klarte ikkje sletta %s for godt",
"Couldn't restore %s" => "Klarte ikkje gjenoppretta %s",
"perform restore operation" => "utfør gjenoppretting",
@@ -7,12 +8,11 @@
"Delete permanently" => "Slett for godt",
"Name" => "Namn",
"Deleted" => "Sletta",
-"1 folder" => "1 mappe",
-"{count} folders" => "{count} mapper",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
"Restore" => "Gjenopprett",
"Delete" => "Slett",
"Deleted Files" => "Sletta filer"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/oc.php b/apps/files_trashbin/l10n/oc.php
index fa9e097f6ca..a62902c3b7e 100644
--- a/apps/files_trashbin/l10n/oc.php
+++ b/apps/files_trashbin/l10n/oc.php
@@ -1,5 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "Error",
"Name" => "Nom",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "Escafa"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
index 2b9ace19c41..e8295e2ff03 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Nie można trwale usunąć %s",
"Couldn't restore %s" => "Nie można przywrócić %s",
"perform restore operation" => "wykonywanie operacji przywracania",
@@ -7,13 +8,12 @@
"Delete permanently" => "Trwale usuń",
"Name" => "Nazwa",
"Deleted" => "Usunięte",
-"1 folder" => "1 folder",
-"{count} folders" => "Ilość folderów: {count}",
-"1 file" => "1 plik",
-"{count} files" => "Ilość plików: {count}",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"restored" => "przywrócony",
"Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!",
"Restore" => "Przywróć",
"Delete" => "Usuń",
"Deleted Files" => "Usunięte pliki"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php
index c1a88541b27..1e3c67ba027 100644
--- a/apps/files_trashbin/l10n/pt_BR.php
+++ b/apps/files_trashbin/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Não foi possível excluir %s permanentemente",
"Couldn't restore %s" => "Não foi possível restaurar %s",
"perform restore operation" => "realizar operação de restauração",
@@ -7,13 +8,12 @@
"Delete permanently" => "Excluir permanentemente",
"Name" => "Nome",
"Deleted" => "Excluído",
-"1 folder" => "1 pasta",
-"{count} folders" => "{count} pastas",
-"1 file" => "1 arquivo",
-"{count} files" => "{count} arquivos",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"restored" => "restaurado",
"Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira está vazia!",
"Restore" => "Restaurar",
"Delete" => "Excluir",
"Deleted Files" => "Arquivos Apagados"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index 044d324c5ab..0c88d132b5c 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Não foi possível eliminar %s de forma permanente",
"Couldn't restore %s" => "Não foi possível restaurar %s",
"perform restore operation" => "executar a operação de restauro",
@@ -7,13 +8,12 @@
"Delete permanently" => "Eliminar permanentemente",
"Name" => "Nome",
"Deleted" => "Apagado",
-"1 folder" => "1 pasta",
-"{count} folders" => "{count} pastas",
-"1 file" => "1 ficheiro",
-"{count} files" => "{count} ficheiros",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"restored" => "Restaurado",
"Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!",
"Restore" => "Restaurar",
"Delete" => "Eliminar",
"Deleted Files" => "Ficheiros Apagados"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php
index 3af21b7e3f3..0b1d2cd9e17 100644
--- a/apps/files_trashbin/l10n/ro.php
+++ b/apps/files_trashbin/l10n/ro.php
@@ -1,10 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "Eroare",
"Delete permanently" => "Stergere permanenta",
"Name" => "Nume",
-"1 folder" => "1 folder",
-"{count} folders" => "{count} foldare",
-"1 file" => "1 fisier",
-"{count} files" => "{count} fisiere",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Delete" => "Șterge"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php
index f77d82c7100..5f52263a118 100644
--- a/apps/files_trashbin/l10n/ru.php
+++ b/apps/files_trashbin/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "%s не может быть удалён навсегда",
"Couldn't restore %s" => "%s не может быть восстановлен",
"perform restore operation" => "выполнить операцию восстановления",
@@ -7,13 +8,12 @@
"Delete permanently" => "Удалено навсегда",
"Name" => "Имя",
"Deleted" => "Удалён",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папок",
-"1 file" => "1 файл",
-"{count} files" => "{count} файлов",
+"_%n folder_::_%n folders_" => array("","","%n папок"),
+"_%n file_::_%n files_" => array("","","%n файлов"),
"restored" => "восстановлен",
"Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
"Restore" => "Восстановить",
"Delete" => "Удалить",
"Deleted Files" => "Удаленные файлы"
);
+$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);";
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
deleted file mode 100644
index 8636e417ecb..00000000000
--- a/apps/files_trashbin/l10n/ru_RU.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error" => "Ошибка",
-"Name" => "Имя",
-"Delete" => "Удалить"
-);
diff --git a/apps/files_trashbin/l10n/si_LK.php b/apps/files_trashbin/l10n/si_LK.php
index 48ea423a4c4..6dad84437cf 100644
--- a/apps/files_trashbin/l10n/si_LK.php
+++ b/apps/files_trashbin/l10n/si_LK.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "දෝෂයක්",
"Name" => "නම",
-"1 folder" => "1 ෆොල්ඩරයක්",
-"1 file" => "1 ගොනුවක්",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "මකා දමන්න"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index 7cef36ef1c0..50fb58a44e2 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Nemožno zmazať %s navždy",
"Couldn't restore %s" => "Nemožno obnoviť %s",
"perform restore operation" => "vykonať obnovu",
@@ -7,12 +8,12 @@
"Delete permanently" => "Zmazať trvalo",
"Name" => "Názov",
"Deleted" => "Zmazané",
-"1 folder" => "1 priečinok",
-"{count} folders" => "{count} priečinkov",
-"1 file" => "1 súbor",
-"{count} files" => "{count} súborov",
+"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"),
+"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"),
+"restored" => "obnovené",
"Nothing in here. Your trash bin is empty!" => "Žiadny obsah. Kôš je prázdny!",
"Restore" => "Obnoviť",
"Delete" => "Zmazať",
"Deleted Files" => "Zmazané súbory"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_trashbin/l10n/sl.php b/apps/files_trashbin/l10n/sl.php
index 8c8446d4e5b..eb2d42a18ff 100644
--- a/apps/files_trashbin/l10n/sl.php
+++ b/apps/files_trashbin/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Datoteke %s ni mogoče dokončno izbrisati.",
"Couldn't restore %s" => "Ni mogoče obnoviti %s",
"perform restore operation" => "izvedi opravilo obnavljanja",
@@ -7,12 +8,11 @@
"Delete permanently" => "Izbriši dokončno",
"Name" => "Ime",
"Deleted" => "Izbrisano",
-"1 folder" => "1 mapa",
-"{count} folders" => "{count} map",
-"1 file" => "1 datoteka",
-"{count} files" => "{count} datotek",
+"_%n folder_::_%n folders_" => array("","","",""),
+"_%n file_::_%n files_" => array("","","",""),
"Nothing in here. Your trash bin is empty!" => "Mapa smeti je prazna.",
"Restore" => "Obnovi",
"Delete" => "Izbriši",
"Deleted Files" => "Izbrisane datoteke"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_trashbin/l10n/sq.php b/apps/files_trashbin/l10n/sq.php
index ce3ed947ccd..1b7b5b828c8 100644
--- a/apps/files_trashbin/l10n/sq.php
+++ b/apps/files_trashbin/l10n/sq.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Nuk munda ta eliminoj përfundimisht %s",
"Couldn't restore %s" => "Nuk munda ta rivendos %s",
"perform restore operation" => "ekzekuto operacionin e rivendosjes",
@@ -7,12 +8,11 @@
"Delete permanently" => "Elimino përfundimisht",
"Name" => "Emri",
"Deleted" => "Eliminuar",
-"1 folder" => "1 dosje",
-"{count} folders" => "{count} dosje",
-"1 file" => "1 skedar",
-"{count} files" => "{count} skedarë",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Nothing in here. Your trash bin is empty!" => "Këtu nuk ka asgjë. Koshi juaj është bosh!",
"Restore" => "Rivendos",
"Delete" => "Elimino",
"Deleted Files" => "Skedarë të eliminuar"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/sr.php b/apps/files_trashbin/l10n/sr.php
index 280c2b02820..7311e759f98 100644
--- a/apps/files_trashbin/l10n/sr.php
+++ b/apps/files_trashbin/l10n/sr.php
@@ -1,14 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"perform restore operation" => "врати у претходно стање",
"Error" => "Грешка",
"Delete permanently" => "Обриши за стално",
"Name" => "Име",
"Deleted" => "Обрисано",
-"1 folder" => "1 фасцикла",
-"{count} folders" => "{count} фасцикле/и",
-"1 file" => "1 датотека",
-"{count} files" => "{count} датотеке/а",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Nothing in here. Your trash bin is empty!" => "Овде нема ништа. Корпа за отпатке је празна.",
"Restore" => "Врати",
"Delete" => "Обриши"
);
+$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);";
diff --git a/apps/files_trashbin/l10n/sr@latin.php b/apps/files_trashbin/l10n/sr@latin.php
index 2cb86adfd40..483d1e3ca2b 100644
--- a/apps/files_trashbin/l10n/sr@latin.php
+++ b/apps/files_trashbin/l10n/sr@latin.php
@@ -1,4 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Name" => "Ime",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"Delete" => "Obriši"
);
+$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);";
diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php
index 2e4a5b42612..47a52f25736 100644
--- a/apps/files_trashbin/l10n/sv.php
+++ b/apps/files_trashbin/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Kunde inte radera %s permanent",
"Couldn't restore %s" => "Kunde inte återställa %s",
"perform restore operation" => "utför återställning",
@@ -7,13 +8,12 @@
"Delete permanently" => "Radera permanent",
"Name" => "Namn",
"Deleted" => "Raderad",
-"1 folder" => "1 mapp",
-"{count} folders" => "{count} mappar",
-"1 file" => "1 fil",
-"{count} files" => "{count} filer",
+"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
+"_%n file_::_%n files_" => array("%n fil","%n filer"),
"restored" => "återställd",
"Nothing in here. Your trash bin is empty!" => "Ingenting här. Din papperskorg är tom!",
"Restore" => "Återskapa",
"Delete" => "Radera",
"Deleted Files" => "Raderade filer"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ta_LK.php b/apps/files_trashbin/l10n/ta_LK.php
index 2badaa85467..ed93b459c7d 100644
--- a/apps/files_trashbin/l10n/ta_LK.php
+++ b/apps/files_trashbin/l10n/ta_LK.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "வழு",
"Name" => "பெயர்",
-"1 folder" => "1 கோப்புறை",
-"{count} folders" => "{எண்ணிக்கை} கோப்புறைகள்",
-"1 file" => "1 கோப்பு",
-"{count} files" => "{எண்ணிக்கை} கோப்புகள்",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "நீக்குக"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/te.php b/apps/files_trashbin/l10n/te.php
index 9b36ac4272e..0d803a8e648 100644
--- a/apps/files_trashbin/l10n/te.php
+++ b/apps/files_trashbin/l10n/te.php
@@ -1,6 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "పొరపాటు",
"Delete permanently" => "శాశ్వతంగా తొలగించు",
"Name" => "పేరు",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
"Delete" => "తొలగించు"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/th_TH.php b/apps/files_trashbin/l10n/th_TH.php
index 82d3cd23530..31caa11aac3 100644
--- a/apps/files_trashbin/l10n/th_TH.php
+++ b/apps/files_trashbin/l10n/th_TH.php
@@ -1,14 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"perform restore operation" => "ดำเนินการคืนค่า",
"Error" => "ข้อผิดพลาด",
"Name" => "ชื่อ",
"Deleted" => "ลบแล้ว",
-"1 folder" => "1 โฟลเดอร์",
-"{count} folders" => "{count} โฟลเดอร์",
-"1 file" => "1 ไฟล์",
-"{count} files" => "{count} ไฟล์",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "ไม่มีอะไรอยู่ในนี้ ถังขยะของคุณยังว่างอยู่",
"Restore" => "คืนค่า",
"Delete" => "ลบ",
"Deleted Files" => "ไฟล์ที่ลบทิ้ง"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php
index 53c143c3a9d..f25b179bc1e 100644
--- a/apps/files_trashbin/l10n/tr.php
+++ b/apps/files_trashbin/l10n/tr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "%s Kalıcı olarak silinemedi",
"Couldn't restore %s" => "%s Geri yüklenemedi",
"perform restore operation" => "Geri yükleme işlemini gerçekleştir",
@@ -7,12 +8,12 @@
"Delete permanently" => "Kalıcı olarak sil",
"Name" => "İsim",
"Deleted" => "Silindi",
-"1 folder" => "1 dizin",
-"{count} folders" => "{count} dizin",
-"1 file" => "1 dosya",
-"{count} files" => "{count} dosya",
+"_%n folder_::_%n folders_" => array("","%n dizin"),
+"_%n file_::_%n files_" => array("","%n dosya"),
+"restored" => "geri yüklendi",
"Nothing in here. Your trash bin is empty!" => "Burası boş. Çöp kutun tamamen boş.",
"Restore" => "Geri yükle",
"Delete" => "Sil",
"Deleted Files" => "Silinen Dosyalar"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/ug.php b/apps/files_trashbin/l10n/ug.php
index c369e385f74..ad983aee18b 100644
--- a/apps/files_trashbin/l10n/ug.php
+++ b/apps/files_trashbin/l10n/ug.php
@@ -1,11 +1,12 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "خاتالىق",
"Delete permanently" => "مەڭگۈلۈك ئۆچۈر",
"Name" => "ئاتى",
"Deleted" => "ئۆچۈرۈلدى",
-"1 folder" => "1 قىسقۇچ",
-"1 file" => "1 ھۆججەت",
-"{count} files" => "{count} ھۆججەت",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!",
"Delete" => "ئۆچۈر"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/uk.php b/apps/files_trashbin/l10n/uk.php
index b2f10760216..aa4b6595032 100644
--- a/apps/files_trashbin/l10n/uk.php
+++ b/apps/files_trashbin/l10n/uk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Неможливо видалити %s назавжди",
"Couldn't restore %s" => "Неможливо відновити %s",
"perform restore operation" => "виконати операцію відновлення",
@@ -7,13 +8,12 @@
"Delete permanently" => "Видалити назавжди",
"Name" => "Ім'я",
"Deleted" => "Видалено",
-"1 folder" => "1 папка",
-"{count} folders" => "{count} папок",
-"1 file" => "1 файл",
-"{count} files" => "{count} файлів",
+"_%n folder_::_%n folders_" => array("","",""),
+"_%n file_::_%n files_" => array("","",""),
"restored" => "відновлено",
"Nothing in here. Your trash bin is empty!" => "Нічого немає. Ваший кошик для сміття пустий!",
"Restore" => "Відновити",
"Delete" => "Видалити",
"Deleted Files" => "Видалено Файлів"
);
+$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);";
diff --git a/apps/files_trashbin/l10n/ur_PK.php b/apps/files_trashbin/l10n/ur_PK.php
index e13a623fecc..f6c6a3da3c8 100644
--- a/apps/files_trashbin/l10n/ur_PK.php
+++ b/apps/files_trashbin/l10n/ur_PK.php
@@ -1,3 +1,7 @@
-<?php $TRANSLATIONS = array(
-"Error" => "ایرر"
+<?php
+$TRANSLATIONS = array(
+"Error" => "ایرر",
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("","")
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/vi.php b/apps/files_trashbin/l10n/vi.php
index a8924c541f8..072d799fa68 100644
--- a/apps/files_trashbin/l10n/vi.php
+++ b/apps/files_trashbin/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Không thể óa %s vĩnh viễn",
"Couldn't restore %s" => "Không thể khôi phục %s",
"perform restore operation" => "thực hiện phục hồi",
@@ -7,12 +8,11 @@
"Delete permanently" => "Xóa vĩnh vễn",
"Name" => "Tên",
"Deleted" => "Đã xóa",
-"1 folder" => "1 thư mục",
-"{count} folders" => "{count} thư mục",
-"1 file" => "1 tập tin",
-"{count} files" => "{count} tập tin",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "Không có gì ở đây. Thùng rác của bạn rỗng!",
"Restore" => "Khôi phục",
"Delete" => "Xóa",
"Deleted Files" => "File đã xóa"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_CN.GB2312.php b/apps/files_trashbin/l10n/zh_CN.GB2312.php
index 1ab193517f8..eaa97bb1b6f 100644
--- a/apps/files_trashbin/l10n/zh_CN.GB2312.php
+++ b/apps/files_trashbin/l10n/zh_CN.GB2312.php
@@ -1,10 +1,12 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "出错",
"Delete permanently" => "永久删除",
"Name" => "名称",
-"1 folder" => "1 个文件夹",
-"{count} folders" => "{count} 个文件夹",
-"1 file" => "1 个文件",
-"{count} files" => "{count} 个文件",
-"Delete" => "删除"
+"_%n folder_::_%n folders_" => array("%n 个文件夹"),
+"_%n file_::_%n files_" => array("%n 个文件"),
+"Restore" => "恢复",
+"Delete" => "删除",
+"Deleted Files" => "删除的文件"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php
index 9c0f0bb3b75..dc2d5b4c00e 100644
--- a/apps/files_trashbin/l10n/zh_CN.php
+++ b/apps/files_trashbin/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "无法彻底删除文件%s",
"Couldn't restore %s" => "无法恢复%s",
"perform restore operation" => "执行恢复操作",
@@ -7,12 +8,12 @@
"Delete permanently" => "永久删除",
"Name" => "名称",
"Deleted" => "已删除",
-"1 folder" => "1个文件夹",
-"{count} folders" => "{count} 个文件夹",
-"1 file" => "1 个文件",
-"{count} files" => "{count} 个文件",
+"_%n folder_::_%n folders_" => array("%n 文件夹"),
+"_%n file_::_%n files_" => array("%n个文件"),
+"restored" => "已恢复",
"Nothing in here. Your trash bin is empty!" => "这里没有东西. 你的回收站是空的!",
"Restore" => "恢复",
"Delete" => "删除",
"Deleted Files" => "已删除文件"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_HK.php b/apps/files_trashbin/l10n/zh_HK.php
index 53dd9869219..3f0d663baeb 100644
--- a/apps/files_trashbin/l10n/zh_HK.php
+++ b/apps/files_trashbin/l10n/zh_HK.php
@@ -1,6 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "錯誤",
"Name" => "名稱",
-"{count} folders" => "{}文件夾",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Delete" => "刪除"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
index a9dcba8f7d7..ab6b75c5784 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "無法永久刪除 %s",
"Couldn't restore %s" => "無法復原 %s",
"perform restore operation" => "進行復原動作",
@@ -7,12 +8,11 @@
"Delete permanently" => "永久刪除",
"Name" => "名稱",
"Deleted" => "已刪除",
-"1 folder" => "1 個資料夾",
-"{count} folders" => "{count} 個資料夾",
-"1 file" => "1 個檔案",
-"{count} files" => "{count} 個檔案",
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
"Nothing in here. Your trash bin is empty!" => "您的垃圾桶是空的!",
"Restore" => "復原",
"Delete" => "刪除",
"Deleted Files" => "已刪除的檔案"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 30913e00a47..323f25eac2f 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -717,7 +717,7 @@ class Trashbin {
\OC_Log::write('files_trashbin', 'remove "' . $filename . '" fom trash bin because it is older than ' . $retention_obligation, \OC_log::INFO);
}
}
- $availableSpace = $availableSpace + $size;
+ $availableSpace += $size;
// if size limit for trash bin reached, delete oldest files in trash bin
if ($availableSpace < 0) {
$query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM `*PREFIX*files_trash`'
diff --git a/apps/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php
index 8cef57c9e4d..38c288adf9d 100644
--- a/apps/files_versions/appinfo/routes.php
+++ b/apps/files_versions/appinfo/routes.php
@@ -6,4 +6,4 @@
*/
// Register with the capabilities API
-OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'files_versions', OC_API::USER_AUTH); \ No newline at end of file
+OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Versions\Capabilities', 'getCapabilities'), 'files_versions', OC_API::USER_AUTH);
diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css
index 6146eda3372..6a9b3a95698 100644
--- a/apps/files_versions/css/versions.css
+++ b/apps/files_versions/css/versions.css
@@ -1,3 +1,7 @@
+#dropdown.drop-versions {
+ width:22em;
+}
+
#found_versions li {
width: 100%;
cursor: default;
@@ -39,6 +43,3 @@
float: right;
}
-.drop-versions #makelink {
- float: left;
-}
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index ca479507d48..f57e931bad9 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -104,9 +104,9 @@ function createVersionsDropdown(filename, files) {
success: function(result) {
var versions = result.data.versions;
if (result.data.endReached === true) {
- document.getElementById("show-more-versions").style.display="none";
+ $("#show-more-versions").css("display", "none");
} else {
- document.getElementById("show-more-versions").style.display="block";
+ $("#show-more-versions").css("display", "block");
}
if (versions) {
$.each(versions, function(index, row) {
@@ -124,27 +124,23 @@ function createVersionsDropdown(filename, files) {
}
function addVersion( revision ) {
- title = formatDate(revision.version*1000);
- name ='<span class="versionDate" title="' + title + '">' + revision.humanReadableTimestamp + '</span>';
+ var title = formatDate(revision.version*1000);
+ var name ='<span class="versionDate" title="' + title + '">' + revision.humanReadableTimestamp + '</span>';
- path = OC.filePath('files_versions', '', 'download.php');
+ var path = OC.filePath('files_versions', '', 'download.php');
- download ='<a href="' + path + "?file=" + files + '&revision=' + revision.version + '">';
+ var download ='<a href="' + path + "?file=" + files + '&revision=' + revision.version + '">';
download+='<img';
download+=' src="' + OC.imagePath('core', 'actions/download') + '"';
- download+=' id="' + revision.version + '"';
- download+=' value="' + files + '"';
download+=' name="downloadVersion" />';
download+=name;
download+='</a>';
- revert='<span class="revertVersion"';
+ var revert='<span class="revertVersion"';
revert+=' id="' + revision.version + '"';
revert+=' value="' + files + '">';
revert+='<img';
revert+=' src="' + OC.imagePath('core', 'actions/history') + '"';
- revert+=' id="' + revision.version + '"';
- revert+=' value="' + files + '"';
revert+=' name="revertVersion"';
revert+='/>'+t('files_versions', 'Restore')+'</span>';
diff --git a/apps/files_versions/l10n/ar.php b/apps/files_versions/l10n/ar.php
index 278b793a86d..53eae8e9fee 100644
--- a/apps/files_versions/l10n/ar.php
+++ b/apps/files_versions/l10n/ar.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Versions" => "الإصدارات",
"Restore" => "استعيد"
);
+$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;";
diff --git a/apps/files_versions/l10n/bg_BG.php b/apps/files_versions/l10n/bg_BG.php
index 25254cfb4d8..6268f408f7a 100644
--- a/apps/files_versions/l10n/bg_BG.php
+++ b/apps/files_versions/l10n/bg_BG.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Versions" => "Версии",
"Restore" => "Възтановяване"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/bn_BD.php b/apps/files_versions/l10n/bn_BD.php
index f3b0071a356..ce7f81b0095 100644
--- a/apps/files_versions/l10n/bn_BD.php
+++ b/apps/files_versions/l10n/bn_BD.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Versions" => "ভার্সন"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php
index 7fd168e1cc6..e5c47a277f9 100644
--- a/apps/files_versions/l10n/ca.php
+++ b/apps/files_versions/l10n/ca.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "No s'ha pogut revertir: %s",
"Versions" => "Versions",
"Failed to revert {file} to revision {timestamp}." => "Ha fallat en retornar {file} a la revisió {timestamp}",
@@ -6,3 +7,4 @@
"No other versions available" => "No hi ha altres versions disponibles",
"Restore" => "Recupera"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php
index bc6f4cf4a19..45ce297eae5 100644
--- a/apps/files_versions/l10n/cs_CZ.php
+++ b/apps/files_versions/l10n/cs_CZ.php
@@ -1,8 +1,10 @@
-<?php $TRANSLATIONS = array(
-"Could not revert: %s" => "Nelze navrátit: %s",
+<?php
+$TRANSLATIONS = array(
+"Could not revert: %s" => "Nelze vrátit: %s",
"Versions" => "Verze",
-"Failed to revert {file} to revision {timestamp}." => "Selhalo navrácení souboru {file} na verzi {timestamp}.",
+"Failed to revert {file} to revision {timestamp}." => "Selhalo vrácení souboru {file} na verzi {timestamp}.",
"More versions..." => "Více verzí...",
"No other versions available" => "Žádné další verze nejsou dostupné",
"Restore" => "Obnovit"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_versions/l10n/da.php b/apps/files_versions/l10n/da.php
index 4a94a749f2e..a18bc717708 100644
--- a/apps/files_versions/l10n/da.php
+++ b/apps/files_versions/l10n/da.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Kunne ikke genskabe: %s",
"Versions" => "Versioner",
"Failed to revert {file} to revision {timestamp}." => "Kunne ikke tilbagerulle {file} til den tidligere udgave: {timestamp}.",
@@ -6,3 +7,4 @@
"No other versions available" => "Ingen andre versioner tilgængelig",
"Restore" => "Gendan"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php
index e89c216fe43..c8b45eee500 100644
--- a/apps/files_versions/l10n/de.php
+++ b/apps/files_versions/l10n/de.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Konnte %s nicht zurücksetzen",
"Versions" => "Versionen",
"Failed to revert {file} to revision {timestamp}." => "Konnte {file} der Revision {timestamp} nicht rückgänging machen.",
@@ -6,3 +7,4 @@
"No other versions available" => "Keine anderen Versionen verfügbar",
"Restore" => "Wiederherstellen"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/de_DE.php b/apps/files_versions/l10n/de_DE.php
index e89c216fe43..c8b45eee500 100644
--- a/apps/files_versions/l10n/de_DE.php
+++ b/apps/files_versions/l10n/de_DE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Konnte %s nicht zurücksetzen",
"Versions" => "Versionen",
"Failed to revert {file} to revision {timestamp}." => "Konnte {file} der Revision {timestamp} nicht rückgänging machen.",
@@ -6,3 +7,4 @@
"No other versions available" => "Keine anderen Versionen verfügbar",
"Restore" => "Wiederherstellen"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/el.php b/apps/files_versions/l10n/el.php
index 3269fbe1201..af608e7c042 100644
--- a/apps/files_versions/l10n/el.php
+++ b/apps/files_versions/l10n/el.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Αδυναμία επαναφοράς του: %s",
"Versions" => "Εκδόσεις",
"Failed to revert {file} to revision {timestamp}." => "Αποτυχία επαναφοράς του {file} στην αναθεώρηση {timestamp}.",
@@ -6,3 +7,4 @@
"No other versions available" => "Δεν υπάρχουν άλλες εκδόσεις διαθέσιμες",
"Restore" => "Επαναφορά"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php
index 72d8625be9e..c023d5fbc37 100644
--- a/apps/files_versions/l10n/eo.php
+++ b/apps/files_versions/l10n/eo.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Ne eblas malfari: %s",
"Versions" => "Versioj",
"Restore" => "Restaŭri"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php
index b2857bded17..a6031698e06 100644
--- a/apps/files_versions/l10n/es.php
+++ b/apps/files_versions/l10n/es.php
@@ -1,5 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "No se puede revertir: %s",
"Versions" => "Revisiones",
+"Failed to revert {file} to revision {timestamp}." => "No se ha podido revertir {archivo} a revisión {timestamp}.",
+"More versions..." => "Más...",
+"No other versions available" => "No hay otras versiones disponibles",
"Restore" => "Recuperar"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/es_AR.php b/apps/files_versions/l10n/es_AR.php
index ec55fa8ebf5..068f835d0af 100644
--- a/apps/files_versions/l10n/es_AR.php
+++ b/apps/files_versions/l10n/es_AR.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "No se pudo revertir: %s ",
"Versions" => "Versiones",
"Restore" => "Recuperar"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
index 271d424df43..ba8b516e856 100644
--- a/apps/files_versions/l10n/et_EE.php
+++ b/apps/files_versions/l10n/et_EE.php
@@ -1,5 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Ei suuda taastada faili: %s",
"Versions" => "Versioonid",
+"Failed to revert {file} to revision {timestamp}." => "Ebaõnnestus faili {file} taastamine revisjonile {timestamp}",
+"More versions..." => "Rohkem versioone...",
+"No other versions available" => "Muid versioone pole saadaval",
"Restore" => "Taasta"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php
index 918b20fb0fd..249ae096630 100644
--- a/apps/files_versions/l10n/eu.php
+++ b/apps/files_versions/l10n/eu.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Ezin izan da leheneratu: %s",
"Versions" => "Bertsioak",
"Failed to revert {file} to revision {timestamp}." => "Errore bat izan da {fitxategia} {timestamp} bertsiora leheneratzean.",
@@ -6,3 +7,4 @@
"No other versions available" => "Ez dago bertsio gehiago eskuragarri",
"Restore" => "Berrezarri"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/fa.php b/apps/files_versions/l10n/fa.php
index 9f77e526624..8edfc2ee265 100644
--- a/apps/files_versions/l10n/fa.php
+++ b/apps/files_versions/l10n/fa.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "بازگردانی امکان ناپذیر است: %s",
"Versions" => "نسخه ها",
"Restore" => "بازیابی"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php
index 9f6f38ce05d..fb011df2a13 100644
--- a/apps/files_versions/l10n/fi_FI.php
+++ b/apps/files_versions/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Palautus epäonnistui: %s",
"Versions" => "Versiot",
"Failed to revert {file} to revision {timestamp}." => "Tiedoston {file} palautus versioon {timestamp} epäonnistui.",
@@ -6,3 +7,4 @@
"No other versions available" => "Ei muita versioita saatavilla",
"Restore" => "Palauta"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
index 74931bd7046..537783e6c9f 100644
--- a/apps/files_versions/l10n/fr.php
+++ b/apps/files_versions/l10n/fr.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Impossible de restaurer %s",
"Versions" => "Versions",
"Restore" => "Restaurer"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_versions/l10n/gl.php b/apps/files_versions/l10n/gl.php
index 66e3ccc5dc7..1ccdc95f1eb 100644
--- a/apps/files_versions/l10n/gl.php
+++ b/apps/files_versions/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Non foi posíbel reverter: %s",
"Versions" => "Versións",
"Failed to revert {file} to revision {timestamp}." => "Non foi posíbel reverter {file} á revisión {timestamp}.",
@@ -6,3 +7,4 @@
"No other versions available" => "Non hai outras versións dispoñíbeis",
"Restore" => "Restablecer"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php
index bcac74be08b..848e4712276 100644
--- a/apps/files_versions/l10n/he.php
+++ b/apps/files_versions/l10n/he.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "לא ניתן להחזיר: %s",
"Versions" => "גרסאות",
"Restore" => "שחזור"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/hu_HU.php b/apps/files_versions/l10n/hu_HU.php
index fe3db5211f8..13b3fe7cace 100644
--- a/apps/files_versions/l10n/hu_HU.php
+++ b/apps/files_versions/l10n/hu_HU.php
@@ -1,5 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Nem sikerült átállni a változatra: %s",
"Versions" => "Az állományok korábbi változatai",
+"Failed to revert {file} to revision {timestamp}." => "Nem sikerült a(z) {file} állományt erre visszaállítani: {timestamp}.",
+"More versions..." => "További változatok...",
+"No other versions available" => "Az állománynak nincs több változata",
"Restore" => "Visszaállítás"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/id.php b/apps/files_versions/l10n/id.php
index 96d96130d18..ee7061805ba 100644
--- a/apps/files_versions/l10n/id.php
+++ b/apps/files_versions/l10n/id.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Tidak dapat mengembalikan: %s",
"Versions" => "Versi",
"Restore" => "Pulihkan"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/is.php b/apps/files_versions/l10n/is.php
index d165a78c31e..0f643122ad0 100644
--- a/apps/files_versions/l10n/is.php
+++ b/apps/files_versions/l10n/is.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Versions" => "Útgáfur"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php
index b59d2edfec9..6e4aee450a6 100644
--- a/apps/files_versions/l10n/it.php
+++ b/apps/files_versions/l10n/it.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Impossibile ripristinare: %s",
"Versions" => "Versioni",
"Failed to revert {file} to revision {timestamp}." => "Ripristino di {file} alla revisione {timestamp} non riuscito.",
@@ -6,3 +7,4 @@
"No other versions available" => "Non sono disponibili altre versioni",
"Restore" => "Ripristina"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php
index 8846d58e499..ec2601aafbd 100644
--- a/apps/files_versions/l10n/ja_JP.php
+++ b/apps/files_versions/l10n/ja_JP.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "元に戻せませんでした: %s",
"Versions" => "バージョン",
"Failed to revert {file} to revision {timestamp}." => "{file} を {timestamp} のリヴィジョンに戻すことができません。",
@@ -6,3 +7,4 @@
"No other versions available" => "利用可能な他のバージョンはありません",
"Restore" => "復元"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/ka_GE.php b/apps/files_versions/l10n/ka_GE.php
index 10fe7e705f3..41e65903b65 100644
--- a/apps/files_versions/l10n/ka_GE.php
+++ b/apps/files_versions/l10n/ka_GE.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "ვერ მოხერხდა უკან დაბრუნება: %s",
"Versions" => "ვერსიები",
"Restore" => "აღდგენა"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/ko.php b/apps/files_versions/l10n/ko.php
index 59856397f5a..365adc25115 100644
--- a/apps/files_versions/l10n/ko.php
+++ b/apps/files_versions/l10n/ko.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "되돌릴 수 없습니다: %s",
"Versions" => "버전",
"Restore" => "복원"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/ku_IQ.php b/apps/files_versions/l10n/ku_IQ.php
index 9132caf75e3..de2696509bb 100644
--- a/apps/files_versions/l10n/ku_IQ.php
+++ b/apps/files_versions/l10n/ku_IQ.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Versions" => "وه‌شان"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/lt_LT.php b/apps/files_versions/l10n/lt_LT.php
index 84963febb53..4e1af5fcc29 100644
--- a/apps/files_versions/l10n/lt_LT.php
+++ b/apps/files_versions/l10n/lt_LT.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Nepavyko atstatyti: %s",
"Versions" => "Versijos",
"Restore" => "Atstatyti"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_versions/l10n/lv.php b/apps/files_versions/l10n/lv.php
index 90d54e35de1..c686370ac31 100644
--- a/apps/files_versions/l10n/lv.php
+++ b/apps/files_versions/l10n/lv.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Nevarēja atgriezt — %s",
"Versions" => "Versijas",
"Restore" => "Atjaunot"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_versions/l10n/mk.php b/apps/files_versions/l10n/mk.php
index 6a1882c2bfd..01a98808cff 100644
--- a/apps/files_versions/l10n/mk.php
+++ b/apps/files_versions/l10n/mk.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Versions" => "Версии"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_versions/l10n/nb_NO.php b/apps/files_versions/l10n/nb_NO.php
index 18ff750f861..2a0a6d8a76d 100644
--- a/apps/files_versions/l10n/nb_NO.php
+++ b/apps/files_versions/l10n/nb_NO.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Versions" => "Versjoner",
"Restore" => "Gjenopprett"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/nl.php b/apps/files_versions/l10n/nl.php
index 77f3e1836cf..ec7551d9596 100644
--- a/apps/files_versions/l10n/nl.php
+++ b/apps/files_versions/l10n/nl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Kon niet terugdraaien: %s",
"Versions" => "Versies",
"Failed to revert {file} to revision {timestamp}." => "Kon {file} niet terugdraaien naar revisie {timestamp}.",
@@ -6,3 +7,4 @@
"No other versions available" => "Geen andere versies beschikbaar",
"Restore" => "Herstellen"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/nn_NO.php b/apps/files_versions/l10n/nn_NO.php
index ce6db36a55e..79b518bc18d 100644
--- a/apps/files_versions/l10n/nn_NO.php
+++ b/apps/files_versions/l10n/nn_NO.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Klarte ikkje å tilbakestilla: %s",
"Versions" => "Utgåver",
"Restore" => "Gjenopprett"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/pl.php b/apps/files_versions/l10n/pl.php
index 00f4ac3f768..3d6be24a63d 100644
--- a/apps/files_versions/l10n/pl.php
+++ b/apps/files_versions/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Nie można było przywrócić: %s",
"Versions" => "Wersje",
"Failed to revert {file} to revision {timestamp}." => "Nie udało się przywrócić zmiany {sygnatura czasowa} {plik}.",
@@ -6,3 +7,4 @@
"No other versions available" => "Nie są dostępne żadne inne wersje",
"Restore" => "Przywróć"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_versions/l10n/pt_BR.php b/apps/files_versions/l10n/pt_BR.php
index 711a38b3bf4..b1958825b47 100644
--- a/apps/files_versions/l10n/pt_BR.php
+++ b/apps/files_versions/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Impossível reverter: %s",
"Versions" => "Versões",
"Failed to revert {file} to revision {timestamp}." => "Falha ao reverter {file} para a revisão {timestamp}.",
@@ -6,3 +7,4 @@
"No other versions available" => "Nenhuma outra versão disponível",
"Restore" => "Restaurar"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_versions/l10n/pt_PT.php b/apps/files_versions/l10n/pt_PT.php
index b0262765ca1..e4371f53409 100644
--- a/apps/files_versions/l10n/pt_PT.php
+++ b/apps/files_versions/l10n/pt_PT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Não foi possível reverter: %s",
"Versions" => "Versões",
"Failed to revert {file} to revision {timestamp}." => "Falhou a recuperação do ficheiro {file} para a revisão {timestamp}.",
@@ -6,3 +7,4 @@
"No other versions available" => "Não existem versões mais antigas",
"Restore" => "Restaurar"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/ro.php b/apps/files_versions/l10n/ro.php
index 240cd181aed..5151b1dceb9 100644
--- a/apps/files_versions/l10n/ro.php
+++ b/apps/files_versions/l10n/ro.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Nu a putut reveni: %s",
"Versions" => "Versiuni"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_versions/l10n/ru.php b/apps/files_versions/l10n/ru.php
index eb5e404600a..12f9f77b94d 100644
--- a/apps/files_versions/l10n/ru.php
+++ b/apps/files_versions/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Не может быть возвращён: %s",
"Versions" => "Версии",
"Failed to revert {file} to revision {timestamp}." => "Не удалось возвратить {file} к ревизии {timestamp}.",
@@ -6,3 +7,4 @@
"No other versions available" => "Других версий не доступно",
"Restore" => "Восстановить"
);
+$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);";
diff --git a/apps/files_versions/l10n/ru_RU.php b/apps/files_versions/l10n/ru_RU.php
deleted file mode 100644
index 8656e346eb6..00000000000
--- a/apps/files_versions/l10n/ru_RU.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"History" => "История",
-"Files Versioning" => "Файлы управления версиями",
-"Enable" => "Включить"
-);
diff --git a/apps/files_versions/l10n/si_LK.php b/apps/files_versions/l10n/si_LK.php
index c7ee63d8ef6..7ee8da049b7 100644
--- a/apps/files_versions/l10n/si_LK.php
+++ b/apps/files_versions/l10n/si_LK.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Versions" => "අනුවාද"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/sk_SK.php b/apps/files_versions/l10n/sk_SK.php
index e22a5bb33f6..5edcea3606c 100644
--- a/apps/files_versions/l10n/sk_SK.php
+++ b/apps/files_versions/l10n/sk_SK.php
@@ -1,5 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Nemožno obnoviť: %s",
"Versions" => "Verzie",
+"Failed to revert {file} to revision {timestamp}." => "Zlyhalo obnovenie súboru {file} na verziu {timestamp}.",
+"More versions..." => "Viac verzií...",
+"No other versions available" => "Žiadne ďalšie verzie nie sú dostupné",
"Restore" => "Obnoviť"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php
index 4b1c10c773b..809ab34c262 100644
--- a/apps/files_versions/l10n/sl.php
+++ b/apps/files_versions/l10n/sl.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Ni mogoče povrniti: %s",
"Versions" => "Različice",
"Restore" => "Obnovi"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_versions/l10n/sr.php b/apps/files_versions/l10n/sr.php
index 111fa776884..d4eb0be19cb 100644
--- a/apps/files_versions/l10n/sr.php
+++ b/apps/files_versions/l10n/sr.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Restore" => "Врати"
);
+$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);";
diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php
index 86d215e5016..0fd073d5cbe 100644
--- a/apps/files_versions/l10n/sv.php
+++ b/apps/files_versions/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Kunde inte återställa: %s",
"Versions" => "Versioner",
"Failed to revert {file} to revision {timestamp}." => "Kunde inte återställa {file} till revision {timestamp}.",
@@ -6,3 +7,4 @@
"No other versions available" => "Inga andra versioner tillgängliga",
"Restore" => "Återskapa"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/ta_LK.php b/apps/files_versions/l10n/ta_LK.php
index 61a47e42f0a..3c21735fa84 100644
--- a/apps/files_versions/l10n/ta_LK.php
+++ b/apps/files_versions/l10n/ta_LK.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Versions" => "பதிப்புகள்"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php
index d42608287a6..97c89b2f809 100644
--- a/apps/files_versions/l10n/th_TH.php
+++ b/apps/files_versions/l10n/th_TH.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Versions" => "รุ่น",
"Restore" => "คืนค่า"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/tr.php b/apps/files_versions/l10n/tr.php
index 23da6b6b43d..f2bc1e6c0aa 100644
--- a/apps/files_versions/l10n/tr.php
+++ b/apps/files_versions/l10n/tr.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Geri alınamıyor: %s",
"Versions" => "Sürümler",
"Restore" => "Geri yükle"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_versions/l10n/ug.php b/apps/files_versions/l10n/ug.php
index 3b63272d927..984e6c314c7 100644
--- a/apps/files_versions/l10n/ug.php
+++ b/apps/files_versions/l10n/ug.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "ئەسلىگە قايتۇرالمايدۇ: %s",
"Versions" => "نەشرى"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/uk.php b/apps/files_versions/l10n/uk.php
index afe44ff3be0..d75160f2864 100644
--- a/apps/files_versions/l10n/uk.php
+++ b/apps/files_versions/l10n/uk.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Не вдалося відновити: %s",
"Versions" => "Версії",
"Restore" => "Відновити"
);
+$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);";
diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php
index f3677c8a775..9d72612c2ad 100644
--- a/apps/files_versions/l10n/vi.php
+++ b/apps/files_versions/l10n/vi.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "Không thể khôi phục: %s",
"Versions" => "Phiên bản",
"Restore" => "Khôi phục"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/zh_CN.GB2312.php b/apps/files_versions/l10n/zh_CN.GB2312.php
index e5f4733da8d..de340d6dc94 100644
--- a/apps/files_versions/l10n/zh_CN.GB2312.php
+++ b/apps/files_versions/l10n/zh_CN.GB2312.php
@@ -1,4 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "无法恢复:%s",
-"Versions" => "版本"
+"Versions" => "版本",
+"Failed to revert {file} to revision {timestamp}." => "无法恢复文件 {file} 到 版本 {timestamp}。",
+"More versions..." => "更多版本",
+"No other versions available" => "没有其他可用版本",
+"Restore" => "恢复"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/zh_CN.php b/apps/files_versions/l10n/zh_CN.php
index 8dd2559414e..767ca1cf646 100644
--- a/apps/files_versions/l10n/zh_CN.php
+++ b/apps/files_versions/l10n/zh_CN.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "无法恢复: %s",
"Versions" => "版本",
"Restore" => "恢复"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/zh_HK.php b/apps/files_versions/l10n/zh_HK.php
index 072d5fbdba8..6d249af4b16 100644
--- a/apps/files_versions/l10n/zh_HK.php
+++ b/apps/files_versions/l10n/zh_HK.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Versions" => "版本"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php
index 7498c6951cd..55a3dca3c32 100644
--- a/apps/files_versions/l10n/zh_TW.php
+++ b/apps/files_versions/l10n/zh_TW.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Could not revert: %s" => "無法還原:%s",
"Versions" => "版本",
"Restore" => "復原"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/lib/capabilities.php b/apps/files_versions/lib/capabilities.php
index 3251a07b6ae..45d7dd3fb02 100644
--- a/apps/files_versions/lib/capabilities.php
+++ b/apps/files_versions/lib/capabilities.php
@@ -20,4 +20,4 @@ class Capabilities {
));
}
-} \ No newline at end of file
+}
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index f0082b301a3..81ee3c8b3c6 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -19,7 +19,7 @@ class Hooks {
*/
public static function write_hook( $params ) {
- if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+ if (\OCP\App::isEnabled('files_versions')) {
$path = $params[\OC\Files\Filesystem::signal_param_path];
if($path<>'') {
Storage::store($path);
@@ -36,12 +36,12 @@ class Hooks {
* cleanup the versions directory if the actual file gets deleted
*/
public static function remove_hook($params) {
- if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+
+ if (\OCP\App::isEnabled('files_versions')) {
$path = $params[\OC\Files\Filesystem::signal_param_path];
if($path<>'') {
Storage::delete($path);
}
-
}
}
@@ -53,13 +53,13 @@ class Hooks {
* of the stored versions along the actual file
*/
public static function rename_hook($params) {
- if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+
+ if (\OCP\App::isEnabled('files_versions')) {
$oldpath = $params['oldpath'];
$newpath = $params['newpath'];
if($oldpath<>'' && $newpath<>'') {
Storage::rename( $oldpath, $newpath );
}
-
}
}
@@ -71,10 +71,11 @@ class Hooks {
* to remove the used space for versions stored in the database
*/
public static function deleteUser_hook($params) {
- if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+
+ if (\OCP\App::isEnabled('files_versions')) {
$uid = $params['uid'];
Storage::deleteUser($uid);
- }
+ }
}
}
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 7c75d70f79c..0b4699dc5c0 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -48,14 +48,14 @@ class Storage {
/**
* get current size of all versions from a given user
- *
+ *
* @param $user user who owns the versions
* @return mixed versions size or false if no versions size is stored
*/
private static function getVersionsSize($user) {
$query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*files_versions` WHERE `user`=?');
$result = $query->execute(array($user))->fetchAll();
-
+
if ($result) {
return $result[0]['size'];
}
@@ -64,7 +64,7 @@ class Storage {
/**
* write to the database how much space is in use for versions
- *
+ *
* @param $user owner of the versions
* @param $size size of the versions
*/
@@ -76,20 +76,20 @@ class Storage {
}
$query->execute(array($size, $user));
}
-
+
/**
* store a new version of a file.
*/
public static function store($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-
+
// if the file gets streamed we need to remove the .part extension
// to get the right target
$ext = pathinfo($filename, PATHINFO_EXTENSION);
if ($ext === 'part') {
$filename = substr($filename, 0, strlen($filename)-5);
}
-
+
list($uid, $filename) = self::getUidAndFilename($filename);
$files_view = new \OC\Files\View('/'.$uid .'/files');
@@ -101,17 +101,15 @@ class Storage {
return false;
}
- // we should have a source file to work with
- if (!$files_view->file_exists($filename)) {
+ // we should have a source file to work with, and the file shouldn't
+ // be empty
+ $fileExists = $files_view->file_exists($filename);
+ if (!($fileExists && $files_view->filesize($filename) > 0)) {
return false;
}
// create all parent folders
- $info=pathinfo($filename);
- $versionsFolderName=$versions_view->getLocalFolder('');
- if(!file_exists($versionsFolderName.'/'.$info['dirname'])) {
- mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true);
- }
+ self::createMissingDirectories($filename, $users_view);
$versionsSize = self::getVersionsSize($uid);
if ( $versionsSize === false || $versionsSize < 0 ) {
@@ -171,7 +169,7 @@ class Storage {
list($uidn, $newpath) = self::getUidAndFilename($new_path);
$versions_view = new \OC\Files\View('/'.$uid .'/files_versions');
$files_view = new \OC\Files\View('/'.$uid .'/files');
-
+
// if the file already exists than it was a upload of a existing file
// over the web interface -> store() is the right function we need here
if ($files_view->file_exists($newpath)) {
@@ -180,13 +178,12 @@ class Storage {
self::expire($newpath);
- $abs_newpath = $versions_view->getLocalFile($newpath);
-
if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) {
$versions_view->rename($oldpath, $newpath);
} else if ( ($versions = Storage::getVersions($uid, $oldpath)) ) {
- $info=pathinfo($abs_newpath);
- if(!file_exists($info['dirname'])) mkdir($info['dirname'], 0750, true);
+ // create missing dirs if necessary
+ self::createMissingDirectories($newpath, new \OC\Files\View('/'. $uidn));
+
foreach ($versions as $v) {
$versions_view->rename($oldpath.'.v'.$v['version'], $newpath.'.v'.$v['version']);
}
@@ -432,7 +429,7 @@ class Storage {
} else {
$quota = \OCP\Util::computerFileSize($quota);
}
-
+
// make sure that we have the current size of the version history
if ( $versionsSize === null ) {
$versionsSize = self::getVersionsSize($uid);
@@ -565,4 +562,21 @@ class Storage {
return $size;
}
+ /**
+ * @brief create recursively missing directories
+ * @param string $filename $path to a file
+ * @param \OC\Files\View $view view on data/user/
+ */
+ private static function createMissingDirectories($filename, $view) {
+ $dirname = \OC_Filesystem::normalizePath(dirname($filename));
+ $dirParts = explode('/', $dirname);
+ $dir = "/files_versions";
+ foreach ($dirParts as $part) {
+ $dir = $dir . '/' . $part;
+ if (!$view->file_exists($dir)) {
+ $view->mkdir($dir);
+ }
+ }
+ }
+
}
diff --git a/apps/user_ldap/ajax/clearMappings.php b/apps/user_ldap/ajax/clearMappings.php
index 5dab39839b6..9118d58c5cf 100644
--- a/apps/user_ldap/ajax/clearMappings.php
+++ b/apps/user_ldap/ajax/clearMappings.php
@@ -32,4 +32,4 @@ if(\OCA\user_ldap\lib\Helper::clearMapping($subject)) {
} else {
$l=OC_L10N::get('user_ldap');
OCP\JSON::error(array('message' => $l->t('Failed to clear the mappings.')));
-} \ No newline at end of file
+}
diff --git a/apps/user_ldap/ajax/getConfiguration.php b/apps/user_ldap/ajax/getConfiguration.php
index dfae68d2dc9..baca588976f 100644
--- a/apps/user_ldap/ajax/getConfiguration.php
+++ b/apps/user_ldap/ajax/getConfiguration.php
@@ -28,4 +28,4 @@ OCP\JSON::callCheck();
$prefix = $_POST['ldap_serverconfig_chooser'];
$connection = new \OCA\user_ldap\lib\Connection($prefix);
-OCP\JSON::success(array('configuration' => $connection->getConfiguration())); \ No newline at end of file
+OCP\JSON::success(array('configuration' => $connection->getConfiguration()));
diff --git a/apps/user_ldap/ajax/getNewServerConfigPrefix.php b/apps/user_ldap/ajax/getNewServerConfigPrefix.php
index 17e78f87072..1c68b2e9a76 100644
--- a/apps/user_ldap/ajax/getNewServerConfigPrefix.php
+++ b/apps/user_ldap/ajax/getNewServerConfigPrefix.php
@@ -31,4 +31,4 @@ sort($serverConnections);
$lk = array_pop($serverConnections);
$ln = intval(str_replace('s', '', $lk));
$nk = 's'.str_pad($ln+1, 2, '0', STR_PAD_LEFT);
-OCP\JSON::success(array('configPrefix' => $nk)); \ No newline at end of file
+OCP\JSON::success(array('configPrefix' => $nk));
diff --git a/apps/user_ldap/ajax/setConfiguration.php b/apps/user_ldap/ajax/setConfiguration.php
index 206487c7e0a..d850bda2470 100644
--- a/apps/user_ldap/ajax/setConfiguration.php
+++ b/apps/user_ldap/ajax/setConfiguration.php
@@ -30,4 +30,4 @@ $prefix = $_POST['ldap_serverconfig_chooser'];
$connection = new \OCA\user_ldap\lib\Connection($prefix);
$connection->setConfiguration($_POST);
$connection->saveConfiguration();
-OCP\JSON::success(); \ No newline at end of file
+OCP\JSON::success();
diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 185952e14bb..6086c7b74e6 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -3,14 +3,20 @@
max-width: 200px;
display: inline-block;
vertical-align: top;
+ text-align: right;
padding-top: 9px;
+ padding-right: 5px;
}
#ldap fieldset input, #ldap fieldset textarea {
- width: 70%;
+ width: 60%;
display: inline-block;
}
+#ldap fieldset p input[type=checkbox] {
+ vertical-align: bottom;
+}
+
.ldapIndent {
margin-left: 50px;
}
@@ -18,4 +24,4 @@
.ldapwarning {
margin-left: 1.4em;
color: #FF3B3B;
-} \ No newline at end of file
+}
diff --git a/apps/user_ldap/group_proxy.php b/apps/user_ldap/group_proxy.php
index 75e7cd46336..eb6f176c58c 100644
--- a/apps/user_ldap/group_proxy.php
+++ b/apps/user_ldap/group_proxy.php
@@ -198,4 +198,4 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
//it's the same across all our user backends obviously
return $this->refBackend->implementsActions($actions);
}
-} \ No newline at end of file
+}
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 52d5dbc48d9..20d6f76dcd6 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -120,7 +120,7 @@ var LdapConfiguration = {
}
);
}
-}
+};
$(document).ready(function() {
$('#ldapAdvancedAccordion').accordion({ heightStyle: 'content', animate: 'easeInOutCirc'});
@@ -176,6 +176,13 @@ $(document).ready(function() {
$('#ldap_submit').effect('highlight', {'color':'#A8FA87'}, 5000, function() {
$('#ldap_submit').css('background', bgcolor);
});
+ //update the Label in the config chooser
+ caption = $('#ldap_serverconfig_chooser option:selected:first').text();
+ pretext = '. Server: ';
+ caption = caption.slice(0, caption.indexOf(pretext) + pretext.length);
+ caption = caption + $('#ldap_host').val();
+ $('#ldap_serverconfig_chooser option:selected:first').text(caption);
+
} else {
$('#ldap_submit').css('background', '#fff');
$('#ldap_submit').effect('highlight', {'color':'#E97'}, 5000, function() {
@@ -204,4 +211,4 @@ $(document).ready(function() {
LdapConfiguration.refreshConfig();
}
});
-}); \ No newline at end of file
+});
diff --git a/apps/user_ldap/l10n/af_ZA.php b/apps/user_ldap/l10n/af_ZA.php
index 944495f3869..32feab61b49 100644
--- a/apps/user_ldap/l10n/af_ZA.php
+++ b/apps/user_ldap/l10n/af_ZA.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Wagwoord",
"Help" => "Hulp"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
index 5f8b6b81455..3dd88eb2655 100644
--- a/apps/user_ldap/l10n/ar.php
+++ b/apps/user_ldap/l10n/ar.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "فشل الحذف",
"Error" => "خطأ",
"Password" => "كلمة المرور",
"Help" => "المساعدة"
);
+$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;";
diff --git a/apps/user_ldap/l10n/bg_BG.php b/apps/user_ldap/l10n/bg_BG.php
index 0330046d80e..b750884e9de 100644
--- a/apps/user_ldap/l10n/bg_BG.php
+++ b/apps/user_ldap/l10n/bg_BG.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "Грешка",
"Password" => "Парола",
"Help" => "Помощ"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php
index 6ae99d69a1c..407d5f509ec 100644
--- a/apps/user_ldap/l10n/bn_BD.php
+++ b/apps/user_ldap/l10n/bn_BD.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "সমস্যা",
"Host" => "হোস্ট",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL আবশ্যক না হলে আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://",
@@ -9,19 +10,12 @@
"Password" => "কূটশব্দ",
"For anonymous access, leave DN and Password empty." => "অজ্ঞাতকুলশীল অধিগমনের জন্য DN এবং কূটশব্দটি ফাঁকা রাখুন।",
"User Login Filter" => "ব্যবহারকারির প্রবেশ ছাঁকনী",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "প্রবেশের চেষ্টা করার সময় প্রযোজ্য ছাঁকনীটি নির্ধারণ করবে। প্রবেশের সময় ব্যবহারকারী নামটি %%uid দিয়ে প্রতিস্থাপিত হবে।",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid স্থানধারক ব্যবহার করুন, উদাহরণঃ \"uid=%%uid\"",
"User List Filter" => "ব্যবহারকারী তালিকা ছাঁকনী",
-"Defines the filter to apply, when retrieving users." => "ব্যবহারকারী উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।",
-"without any placeholder, e.g. \"objectClass=person\"." => "কোন স্থানধারক ব্যতীত, যেমনঃ \"objectClass=person\"।",
"Group Filter" => "গোষ্ঠী ছাঁকনী",
-"Defines the filter to apply, when retrieving groups." => "গোষ্ঠীসমূহ উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "কোন স্থান ধারক ব্যতীত, উদাহরণঃ\"objectClass=posixGroup\"।",
"Port" => "পোর্ট",
"Use TLS" => "TLS ব্যবহার কর",
"Case insensitve LDAP server (Windows)" => "বর্ণ অসংবেদী LDAP সার্ভার (উইন্ডোজ)",
"Turn off SSL certificate validation." => "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।",
-"Not recommended, use for testing only." => "অনুমোদিত নয়, শুধুমাত্র পরীক্ষামূলক ব্যবহারের জন্য।",
"in seconds. A change empties the cache." => "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।",
"User Display Name Field" => "ব্যবহারকারীর প্রদর্শিতব্য নামের ক্ষেত্র",
"Base User Tree" => "ভিত্তি ব্যবহারকারি বৃক্ষাকারে",
@@ -32,3 +26,4 @@
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ব্যবহারকারী নামের জন্য ফাঁকা রাখুন (পূর্বনির্ধারিত)। অন্যথায়, LDAP/AD বৈশিষ্ট্য নির্ধারণ করুন।",
"Help" => "সহায়িকা"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index 8cf51f537b0..338317baad7 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Ha fallat en eliminar els mapatges",
"Failed to delete the server configuration" => "Ha fallat en eliminar la configuració del servidor",
"The configuration is valid and the connection could be established!" => "La configuració és vàlida i s'ha pogut establir la comunicació!",
@@ -29,14 +30,8 @@
"Password" => "Contrasenya",
"For anonymous access, leave DN and Password empty." => "Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
"User Login Filter" => "Filtre d'inici de sessió d'usuari",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\"",
"User List Filter" => "Llista de filtres d'usuari",
-"Defines the filter to apply, when retrieving users." => "Defineix el filtre a aplicar quan es mostren usuaris",
-"without any placeholder, e.g. \"objectClass=person\"." => "sense cap paràmetre de substitució, per exemple \"objectClass=persona\"",
"Group Filter" => "Filtre de grup",
-"Defines the filter to apply, when retrieving groups." => "Defineix el filtre a aplicar quan es mostren grups.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\".",
"Connection Settings" => "Arranjaments de connexió",
"Configuration Active" => "Configuració activa",
"When unchecked, this configuration will be skipped." => "Si està desmarcat, aquesta configuració s'ometrà.",
@@ -50,8 +45,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "No ho useu adicionalment per a conexions LDAPS, fallarà.",
"Case insensitve LDAP server (Windows)" => "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
"Turn off SSL certificate validation." => "Desactiva la validació de certificat SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor %s.",
-"Not recommended, use for testing only." => "No recomanat, ús només per proves.",
"Cache Time-To-Live" => "Memòria de cau Time-To-Live",
"in seconds. A change empties the cache." => "en segons. Un canvi buidarà la memòria de cau.",
"Directory Settings" => "Arranjaments de carpetes",
@@ -87,3 +80,4 @@
"Test Configuration" => "Comprovació de la configuració",
"Help" => "Ajuda"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index dd02f8bc3e4..9f4c31c068b 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -1,11 +1,12 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Selhalo zrušení mapování.",
"Failed to delete the server configuration" => "Selhalo smazání nastavení serveru",
"The configuration is valid and the connection could be established!" => "Nastavení je v pořádku a spojení bylo navázáno.",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím, nastavení serveru a přihlašovací údaje.",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "Nastavení je neplatné. Zkontrolujte, prosím, záznam ownCloud pro další podrobnosti.",
-"Deletion failed" => "Mazání selhalo.",
-"Take over settings from recent server configuration?" => "Převzít nastavení z nedávného nastavení serveru?",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Nastavení je neplatné. Zkontrolujte, prosím, záznamy ownCloud pro další podrobnosti.",
+"Deletion failed" => "Mazání selhalo",
+"Take over settings from recent server configuration?" => "Převzít nastavení z nedávné konfigurace serveru?",
"Keep settings?" => "Ponechat nastavení?",
"Cannot add server configuration" => "Nelze přidat nastavení serveru",
"mappings cleared" => "mapování zrušeno",
@@ -16,7 +17,7 @@
"Do you really want to delete the current Server Configuration?" => "Opravdu si přejete smazat současné nastavení serveru?",
"Confirm Deletion" => "Potvrdit smazání",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím vašeho systémového administrátora o zakázání jednoho z nich.",
-"<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.",
+"<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.",
"Server configuration" => "Nastavení serveru",
"Add Server Configuration" => "Přidat nastavení serveru",
"Host" => "Počítač",
@@ -25,42 +26,38 @@
"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é.",
+"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 klientského uživatele, ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte DN a heslo prázdné.",
"Password" => "Heslo",
-"For anonymous access, leave DN and Password empty." => "Pro anonymní přístup, ponechte údaje DN and heslo prázdné.",
+"For anonymous access, leave DN and Password empty." => "Pro anonymní přístup ponechte údaje DN and heslo prázdné.",
"User Login Filter" => "Filtr přihlášení uživatelů",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "použijte zástupný vzor %%uid, např. \"uid=%%uid\"",
-"User List Filter" => "Filtr uživatelských seznamů",
-"Defines the filter to apply, when retrieving users." => "Určuje použitý filtr, pro získávaní uživatelů.",
-"without any placeholder, e.g. \"objectClass=person\"." => "bez zástupných znaků, např. \"objectClass=person\".",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad \"uid=%%uid\"",
+"User List Filter" => "Filtr seznamu uživatelů",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Určuje použitý filtr pro získávaní uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\"",
"Group Filter" => "Filtr skupin",
-"Defines the filter to apply, when retrieving groups." => "Určuje použitý filtr, pro získávaní skupin.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez zástupných znaků, např. \"objectClass=posixGroup\".",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Určuje použitý filtr, pro získávaní skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\"",
"Connection Settings" => "Nastavení spojení",
"Configuration Active" => "Nastavení aktivní",
-"When unchecked, this configuration will be skipped." => "Pokud není zaškrtnuto, bude nastavení přeskočeno.",
+"When unchecked, this configuration will be skipped." => "Pokud není zaškrtnuto, bude toto nastavení přeskočeno.",
"Port" => "Port",
"Backup (Replica) Host" => "Záložní (kopie) hostitel",
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Zadejte volitelného záložního hostitele. Musí to být kopie hlavního serveru LDAP/AD.",
"Backup (Replica) Port" => "Záložní (kopie) port",
-"Disable Main Server" => "Zakázat hlavní serveru",
-"Only connect to the replica server." => "Připojit jen k replikujícímu serveru.",
+"Disable Main Server" => "Zakázat hlavní server",
+"Only connect to the replica server." => "Připojit jen k záložnímu serveru.",
"Use TLS" => "Použít TLS",
-"Do not use it additionally for LDAPS connections, it will fail." => "Nepoužívejte pro spojení LDAP, selže.",
+"Do not use it additionally for LDAPS connections, it will fail." => "Nepoužívejte v kombinaci s LDAPS spojením, nebude to fungovat.",
"Case insensitve LDAP server (Windows)" => "LDAP server nerozlišující velikost znaků (Windows)",
"Turn off SSL certificate validation." => "Vypnout ověřování SSL certifikátu.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Pokud spojení funguje jen s touto volbou, importujte SSL certifikát vašeho LDAP serveru na server %s.",
-"Not recommended, use for testing only." => "Není doporučeno, pouze pro testovací účely.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Nedoporučuje se, určeno pouze k testovacímu použití. Pokud spojení funguje jen s touto volbou, importujte SSL certifikát vašeho LDAP serveru na server %s.",
"Cache Time-To-Live" => "TTL vyrovnávací paměti",
-"in seconds. A change empties the cache." => "ve vteřinách. Změna vyprázdní vyrovnávací paměť.",
+"in seconds. A change empties the cache." => "v sekundách. Změna vyprázdní vyrovnávací paměť.",
"Directory Settings" => "Nastavení adresáře",
"User Display Name Field" => "Pole zobrazovaného jména uživatele",
"The LDAP attribute to use to generate the user's display name." => "LDAP atribut použitý k vytvoření zobrazovaného jména uživatele.",
"Base User Tree" => "Základní uživatelský strom",
"One User Base DN per line" => "Jedna uživatelská základní DN na řádku",
"User Search Attributes" => "Atributy vyhledávání uživatelů",
-"Optional; one attribute per line" => "Volitelné, atribut na řádku",
+"Optional; one attribute per line" => "Volitelné, jeden atribut na řádku",
"Group Display Name Field" => "Pole zobrazovaného jména skupiny",
"The LDAP attribute to use to generate the groups's display name." => "LDAP atribut použitý k vytvoření zobrazovaného jména skupiny.",
"Base Group Tree" => "Základní skupinový strom",
@@ -75,15 +72,16 @@
"User Home Folder Naming Rule" => "Pravidlo pojmenování domovské složky uživatele",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr.",
"Internal Username" => "Interní uživatelské jméno",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Ve výchozím nastavení bude uživatelské jméno vytvořeno z UUID atributu. To zajistí unikátnost uživatelského jména bez potřeby konverze znaků. Interní uživatelské jméno je omezena na znaky: [ a-zA-Z0-9_.@- ]. Ostatní znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduše vynechány. V případě kolize uživatelských jmen bude přidáno/navýšeno číslo. Interní uživatelské jméno je používáno k interní identifikaci uživatele. Je také výchozím názvem uživatelského domovského adresáře. Je také součástí URL pro vzdálený přístup, například všech *DAV služeb. S tímto nastavením bude výchozí chování přepsáno. Pro dosažení podobného chování jako před ownCloudem 5 uveďte atribut zobrazovaného jména do pole níže. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele z LDAP.",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Ve výchozím nastavení bude uživatelské jméno vytvořeno z UUID atributu. To zajistí unikátnost uživatelského jména a není potřeba provádět konverzi znaků. Interní uživatelské jméno je omezeno na znaky: [ a-zA-Z0-9_.@- ]. Ostatní znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduše vynechány. V případě kolize uživatelských jmen bude přidáno/navýšeno číslo. Interní uživatelské jméno je používáno k interní identifikaci uživatele. Je také výchozím názvem uživatelského domovského adresáře. Je také součástí URL pro vzdálený přístup, například všech *DAV služeb. S tímto nastavením může být výchozí chování změněno. Pro dosažení podobného chování jako před ownCloudem 5 uveďte atribut zobrazovaného jména do pole níže. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele z LDAP.",
"Internal Username Attribute:" => "Atribut interního uživatelského jména:",
"Override UUID detection" => "Nastavit ručně UUID atribut",
-"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut který sami zvolíte. Musíte se ale ujistit že atribut který vyberete bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP.",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut, který sami zvolíte. Musíte se ale ujistit, že atribut, který vyberete, bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP.",
"UUID Attribute:" => "Atribut UUID:",
"Username-LDAP User Mapping" => "Mapování uživatelských jmen z LDAPu",
-"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To je nezbytné pro mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro reprodukci interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi.",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To vyžaduje mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro zmenšení interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Interní uživatelské jméno se používá celé. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi.",
"Clear Username-LDAP User Mapping" => "Zrušit mapování uživatelských jmen LDAPu",
"Clear Groupname-LDAP Group Mapping" => "Zrušit mapování názvů skupin LDAPu",
"Test Configuration" => "Vyzkoušet nastavení",
"Help" => "Nápověda"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_ldap/l10n/cy_GB.php b/apps/user_ldap/l10n/cy_GB.php
index abe2336b2ba..71a38fad25d 100644
--- a/apps/user_ldap/l10n/cy_GB.php
+++ b/apps/user_ldap/l10n/cy_GB.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "Methwyd dileu",
"Error" => "Gwall",
"Password" => "Cyfrinair",
"Help" => "Cymorth"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
index 71fe042406b..e0c7acbadf8 100644
--- a/apps/user_ldap/l10n/da.php
+++ b/apps/user_ldap/l10n/da.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to delete the server configuration" => "Kunne ikke slette server konfigurationen",
"The configuration is valid and the connection could be established!" => "Konfigurationen er korrekt og forbindelsen kunne etableres!",
"The configuration is invalid. Please look in the ownCloud log for further details." => "Konfigurationen er ugyldig. Se venligst ownCloud loggen for yderligere detaljer.",
@@ -22,11 +23,7 @@
"For anonymous access, leave DN and Password empty." => "For anonym adgang, skal du lade DN og Adgangskode tomme.",
"User Login Filter" => "Bruger Login Filter",
"User List Filter" => "Brugerliste Filter",
-"Defines the filter to apply, when retrieving users." => "Definere filteret der bruges ved indlæsning af brugere.",
-"without any placeholder, e.g. \"objectClass=person\"." => "Uden stedfortræder, f.eks. \"objectClass=person\".",
"Group Filter" => "Gruppe Filter",
-"Defines the filter to apply, when retrieving groups." => "Definere filteret der bruges når der indlæses grupper.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Uden stedfortræder, f.eks. \"objectClass=posixGroup\".",
"Connection Settings" => "Forbindelsesindstillinger ",
"Configuration Active" => "Konfiguration Aktiv",
"Port" => "Port",
@@ -37,7 +34,6 @@
"Use TLS" => "Brug TLS",
"Do not use it additionally for LDAPS connections, it will fail." => "Benyt ikke flere LDAPS forbindelser, det vil mislykkeds. ",
"Turn off SSL certificate validation." => "Deaktiver SSL certifikat validering",
-"Not recommended, use for testing only." => "Anbefales ikke, brug kun for at teste.",
"User Display Name Field" => "User Display Name Field",
"Base User Tree" => "Base Bruger Træ",
"Base Group Tree" => "Base Group Tree",
@@ -48,3 +44,4 @@
"Test Configuration" => "Test Konfiguration",
"Help" => "Hjælp"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 09b17e01e2e..cb13275fafa 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Löschen der Zuordnung fehlgeschlagen.",
"Failed to delete the server configuration" => "Löschen der Serverkonfiguration fehlgeschlagen",
"The configuration is valid and the connection could be established!" => "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
@@ -29,14 +30,11 @@
"Password" => "Passwort",
"For anonymous access, leave DN and Password empty." => "Lasse die Felder DN und Passwort für anonymen Zugang leer.",
"User Login Filter" => "Benutzer-Login-Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwende %%uid Platzhalter, z. B. \"uid=%%uid\"",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
"User List Filter" => "Benutzer-Filter-Liste",
-"Defines the filter to apply, when retrieving users." => "Definiert den Filter für die Anfrage der Benutzer.",
-"without any placeholder, e.g. \"objectClass=person\"." => "ohne Platzhalter, z.B.: \"objectClass=person\"",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Definiert den Filter für die Wiederherstellung eines Benutzers (kein Platzhalter). Beispiel: \"objectClass=person\"",
"Group Filter" => "Gruppen-Filter",
-"Defines the filter to apply, when retrieving groups." => "Definiert den Filter für die Anfrage der Gruppen.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Definiert den Filter für die Wiederherstellung einer Gruppe (kein Platzhalter). Beispiel: \"objectClass=posixGroup\"",
"Connection Settings" => "Verbindungseinstellungen",
"Configuration Active" => "Konfiguration aktiv",
"When unchecked, this configuration will be skipped." => "Konfiguration wird übersprungen wenn deaktiviert",
@@ -50,8 +48,7 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen.",
"Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
"Turn off SSL certificate validation." => "Schalte die SSL-Zertifikatsprüfung aus.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server.",
-"Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server.",
"Cache Time-To-Live" => "Speichere Time-To-Live zwischen",
"in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
"Directory Settings" => "Ordnereinstellungen",
@@ -87,3 +84,4 @@
"Test Configuration" => "Testkonfiguration",
"Help" => "Hilfe"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 3240f1653cd..677d603ffa0 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Löschen der Zuordnung fehlgeschlagen.",
"Failed to delete the server configuration" => "Löschen der Serverkonfiguration fehlgeschlagen",
"The configuration is valid and the connection could be established!" => "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
@@ -29,14 +30,11 @@
"Password" => "Passwort",
"For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
"User Login Filter" => "Benutzer-Login-Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\"",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
"User List Filter" => "Benutzer-Filter-Liste",
-"Defines the filter to apply, when retrieving users." => "Definiert den Filter für die Anfrage der Benutzer.",
-"without any placeholder, e.g. \"objectClass=person\"." => "ohne Platzhalter, z.B.: \"objectClass=person\"",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Definiert den Filter für die Wiederherstellung eines Benutzers (kein Platzhalter). Beispiel: \"objectClass=person\"",
"Group Filter" => "Gruppen-Filter",
-"Defines the filter to apply, when retrieving groups." => "Definiert den Filter für die Anfrage der Gruppen.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Definiert den Filter für die Wiederherstellung einer Gruppe (kein Platzhalter). Beispiel: \"objectClass=posixGroup\"",
"Connection Settings" => "Verbindungseinstellungen",
"Configuration Active" => "Konfiguration aktiv",
"When unchecked, this configuration will be skipped." => "Wenn nicht angehakt, wird diese Konfiguration übersprungen.",
@@ -50,8 +48,7 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen.",
"Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
"Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.",
-"Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.",
"Cache Time-To-Live" => "Speichere Time-To-Live zwischen",
"in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
"Directory Settings" => "Ordnereinstellungen",
@@ -87,3 +84,4 @@
"Test Configuration" => "Testkonfiguration",
"Help" => "Hilfe"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index ae982ab4c56..d588f90518e 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to delete the server configuration" => "Αποτυχία διαγραφής ρυθμίσεων διακομιστή",
"The configuration is valid and the connection could be established!" => "Οι ρυθμίσεις είναι έγκυρες και η σύνδεση μπορεί να πραγματοποιηθεί!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Οι ρυθμίσεις είναι έγκυρες, αλλά απέτυχε η σύνδεση. Παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή και τα διαπιστευτήρια.",
@@ -26,14 +27,8 @@
"Password" => "Συνθηματικό",
"For anonymous access, leave DN and Password empty." => "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword.",
"User Login Filter" => "User Login Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Καθορίζει το φίλτρο που θα ισχύει κατά την προσπάθεια σύνδεσης χρήστη. %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. ",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "χρησιμοποιήστε τη μεταβλητή %%uid, π.χ. \"uid=%%uid\"",
"User List Filter" => "User List Filter",
-"Defines the filter to apply, when retrieving users." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών.",
-"without any placeholder, e.g. \"objectClass=person\"." => "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=άτομο\".",
"Group Filter" => "Group Filter",
-"Defines the filter to apply, when retrieving groups." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\".",
"Connection Settings" => "Ρυθμίσεις Σύνδεσης",
"Configuration Active" => "Ενεργοποιηση ρυθμισεων",
"When unchecked, this configuration will be skipped." => "Όταν δεν είναι επιλεγμένο, αυτή η ρύθμιση θα πρέπει να παραλειφθεί. ",
@@ -46,7 +41,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Μην το χρησιμοποιήσετε επιπροσθέτως, για LDAPS συνδέσεις , θα αποτύχει.",
"Case insensitve LDAP server (Windows)" => "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ",
"Turn off SSL certificate validation." => "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.",
-"Not recommended, use for testing only." => "Δεν προτείνεται, χρήση μόνο για δοκιμές.",
"Cache Time-To-Live" => "Cache Time-To-Live",
"in seconds. A change empties the cache." => "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache.",
"Directory Settings" => "Ρυθμίσεις Καταλόγου",
@@ -70,3 +64,4 @@
"Test Configuration" => "Δοκιμαστικες ρυθμισεις",
"Help" => "Βοήθεια"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/en@pirate.php b/apps/user_ldap/l10n/en@pirate.php
index 482632f3fda..e269c57c3d0 100644
--- a/apps/user_ldap/l10n/en@pirate.php
+++ b/apps/user_ldap/l10n/en@pirate.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Passcode"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index 7f9aa0b3f1c..26d46b81b9f 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "Forigo malsukcesis",
"Success" => "Sukceso",
"Error" => "Eraro",
@@ -9,19 +10,12 @@
"Password" => "Pasvorto",
"For anonymous access, leave DN and Password empty." => "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
"User Login Filter" => "Filtrilo de uzantensaluto",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Ĝi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataŭigas la uzantonomon en la ensaluta ago.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "uzu la referencilon %%uid, ekz.: \"uid=%%uid\"",
"User List Filter" => "Filtrilo de uzantolisto",
-"Defines the filter to apply, when retrieving users." => "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj.",
-"without any placeholder, e.g. \"objectClass=person\"." => "sen ajna referencilo, ekz.: \"objectClass=person\".",
"Group Filter" => "Filtrilo de grupo",
-"Defines the filter to apply, when retrieving groups." => "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sen ajna referencilo, ekz.: \"objectClass=posixGroup\".",
"Port" => "Pordo",
"Use TLS" => "Uzi TLS-on",
"Case insensitve LDAP server (Windows)" => "LDAP-servilo blinda je litergrandeco (Vindozo)",
"Turn off SSL certificate validation." => "Malkapabligi validkontrolon de SSL-atestiloj.",
-"Not recommended, use for testing only." => "Ne rekomendata, uzu ĝin nur por testoj.",
"in seconds. A change empties the cache." => "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron.",
"User Display Name Field" => "Kampo de vidignomo de uzanto",
"Base User Tree" => "Baza uzantarbo",
@@ -32,3 +26,4 @@
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon.",
"Help" => "Helpo"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index f11dadfbef5..e5994273635 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -1,12 +1,13 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Ocurrió un fallo al borrar las asignaciones.",
"Failed to delete the server configuration" => "No se pudo borrar la configuración del servidor",
-"The configuration is valid and the connection could be established!" => "La configuración es válida y la conexión puede establecerse!",
+"The configuration is valid and the connection could be established!" => "¡La configuración es válida y la conexión puede establecerse!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuración es válida, pero falló el Enlace. Por favor, compruebe la configuración del servidor y las credenciales.",
"The configuration is invalid. Please look in the ownCloud log for further details." => "La configuración no es válida. Por favor, busque en el log de ownCloud para más detalles.",
"Deletion failed" => "Falló el borrado",
"Take over settings from recent server configuration?" => "¿Asumir los ajustes actuales de la configuración del servidor?",
-"Keep settings?" => "Mantener la configuración?",
+"Keep settings?" => "¿Mantener la configuración?",
"Cannot add server configuration" => "No se puede añadir la configuración del servidor",
"mappings cleared" => "Asignaciones borradas",
"Success" => "Éxito",
@@ -28,14 +29,8 @@
"Password" => "Contraseña",
"For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.",
"User Login Filter" => "Filtro de inicio de sesión de usuario",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "usar %%uid como comodín, ej: \"uid=%%uid\"",
"User List Filter" => "Lista de filtros de usuario",
-"Defines the filter to apply, when retrieving users." => "Define el filtro a aplicar, cuando se obtienen usuarios.",
-"without any placeholder, e.g. \"objectClass=person\"." => "Sin comodines, ej: \"objectClass=person\".",
"Group Filter" => "Filtro de grupo",
-"Defines the filter to apply, when retrieving groups." => "Define el filtro a aplicar, cuando se obtienen grupos.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sin comodines, ej: \"objectClass=posixGroup\".",
"Connection Settings" => "Configuración de conexión",
"Configuration Active" => "Configuracion activa",
"When unchecked, this configuration will be skipped." => "Cuando deseleccione, esta configuracion sera omitida.",
@@ -48,7 +43,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "No lo use para conexiones LDAPS, Fallará.",
"Case insensitve LDAP server (Windows)" => "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)",
"Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.",
-"Not recommended, use for testing only." => "No recomendado, sólo para pruebas.",
"Cache Time-To-Live" => "Cache TTL",
"in seconds. A change empties the cache." => "en segundos. Un cambio vacía la caché.",
"Directory Settings" => "Configuracion de directorio",
@@ -79,3 +73,4 @@
"Test Configuration" => "Configuración de prueba",
"Help" => "Ayuda"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index 8a44d3b84ad..ecfcae32f46 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Hubo un error al borrar las asignaciones.",
"Failed to delete the server configuration" => "Fallo al borrar la configuración del servidor",
"The configuration is valid and the connection could be established!" => "La configuración es válida y la conexión pudo ser establecida.",
@@ -28,14 +29,8 @@
"Password" => "Contraseña",
"For anonymous access, leave DN and Password empty." => "Para acceso anónimo, dejá DN y contraseña vacíos.",
"User Login Filter" => "Filtro de inicio de sesión de usuario",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "usar %%uid como plantilla, p. ej.: \"uid=%%uid\"",
"User List Filter" => "Lista de filtros de usuario",
-"Defines the filter to apply, when retrieving users." => "Define el filtro a aplicar, cuando se obtienen usuarios.",
-"without any placeholder, e.g. \"objectClass=person\"." => "Sin plantilla, p. ej.: \"objectClass=person\".",
"Group Filter" => "Filtro de grupo",
-"Defines the filter to apply, when retrieving groups." => "Define el filtro a aplicar cuando se obtienen grupos.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\".",
"Connection Settings" => "Configuración de Conección",
"Configuration Active" => "Configuración activa",
"When unchecked, this configuration will be skipped." => "Si no está seleccionada, esta configuración será omitida.",
@@ -48,7 +43,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "No usar adicionalmente para conexiones LDAPS, las mismas fallarán",
"Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)",
"Turn off SSL certificate validation." => "Desactivar la validación por certificado SSL.",
-"Not recommended, use for testing only." => "No recomendado, sólo para pruebas.",
"Cache Time-To-Live" => "Tiempo de vida del caché",
"in seconds. A change empties the cache." => "en segundos. Cambiarlo vacía la cache.",
"Directory Settings" => "Configuración de Directorio",
@@ -79,3 +73,4 @@
"Test Configuration" => "Probar configuración",
"Help" => "Ayuda"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 7e5c0a6fec8..b949fe02041 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Vastendususte puhastamine ebaõnnestus.",
"Failed to delete the server configuration" => "Serveri seadistuse kustutamine ebaõnnestus",
"The configuration is valid and the connection could be established!" => "Seadistus on korrektne ning ühendus on olemas!",
@@ -15,6 +16,7 @@
"Connection test failed" => "Ühenduse testimine ebaõnnestus",
"Do you really want to delete the current Server Configuration?" => "Oled kindel, et tahad kustutada praegust serveri seadistust?",
"Confirm Deletion" => "Kinnita kustutamine",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Hoiatus:</b>PHP LDAP moodul pole paigaldatud ning LDAP kasutamine ei ole võimalik. Palu oma süsteeihaldurit see paigaldada.",
"Server configuration" => "Serveri seadistus",
"Add Server Configuration" => "Lisa serveri seadistus",
@@ -28,14 +30,11 @@
"Password" => "Parool",
"For anonymous access, leave DN and Password empty." => "Anonüümseks ligipääsuks jäta DN ja parool tühjaks.",
"User Login Filter" => "Kasutajanime filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\"",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\"",
"User List Filter" => "Kasutajate nimekirja filter",
-"Defines the filter to apply, when retrieving users." => "Määrab kasutajaid hankides filtri, mida rakendatakse.",
-"without any placeholder, e.g. \"objectClass=person\"." => "ilma ühegi kohatäitjata, nt. \"objectClass=person\".",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Määrab kasutajate leidmiseks kasutatava filtri (ilma muutujateta). Näide: \"objectClass=person\"",
"Group Filter" => "Grupi filter",
-"Defines the filter to apply, when retrieving groups." => "Määrab gruppe hankides filtri, mida rakendatakse.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\".",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Määrab gruppide leidmiseks kasutatava filtri (ilma muutujateta). Näide: \"objectClass=posixGroup\"",
"Connection Settings" => "Ühenduse seaded",
"Configuration Active" => "Seadistus aktiivne",
"When unchecked, this configuration will be skipped." => "Kui märkimata, siis seadistust ei kasutata",
@@ -44,20 +43,23 @@
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Lisa täiendav LDAP/AD server, mida replikeeritakse peaserveriga.",
"Backup (Replica) Port" => "Varuserveri (replika) port",
"Disable Main Server" => "Ära kasuta peaserverit",
+"Only connect to the replica server." => "Ühendu ainult replitseeriva serveriga.",
"Use TLS" => "Kasuta TLS-i",
"Do not use it additionally for LDAPS connections, it will fail." => "LDAPS puhul ära kasuta. Ühendus ei toimi.",
"Case insensitve LDAP server (Windows)" => "Mittetõstutundlik LDAP server (Windows)",
"Turn off SSL certificate validation." => "Lülita SSL sertifikaadi kontrollimine välja.",
-"Not recommended, use for testing only." => "Pole soovitatav, kasuta ainult testimiseks.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Pole soovitatav, kasuta seda ainult testimiseks! Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma %s serverisse.",
"Cache Time-To-Live" => "Puhvri iga",
"in seconds. A change empties the cache." => "sekundites. Muudatus tühjendab vahemälu.",
"Directory Settings" => "Kataloogi seaded",
"User Display Name Field" => "Kasutaja näidatava nime väli",
+"The LDAP attribute to use to generate the user's display name." => "LDAP atribuut, mida kasutatakse kasutaja kuvatava nime loomiseks.",
"Base User Tree" => "Baaskasutaja puu",
"One User Base DN per line" => "Üks kasutajate baas-DN rea kohta",
"User Search Attributes" => "Kasutaja otsingu atribuudid",
"Optional; one attribute per line" => "Valikuline; üks atribuut rea kohta",
"Group Display Name Field" => "Grupi näidatava nime väli",
+"The LDAP attribute to use to generate the groups's display name." => "LDAP atribuut, mida kasutatakse ownCloudi grupi kuvatava nime loomiseks.",
"Base Group Tree" => "Baasgrupi puu",
"One Group Base DN per line" => "Üks grupi baas-DN rea kohta",
"Group Search Attributes" => "Grupi otsingu atribuudid",
@@ -70,12 +72,16 @@
"User Home Folder Naming Rule" => "Kasutaja kodukataloogi nimetamise reegel",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus.",
"Internal Username" => "Sisemine kasutajanimi",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URLi osaks, näiteks kõikidel *DAV teenustel. Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi.",
"Internal Username Attribute:" => "Sisemise kasutajatunnuse atribuut:",
"Override UUID detection" => "Tühista UUID tuvastus",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Vaikimis ownCloud tuvastab automaatselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi.",
"UUID Attribute:" => "UUID atribuut:",
"Username-LDAP User Mapping" => "LDAP-Kasutajatunnus Kasutaja Vastendus",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, peab iga LDAP kasutaja omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutajanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas.",
"Clear Username-LDAP User Mapping" => "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus",
"Clear Groupname-LDAP Group Mapping" => "Puhasta LDAP-Grupinimi Grupp Vastendus",
"Test Configuration" => "Testi seadistust",
"Help" => "Abiinfo"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index c825a634272..664d4901947 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to delete the server configuration" => "Zerbitzariaren konfigurazioa ezabatzeak huts egin du",
"The configuration is valid and the connection could be established!" => "Konfigurazioa egokia da eta konexioa ezarri daiteke!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurazioa ongi dago, baina Bind-ek huts egin du. Mesedez egiaztatu zerbitzariaren ezarpenak eta kredentzialak.",
@@ -26,14 +27,8 @@
"Password" => "Pasahitza",
"For anonymous access, leave DN and Password empty." => "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
"User Login Filter" => "Erabiltzaileen saioa hasteko iragazkia",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "erabili %%uid txantiloia, adb. \"uid=%%uid\"",
"User List Filter" => "Erabiltzaile zerrendaren Iragazkia",
-"Defines the filter to apply, when retrieving users." => "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du.",
-"without any placeholder, e.g. \"objectClass=person\"." => "txantiloirik gabe, adb. \"objectClass=person\".",
"Group Filter" => "Taldeen iragazkia",
-"Defines the filter to apply, when retrieving groups." => "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "txantiloirik gabe, adb. \"objectClass=posixGroup\".",
"Connection Settings" => "Konexio Ezarpenak",
"Configuration Active" => "Konfigurazio Aktiboa",
"When unchecked, this configuration will be skipped." => "Markatuta ez dagoenean, konfigurazio hau ez da kontutan hartuko.",
@@ -46,7 +41,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Ez erabili LDAPS konexioetarako, huts egingo du.",
"Case insensitve LDAP server (Windows)" => "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)",
"Turn off SSL certificate validation." => "Ezgaitu SSL ziurtagirien egiaztapena.",
-"Not recommended, use for testing only." => "Ez da aholkatzen, erabili bakarrik frogak egiteko.",
"Cache Time-To-Live" => "Katxearen Bizi-Iraupena",
"in seconds. A change empties the cache." => "segundutan. Aldaketak katxea husten du.",
"Directory Settings" => "Karpetaren Ezarpenak",
@@ -71,3 +65,4 @@
"Test Configuration" => "Egiaztatu Konfigurazioa",
"Help" => "Laguntza"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index 151e0cab285..c4db39521dd 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "عدم موفقیت در پاک کردن نگاشت.",
"Failed to delete the server configuration" => "عملیات حذف پیکربندی سرور ناموفق ماند",
"The configuration is valid and the connection could be established!" => "پیکربندی معتبر است و ارتباط می تواند برقرار شود",
@@ -24,7 +25,6 @@
"For anonymous access, leave DN and Password empty." => "برای دسترسی ناشناس، DN را رها نموده و رمزعبور را خالی بگذارید.",
"User Login Filter" => "فیلتر ورودی کاربر",
"Group Filter" => "فیلتر گروه",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "بدون هیچ گونه حفره یا سوراخ، به عنوان مثال، \"objectClass = posixGroup\".",
"Connection Settings" => "تنظیمات اتصال",
"Configuration Active" => "پیکربندی فعال",
"When unchecked, this configuration will be skipped." => "زمانیکه انتخاب نشود، این پیکربندی نادیده گرفته خواهد شد.",
@@ -36,7 +36,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "علاوه بر این برای اتصالات LDAPS از آن استفاده نکنید، با شکست مواجه خواهد شد.",
"Case insensitve LDAP server (Windows)" => "غیر حساس به بزرگی و کوچکی حروف LDAP سرور (ویندوز)",
"Turn off SSL certificate validation." => "غیرفعال کردن اعتبار گواهی نامه SSL .",
-"Not recommended, use for testing only." => "توصیه نمی شود، تنها برای آزمایش استفاده کنید.",
"Directory Settings" => "تنظیمات پوشه",
"User Display Name Field" => "فیلد نام کاربر",
"Base User Tree" => "کاربر درخت پایه",
@@ -65,3 +64,4 @@
"Test Configuration" => "امتحان پیکربندی",
"Help" => "راه‌نما"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 7833b301aca..341ffe8f627 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "Poisto epäonnistui",
"Keep settings?" => "Säilytetäänkö asetukset?",
"Cannot add server configuration" => "Palvelinasetusten lisäys epäonnistui",
@@ -16,21 +17,14 @@
"Password" => "Salasana",
"For anonymous access, leave DN and Password empty." => "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi ",
"User Login Filter" => "Login suodatus",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Määrittelee käytettävän suodattimen, kun sisäänkirjautumista yritetään. %%uid korvaa sisäänkirjautumisessa käyttäjätunnuksen.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\"",
"User List Filter" => "Käyttäjien suodatus",
-"Defines the filter to apply, when retrieving users." => "Määrittelee käytettävän suodattimen, kun käyttäjiä haetaan. ",
-"without any placeholder, e.g. \"objectClass=person\"." => "ilman paikanvaraustermiä, ts. \"objectClass=person\".",
"Group Filter" => "Ryhmien suodatus",
-"Defines the filter to apply, when retrieving groups." => "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan. ",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\".",
"Connection Settings" => "Yhteysasetukset",
"Port" => "Portti",
"Disable Main Server" => "Poista pääpalvelin käytöstä",
"Use TLS" => "Käytä TLS:ää",
"Case insensitve LDAP server (Windows)" => "Kirjainkoosta piittamaton LDAP-palvelin (Windows)",
"Turn off SSL certificate validation." => "Poista käytöstä SSL-varmenteen vahvistus",
-"Not recommended, use for testing only." => "Ei suositella, käytä vain testausta varten.",
"in seconds. A change empties the cache." => "sekunneissa. Muutos tyhjentää välimuistin.",
"Directory Settings" => "Hakemistoasetukset",
"User Display Name Field" => "Käyttäjän näytettävän nimen kenttä",
@@ -43,3 +37,4 @@
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti.",
"Help" => "Ohje"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 4820960eb36..0c7d3ad078f 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Erreur lors de la suppression des associations.",
"Failed to delete the server configuration" => "Échec de la suppression de la configuration du serveur",
"The configuration is valid and the connection could be established!" => "La configuration est valide et la connexion peut être établie !",
@@ -28,14 +29,8 @@
"Password" => "Mot de passe",
"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
"User Login Filter" => "Modèle d'authentification utilisateurs",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\"",
"User List Filter" => "Filtre d'utilisateurs",
-"Defines the filter to apply, when retrieving users." => "Définit le filtre à appliquer lors de la récupération des utilisateurs.",
-"without any placeholder, e.g. \"objectClass=person\"." => "sans élément de substitution, par exemple \"objectClass=person\".",
"Group Filter" => "Filtre de groupes",
-"Defines the filter to apply, when retrieving groups." => "Définit le filtre à appliquer lors de la récupération des groupes.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sans élément de substitution, par exemple \"objectClass=posixGroup\".",
"Connection Settings" => "Paramètres de connexion",
"Configuration Active" => "Configuration active",
"When unchecked, this configuration will be skipped." => "Lorsque non cochée, la configuration sera ignorée.",
@@ -48,7 +43,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "À ne pas utiliser pour les connexions LDAPS (cela échouera).",
"Case insensitve LDAP server (Windows)" => "Serveur LDAP insensible à la casse (Windows)",
"Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL.",
-"Not recommended, use for testing only." => "Non recommandé, utilisation pour tests uniquement.",
"Cache Time-To-Live" => "Durée de vie du cache",
"in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.",
"Directory Settings" => "Paramètres du répertoire",
@@ -79,3 +73,4 @@
"Test Configuration" => "Tester la configuration",
"Help" => "Aide"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index 14706db8d1d..911e481ca76 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Non foi posíbel limpar as asignacións.",
"Failed to delete the server configuration" => "Non foi posíbel eliminar a configuración do servidor",
"The configuration is valid and the connection could be established!" => "A configuración é correcta e pode estabelecerse a conexión.",
@@ -29,14 +30,11 @@
"Password" => "Contrasinal",
"For anonymous access, leave DN and Password empty." => "Para o acceso anónimo deixe o DN e o contrasinal baleiros.",
"User Login Filter" => "Filtro de acceso de usuarios",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "usar a marca de posición %%uid, p.ex «uid=%%uid»",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso. Exemplo: «uid=%%uid»",
"User List Filter" => "Filtro da lista de usuarios",
-"Defines the filter to apply, when retrieving users." => "Define o filtro a aplicar cando se recompilan os usuarios.",
-"without any placeholder, e.g. \"objectClass=person\"." => "sen ningunha marca de posición, como p.ex «objectClass=persoa».",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Define o filtro a aplicar cando de recuperan os usuarios (sen comodíns). Exemplo: «objectClass=person»",
"Group Filter" => "Filtro de grupo",
-"Defines the filter to apply, when retrieving groups." => "Define o filtro a aplicar cando se recompilan os grupos.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix».",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Define o filtro a aplicar cando de recuperan os usuarios (sen comodíns). Exemplo: «objectClass=posixGroup»",
"Connection Settings" => "Axustes da conexión",
"Configuration Active" => "Configuración activa",
"When unchecked, this configuration will be skipped." => "Se está sen marcar, omítese esta configuración.",
@@ -50,8 +48,7 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Non utilizalo ademais para conexións LDAPS xa que fallará.",
"Case insensitve LDAP server (Windows)" => "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)",
"Turn off SSL certificate validation." => "Desactiva a validación do certificado SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no teu servidor %s.",
-"Not recommended, use for testing only." => "Non se recomenda. Só para probas.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Non recomendado, utilizar só para probas! Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor %s.",
"Cache Time-To-Live" => "Tempo de persistencia da caché",
"in seconds. A change empties the cache." => "en segundos. Calquera cambio baleira a caché.",
"Directory Settings" => "Axustes do directorio",
@@ -87,3 +84,4 @@
"Test Configuration" => "Probar a configuración",
"Help" => "Axuda"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/he.php b/apps/user_ldap/l10n/he.php
index 0d60768dcfc..b39a4277078 100644
--- a/apps/user_ldap/l10n/he.php
+++ b/apps/user_ldap/l10n/he.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "מחיקה נכשלה",
"Keep settings?" => "האם לשמור את ההגדרות?",
"Cannot add server configuration" => "לא ניתן להוסיף את הגדרות השרת",
@@ -21,3 +22,4 @@
"in bytes" => "בבתים",
"Help" => "עזרה"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/hi.php b/apps/user_ldap/l10n/hi.php
index 8e8e4e8ff69..24ae7a02176 100644
--- a/apps/user_ldap/l10n/hi.php
+++ b/apps/user_ldap/l10n/hi.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "त्रुटि",
"Password" => "पासवर्ड",
"Help" => "सहयोग"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/hr.php b/apps/user_ldap/l10n/hr.php
index cc8918301f5..c9445de0dfc 100644
--- a/apps/user_ldap/l10n/hr.php
+++ b/apps/user_ldap/l10n/hr.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "Greška",
"Password" => "Lozinka",
"Help" => "Pomoć"
);
+$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;";
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index 26c96942cc4..6961869f3e0 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Nem sikerült törölni a hozzárendeléseket.",
"Failed to delete the server configuration" => "Nem sikerült törölni a kiszolgáló konfigurációját",
"The configuration is valid and the connection could be established!" => "A konfiguráció érvényes, és a kapcsolat létrehozható!",
@@ -28,14 +29,8 @@
"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",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "használja az %%uid változót, pl. \"uid=%%uid\"",
"User List Filter" => "A felhasználók szűrője",
-"Defines the filter to apply, when retrieving users." => "Ez a szűrő érvényes a felhasználók listázásakor.",
-"without any placeholder, e.g. \"objectClass=person\"." => "itt ne használjon változót, pl. \"objectClass=person\".",
"Group Filter" => "A csoportok szűrője",
-"Defines the filter to apply, when retrieving groups." => "Ez a szűrő érvényes a csoportok listázásakor.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "itt ne használjunk változót, pl. \"objectClass=posixGroup\".",
"Connection Settings" => "Kapcsolati beállítások",
"Configuration Active" => "A beállítás aktív",
"When unchecked, this configuration will be skipped." => "Ha nincs kipipálva, ez a beállítás kihagyódik.",
@@ -48,7 +43,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "LDAPS kapcsolatok esetén ne kapcsoljuk be, mert nem fog működni.",
"Case insensitve LDAP server (Windows)" => "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)",
"Turn off SSL certificate validation." => "Ne ellenőrizzük az SSL-tanúsítvány érvényességét",
-"Not recommended, use for testing only." => "Nem javasolt, csak tesztelésre érdemes használni.",
"Cache Time-To-Live" => "A gyorsítótár tárolási időtartama",
"in seconds. A change empties the cache." => "másodpercben. A változtatás törli a cache tartalmát.",
"Directory Settings" => "Címtár beállítások",
@@ -79,3 +73,4 @@
"Test Configuration" => "A beállítások tesztelése",
"Help" => "Súgó"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ia.php b/apps/user_ldap/l10n/ia.php
index 624fd4fa0eb..9de7344f15f 100644
--- a/apps/user_ldap/l10n/ia.php
+++ b/apps/user_ldap/l10n/ia.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "Error",
"Password" => "Contrasigno",
"Help" => "Adjuta"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index 0231e2a5961..9580725616d 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to delete the server configuration" => "Gagal menghapus konfigurasi server",
"The configuration is valid and the connection could be established!" => "Konfigurasi valid dan koneksi dapat dilakukan!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan.",
@@ -26,14 +27,8 @@
"Password" => "Sandi",
"For anonymous access, leave DN and Password empty." => "Untuk akses anonim, biarkan DN dan Kata sandi kosong.",
"User Login Filter" => "gunakan saringan login",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "gunakan pengganti %%uid, mis. \"uid=%%uid\"",
"User List Filter" => "Daftar Filter Pengguna",
-"Defines the filter to apply, when retrieving users." => "Definisikan filter untuk diterapkan saat menerima pengguna.",
-"without any placeholder, e.g. \"objectClass=person\"." => "tanpa pengganti apapun, mis. \"objectClass=seseorang\".",
"Group Filter" => "saringan grup",
-"Defines the filter to apply, when retrieving groups." => "Definisikan filter untuk diterapkan saat menerima grup.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\".",
"Connection Settings" => "Pengaturan Koneksi",
"Configuration Active" => "Konfigurasi Aktif",
"When unchecked, this configuration will be skipped." => "Jika tidak dicentang, konfigurasi ini dilewati.",
@@ -46,7 +41,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal.",
"Case insensitve LDAP server (Windows)" => "Server LDAP dengan kapitalisasi tidak sensitif (Windows)",
"Turn off SSL certificate validation." => "matikan validasi sertivikat SSL",
-"Not recommended, use for testing only." => "tidak disarankan, gunakan hanya untuk pengujian.",
"Cache Time-To-Live" => "Gunakan Tembolok untuk Time-To-Live",
"in seconds. A change empties the cache." => "dalam detik. perubahan mengosongkan cache",
"Directory Settings" => "Pengaturan Direktori",
@@ -70,3 +64,4 @@
"Test Configuration" => "Uji Konfigurasi",
"Help" => "Bantuan"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/is.php b/apps/user_ldap/l10n/is.php
index 6ea474f56df..70c6bb61570 100644
--- a/apps/user_ldap/l10n/is.php
+++ b/apps/user_ldap/l10n/is.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Keep settings?" => "Geyma stillingar ?",
"Error" => "Villa",
"Host" => "Netþjónn",
@@ -6,3 +7,4 @@
"Test Configuration" => "Prúfa uppsetningu",
"Help" => "Hjálp"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 18a1c3f3398..82f42ef3be9 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Cancellazione delle associazioni non riuscita.",
"Failed to delete the server configuration" => "Eliminazione della configurazione del server non riuscita",
"The configuration is valid and the connection could be established!" => "La configurazione è valida e la connessione può essere stabilita.",
@@ -29,14 +30,8 @@
"Password" => "Password",
"For anonymous access, leave DN and Password empty." => "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
"User Login Filter" => "Filtro per l'accesso utente",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\"",
"User List Filter" => "Filtro per l'elenco utenti",
-"Defines the filter to apply, when retrieving users." => "Specifica quale filtro utilizzare durante il recupero degli utenti.",
-"without any placeholder, e.g. \"objectClass=person\"." => "senza nessun segnaposto, per esempio \"objectClass=person\".",
"Group Filter" => "Filtro per il gruppo",
-"Defines the filter to apply, when retrieving groups." => "Specifica quale filtro utilizzare durante il recupero dei gruppi.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "senza nessun segnaposto, per esempio \"objectClass=posixGroup\".",
"Connection Settings" => "Impostazioni di connessione",
"Configuration Active" => "Configurazione attiva",
"When unchecked, this configuration will be skipped." => "Se deselezionata, questa configurazione sarà saltata.",
@@ -50,8 +45,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Da non utilizzare per le connessioni LDAPS, non funzionerà.",
"Case insensitve LDAP server (Windows)" => "Case insensitve LDAP server (Windows)",
"Turn off SSL certificate validation." => "Disattiva il controllo del certificato SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server %s.",
-"Not recommended, use for testing only." => "Non consigliato, utilizzare solo per test.",
"Cache Time-To-Live" => "Tempo di vita della cache",
"in seconds. A change empties the cache." => "in secondi. Il cambio svuota la cache.",
"Directory Settings" => "Impostazioni delle cartelle",
@@ -87,3 +80,4 @@
"Test Configuration" => "Prova configurazione",
"Help" => "Aiuto"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index 8647574c524..e9ef2165bb3 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "マッピングのクリアに失敗しました。",
"Failed to delete the server configuration" => "サーバ設定の削除に失敗しました",
"The configuration is valid and the connection could be established!" => "設定は有効であり、接続を確立しました!",
@@ -15,6 +16,7 @@
"Connection test failed" => "接続テストに失敗しました",
"Do you really want to delete the current Server Configuration?" => "現在のサーバ設定を本当に削除してもよろしいですか?",
"Confirm Deletion" => "削除の確認",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. 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 モジュールがインストールされていません。バックエンドが正しく動作しません。システム管理者にインストールするよう問い合わせてください。",
"Server configuration" => "サーバ設定",
"Add Server Configuration" => "サーバ設定を追加",
@@ -28,14 +30,11 @@
"Password" => "パスワード",
"For anonymous access, leave DN and Password empty." => "匿名アクセスの場合は、DNとパスワードを空にしてください。",
"User Login Filter" => "ユーザログインフィルタ",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\"",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザ名が入ります。例: \"uid=%%uid\"",
"User List Filter" => "ユーザリストフィルタ",
-"Defines the filter to apply, when retrieving users." => "ユーザーを取得するときに適用するフィルターを定義する。",
-"without any placeholder, e.g. \"objectClass=person\"." => "プレースホルダーを利用しないでください。例 \"objectClass=person\"",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "ユーザ取得時に適用するフィルタを定義します(プレースホルダ無し)。例: \"objectClass=person\"",
"Group Filter" => "グループフィルタ",
-"Defines the filter to apply, when retrieving groups." => "グループを取得するときに適用するフィルターを定義する。",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\"",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "グループ取得時に適用するフィルタを定義します(プレースホルダ無し)。例: \"objectClass=posixGroup\"",
"Connection Settings" => "接続設定",
"Configuration Active" => "設定はアクティブです",
"When unchecked, this configuration will be skipped." => "チェックを外すと、この設定はスキップされます。",
@@ -44,20 +43,23 @@
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバのレプリカである必要があります。",
"Backup (Replica) Port" => "バックアップ(レプリカ)ポート",
"Disable Main Server" => "メインサーバを無効にする",
+"Only connect to the replica server." => "レプリカサーバーにのみ接続します。",
"Use TLS" => "TLSを利用",
"Do not use it additionally for LDAPS connections, it will fail." => "LDAPS接続のために追加でそれを利用しないで下さい。失敗します。",
"Case insensitve LDAP server (Windows)" => "大文字/小文字を区別しないLDAPサーバ(Windows)",
"Turn off SSL certificate validation." => "SSL証明書の確認を無効にする。",
-"Not recommended, use for testing only." => "推奨しません、テスト目的でのみ利用してください。",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "推奨されません、テストにおいてのみ使用してください!このオプションでのみ接続が動作する場合は、LDAP サーバのSSL証明書を %s サーバにインポートしてください。",
"Cache Time-To-Live" => "キャッシュのTTL",
"in seconds. A change empties the cache." => "秒。変更後にキャッシュがクリアされます。",
"Directory Settings" => "ディレクトリ設定",
"User Display Name Field" => "ユーザ表示名のフィールド",
+"The LDAP attribute to use to generate the user's display name." => "ユーザの表示名の生成に利用するLDAP属性",
"Base User Tree" => "ベースユーザツリー",
"One User Base DN per line" => "1行に1つのユーザベースDN",
"User Search Attributes" => "ユーザ検索属性",
"Optional; one attribute per line" => "オプション:1行に1属性",
"Group Display Name Field" => "グループ表示名のフィールド",
+"The LDAP attribute to use to generate the groups's display name." => "ユーザのグループ表示名の生成に利用するLDAP属性",
"Base Group Tree" => "ベースグループツリー",
"One Group Base DN per line" => "1行に1つのグループベースDN",
"Group Search Attributes" => "グループ検索属性",
@@ -70,12 +72,16 @@
"User Home Folder Naming Rule" => "ユーザのホームフォルダ命名規則",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ユーザ名を空のままにしてください(デフォルト)。そうでない場合は、LDAPもしくはADの属性を指定してください。",
"Internal Username" => "内部ユーザ名",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "デフォルトでは、内部ユーザ名はUUID属性から作成されます。これにより、ユーザ名がユニークであり、かつ文字の変換が不要であることを保証します。内部ユーザ名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザ名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダ名としても用いられます。例えば*DAVサービスのように、リモートURLの一部でもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザ表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング(追加)されたLDAPユーザにおいてのみ有効となります。",
"Internal Username Attribute:" => "内部ユーザ名属性:",
"Override UUID detection" => "UUID検出を再定義する",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング(追加)されたLDAPユーザとLDAPグループに対してのみ有効となります。",
"UUID Attribute:" => "UUID属性:",
"Username-LDAP User Mapping" => "ユーザ名とLDAPユーザのマッピング",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ユーザ名は(メタ)データの保存と割り当てに使用されます。ユーザを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザ名からLDAPユーザへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます!本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
"Clear Username-LDAP User Mapping" => "ユーザ名とLDAPユーザのマッピングをクリアする",
"Clear Groupname-LDAP Group Mapping" => "グループ名とLDAPグループのマッピングをクリアする",
"Test Configuration" => "設定をテスト",
"Help" => "ヘルプ"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ka.php b/apps/user_ldap/l10n/ka.php
index 169926283e9..3de4d3c722a 100644
--- a/apps/user_ldap/l10n/ka.php
+++ b/apps/user_ldap/l10n/ka.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "პაროლი",
"Help" => "შველა"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php
index 07cd3ad7965..860e8933b0d 100644
--- a/apps/user_ldap/l10n/ka_GE.php
+++ b/apps/user_ldap/l10n/ka_GE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to delete the server configuration" => "შეცდომა სერვერის კონფიგურაციის წაშლისას",
"The configuration is valid and the connection could be established!" => "კონფიგურაცია მართებულია და კავშირი დამყარდება!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები.",
@@ -26,14 +27,8 @@
"Password" => "პაროლი",
"For anonymous access, leave DN and Password empty." => "ანონიმური დაშვებისთვის, დატოვეთ DN–ის და პაროლის ველები ცარიელი.",
"User Login Filter" => "მომხმარებლის ფილტრი",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "როცა შემოსვლა განხორციელდება ასეიძლება მოვახდინოთ გაფილტვრა. %%uid შეიცვლება იუზერნეიმით მომხმარებლის ველში.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "გამოიყენეთ %%uid დამასრულებელი მაგ: \"uid=%%uid\"",
"User List Filter" => "მომხმარებლებიის სიის ფილტრი",
-"Defines the filter to apply, when retrieving users." => "გაფილტვრა განხორციელდება, როცა მომხმარებლების სია ჩამოიტვირთება.",
-"without any placeholder, e.g. \"objectClass=person\"." => "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=person\".",
"Group Filter" => "ჯგუფის ფილტრი",
-"Defines the filter to apply, when retrieving groups." => "გაფილტვრა განხორციელდება, როცა ჯგუფის სია ჩამოიტვირთება.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=posixGroup\".",
"Connection Settings" => "კავშირის პარამეტრები",
"Configuration Active" => "კონფიგურაცია აქტიურია",
"When unchecked, this configuration will be skipped." => "როცა გადანიშნულია, ეს კონფიგურაცია გამოტოვებული იქნება.",
@@ -46,7 +41,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "არ გამოიყენოთ დამატებით LDAPS კავშირი. ის წარუმატებლად დასრულდება.",
"Case insensitve LDAP server (Windows)" => "LDAP server (Windows)",
"Turn off SSL certificate validation." => "გამორთეთ SSL სერთიფიკატის ვალიდაცია.",
-"Not recommended, use for testing only." => "არ არის რეკომენდირებული, გამოიყენეთ მხოლოდ სატესტოდ.",
"Cache Time-To-Live" => "ქეშის სიცოცხლის ხანგრძლივობა",
"in seconds. A change empties the cache." => "წამებში. ცვლილება ასუფთავებს ქეშს.",
"Directory Settings" => "დირექტორიის პარამეტრები",
@@ -70,3 +64,4 @@
"Test Configuration" => "კავშირის ტესტირება",
"Help" => "დახმარება"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index 549233e20c9..a5a2798165c 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "삭제 실패",
"Keep settings?" => "설정을 유지합니까?",
"Error" => "오류",
@@ -15,14 +16,8 @@
"Password" => "암호",
"For anonymous access, leave DN and Password empty." => "익명 접근을 허용하려면 DN과 암호를 비워 두십시오.",
"User Login Filter" => "사용자 로그인 필터",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "로그인을 시도할 때 적용할 필터입니다. %%uid는 로그인 작업에서의 사용자 이름으로 대체됩니다.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid 자리 비움자를 사용하십시오. 예제: \"uid=%%uid\"\"",
"User List Filter" => "사용자 목록 필터",
-"Defines the filter to apply, when retrieving users." => "사용자를 검색할 때 적용할 필터를 정의합니다.",
-"without any placeholder, e.g. \"objectClass=person\"." => "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=person\"",
"Group Filter" => "그룹 필터",
-"Defines the filter to apply, when retrieving groups." => "그룹을 검색할 때 적용할 필터를 정의합니다.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=posixGroup\"",
"Connection Settings" => "연결 설정",
"Configuration Active" => "구성 활성화",
"Port" => "포트",
@@ -32,7 +27,6 @@
"Use TLS" => "TLS 사용",
"Case insensitve LDAP server (Windows)" => "서버에서 대소문자를 구분하지 않음 (Windows)",
"Turn off SSL certificate validation." => "SSL 인증서 유효성 검사를 해제합니다.",
-"Not recommended, use for testing only." => "추천하지 않음, 테스트로만 사용하십시오.",
"in seconds. A change empties the cache." => "초. 항목 변경 시 캐시가 갱신됩니다.",
"Directory Settings" => "디렉토리 설정",
"User Display Name Field" => "사용자의 표시 이름 필드",
@@ -48,3 +42,4 @@
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오.",
"Help" => "도움말"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ku_IQ.php b/apps/user_ldap/l10n/ku_IQ.php
index 00602ae5d79..d211e9554a8 100644
--- a/apps/user_ldap/l10n/ku_IQ.php
+++ b/apps/user_ldap/l10n/ku_IQ.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Success" => "سه‌رکه‌وتن",
"Error" => "هه‌ڵه",
"Password" => "وشەی تێپەربو",
"Help" => "یارمەتی"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/lb.php b/apps/user_ldap/l10n/lb.php
index cf58c9ec5be..0a268bbb391 100644
--- a/apps/user_ldap/l10n/lb.php
+++ b/apps/user_ldap/l10n/lb.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "Konnt net läschen",
"Error" => "Fehler",
"Password" => "Passwuert",
"Help" => "Hëllef"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index 6f396847b8e..7e8b389af7f 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "Ištrinti nepavyko",
"Error" => "Klaida",
"Password" => "Slaptažodis",
@@ -6,6 +7,6 @@
"Port" => "Prievadas",
"Use TLS" => "Naudoti TLS",
"Turn off SSL certificate validation." => "Išjungti SSL sertifikato tikrinimą.",
-"Not recommended, use for testing only." => "Nerekomenduojama, naudokite tik testavimui.",
"Help" => "Pagalba"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
index 38157c51f1b..11a68fffeb4 100644
--- a/apps/user_ldap/l10n/lv.php
+++ b/apps/user_ldap/l10n/lv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to delete the server configuration" => "Neizdevās izdzēst servera konfigurāciju",
"The configuration is valid and the connection could be established!" => "Konfigurācija ir derīga un varēja izveidot savienojumu!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurācija ir derīga, bet sasaiste neizdevās. Lūdzu, pārbaudiet servera iestatījumus un akreditācijas datus.",
@@ -25,14 +26,8 @@
"Password" => "Parole",
"For anonymous access, leave DN and Password empty." => "Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu.",
"User Login Filter" => "Lietotāja ierakstīšanās filtrs",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definē filtru, ko izmantot, kad mēģina ierakstīties. %%uid ierakstīšanās darbībā aizstāj lietotājvārdu.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "lieto %%uid vietturi, piemēram, \"uid=%%uid\"",
"User List Filter" => "Lietotāju saraksta filtrs",
-"Defines the filter to apply, when retrieving users." => "Definē filtru, ko izmantot, kad saņem lietotāju sarakstu.",
-"without any placeholder, e.g. \"objectClass=person\"." => "bez jebkādiem vietturiem, piemēram, \"objectClass=person\".",
"Group Filter" => "Grupu filtrs",
-"Defines the filter to apply, when retrieving groups." => "Definē filtru, ko izmantot, kad saņem grupu sarakstu.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez jebkādiem vietturiem, piemēram, \"objectClass=posixGroup\".",
"Connection Settings" => "Savienojuma iestatījumi",
"Configuration Active" => "Konfigurācija ir aktīva",
"When unchecked, this configuration will be skipped." => "Ja nav atzīmēts, šī konfigurācija tiks izlaista.",
@@ -45,7 +40,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Neizmanto papildu LDAPS savienojumus! Tas nestrādās.",
"Case insensitve LDAP server (Windows)" => "Reģistrnejutīgs LDAP serveris (Windows)",
"Turn off SSL certificate validation." => "Izslēgt SSL sertifikātu validēšanu.",
-"Not recommended, use for testing only." => "Nav ieteicams, izmanto tikai testēšanai!",
"Cache Time-To-Live" => "Kešatmiņas dzīvlaiks",
"in seconds. A change empties the cache." => "sekundēs. Izmaiņas iztukšos kešatmiņu.",
"Directory Settings" => "Direktorijas iestatījumi",
@@ -69,3 +63,4 @@
"Test Configuration" => "Testa konfigurācija",
"Help" => "Palīdzība"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/user_ldap/l10n/mk.php b/apps/user_ldap/l10n/mk.php
index 6a060aca415..3d261c3d80c 100644
--- a/apps/user_ldap/l10n/mk.php
+++ b/apps/user_ldap/l10n/mk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "Бришењето е неуспешно",
"Error" => "Грешка",
"Host" => "Домаќин",
@@ -6,3 +7,4 @@
"Password" => "Лозинка",
"Help" => "Помош"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/user_ldap/l10n/ms_MY.php b/apps/user_ldap/l10n/ms_MY.php
index b3004028c58..5d3f8019ceb 100644
--- a/apps/user_ldap/l10n/ms_MY.php
+++ b/apps/user_ldap/l10n/ms_MY.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "Pemadaman gagal",
"Error" => "Ralat",
"Password" => "Kata laluan",
"Help" => "Bantuan"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/my_MM.php b/apps/user_ldap/l10n/my_MM.php
index ee8d3dd26fa..3d9c248f66a 100644
--- a/apps/user_ldap/l10n/my_MM.php
+++ b/apps/user_ldap/l10n/my_MM.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "စကားဝှက်",
"Help" => "အကူအညီ"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index 880fb41553f..8c482ed2a55 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to delete the server configuration" => "Klarte ikke å slette tjener-konfigurasjonen.",
"The configuration is valid and the connection could be established!" => "Konfigurasjonen er i orden og tilkoblingen skal være etablert!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasjonen er i orden, men Bind mislyktes. Vennligst sjekk tjener-konfigurasjonen og påloggingsinformasjonen.",
@@ -26,14 +27,8 @@
"Password" => "Passord",
"For anonymous access, leave DN and Password empty." => "For anonym tilgang, la DN- og passord-feltet stå tomt.",
"User Login Filter" => "Brukerpålogging filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definerer filteret som skal brukes når et påloggingsforsøk blir utført. %%uid erstatter brukernavnet i innloggingshandlingen.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "bruk %%uid plassholder, f.eks. \"uid=%%uid\"",
"User List Filter" => "Brukerliste filter",
-"Defines the filter to apply, when retrieving users." => "Definerer filteret som skal brukes, når systemet innhenter brukere.",
-"without any placeholder, e.g. \"objectClass=person\"." => "uten noe plassholder, f.eks. \"objectClass=person\".",
"Group Filter" => "Gruppefilter",
-"Defines the filter to apply, when retrieving groups." => "Definerer filteret som skal brukes, når systemet innhenter grupper.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "uten noe plassholder, f.eks. \"objectClass=posixGroup\".",
"Configuration Active" => "Konfigurasjon aktiv",
"When unchecked, this configuration will be skipped." => "Når ikke huket av så vil denne konfigurasjonen bli hoppet over.",
"Port" => "Port",
@@ -41,7 +36,6 @@
"Use TLS" => "Bruk TLS",
"Case insensitve LDAP server (Windows)" => "Case-insensitiv LDAP tjener (Windows)",
"Turn off SSL certificate validation." => "Slå av SSL-sertifikat validering",
-"Not recommended, use for testing only." => "Ikke anbefalt, bruk kun for testing",
"in seconds. A change empties the cache." => "i sekunder. En endring tømmer bufferen.",
"User Display Name Field" => "Vis brukerens navnfelt",
"Base User Tree" => "Hovedbruker tre",
@@ -54,3 +48,4 @@
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt.",
"Help" => "Hjelp"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index 6b42ce8116b..301cad98521 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Niet gelukt de vertalingen leeg te maken.",
"Failed to delete the server configuration" => "Verwijderen serverconfiguratie mislukt",
"The configuration is valid and the connection could be established!" => "De configuratie is geldig en de verbinding is geslaagd!",
@@ -15,6 +16,7 @@
"Connection test failed" => "Verbindingstest mislukt",
"Do you really want to delete the current Server Configuration?" => "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
"Confirm Deletion" => "Bevestig verwijderen",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. 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 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.",
"Server configuration" => "Serverconfiguratie",
"Add Server Configuration" => "Toevoegen serverconfiguratie",
@@ -28,14 +30,8 @@
"Password" => "Wachtwoord",
"For anonymous access, leave DN and Password empty." => "Voor anonieme toegang, laat de DN en het wachtwoord leeg.",
"User Login Filter" => "Gebruikers Login Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definiëerd de toe te passen filter indien er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam in de login actie.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "gebruik %%uid placeholder, bijv. \"uid=%%uid\"",
"User List Filter" => "Gebruikers Lijst Filter",
-"Defines the filter to apply, when retrieving users." => "Definiëerd de toe te passen filter voor het ophalen van gebruikers.",
-"without any placeholder, e.g. \"objectClass=person\"." => "zonder een placeholder, bijv. \"objectClass=person\"",
"Group Filter" => "Groep Filter",
-"Defines the filter to apply, when retrieving groups." => "Definiëerd de toe te passen filter voor het ophalen van groepen.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "zonder een placeholder, bijv. \"objectClass=posixGroup\"",
"Connection Settings" => "Verbindingsinstellingen",
"Configuration Active" => "Configuratie actief",
"When unchecked, this configuration will be skipped." => "Als dit niet is ingeschakeld wordt deze configuratie overgeslagen.",
@@ -49,8 +45,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Gebruik het niet voor LDAPS verbindingen, dat gaat niet lukken.",
"Case insensitve LDAP server (Windows)" => "Niet-hoofdlettergevoelige LDAP server (Windows)",
"Turn off SSL certificate validation." => "Schakel SSL certificaat validatie uit.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar de %s server.",
-"Not recommended, use for testing only." => "Niet aangeraden, gebruik alleen voor test doeleinden.",
"Cache Time-To-Live" => "Cache time-to-live",
"in seconds. A change empties the cache." => "in seconden. Een verandering maakt de cache leeg.",
"Directory Settings" => "Mapinstellingen",
@@ -74,12 +68,16 @@
"User Home Folder Naming Rule" => "Gebruikers Home map naamgevingsregel",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
"Internal Username" => "Interne gebruikersnaam",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Standaard wordt de interne gebruikersnaam aangemaakt op basis van het UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan​​: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een ​​gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle *DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van vóór ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op gekoppelde (toegevoegde) LDAP-gebruikers.",
"Internal Username Attribute:" => "Interne gebruikersnaam attribuut:",
"Override UUID detection" => "Negeren UUID detectie",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Standaard herkent ownCloud het UUID-attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen.",
"UUID Attribute:" => "UUID Attribuut:",
"Username-LDAP User Mapping" => "Gebruikersnaam-LDAP gebruikers vertaling",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de ownCloud gebruikersnaam aan een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne naam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving.",
"Clear Username-LDAP User Mapping" => "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
"Clear Groupname-LDAP Group Mapping" => "Leegmaken Groepsnaam-LDAP groep vertaling",
"Test Configuration" => "Test configuratie",
"Help" => "Help"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
index 45910022803..5e584aa31e3 100644
--- a/apps/user_ldap/l10n/nn_NO.php
+++ b/apps/user_ldap/l10n/nn_NO.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "Feil ved sletting",
"Error" => "Feil",
"Password" => "Passord",
"Help" => "Hjelp"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/oc.php b/apps/user_ldap/l10n/oc.php
index 95ab51caadd..81df26117f1 100644
--- a/apps/user_ldap/l10n/oc.php
+++ b/apps/user_ldap/l10n/oc.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "Fracàs d'escafatge",
"Error" => "Error",
"Password" => "Senhal",
"Help" => "Ajuda"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index ad577457a2f..7801f73dc12 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Nie udało się wyczyścić mapowania.",
"Failed to delete the server configuration" => "Nie można usunąć konfiguracji serwera",
"The configuration is valid and the connection could be established!" => "Konfiguracja jest prawidłowa i można ustanowić połączenie!",
@@ -28,14 +29,8 @@
"Password" => "Hasło",
"For anonymous access, leave DN and Password empty." => "Dla dostępu anonimowego pozostawić DN i hasło puste.",
"User Login Filter" => "Filtr logowania użytkownika",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definiuje filtr do zastosowania, gdy podejmowana jest próba logowania. %%uid zastępuje nazwę użytkownika w działaniu logowania.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "Użyj %%uid zastępczy, np. \"uid=%%uid\"",
"User List Filter" => "Lista filtrów użytkownika",
-"Defines the filter to apply, when retrieving users." => "Definiuje filtry do zastosowania, podczas pobierania użytkowników.",
-"without any placeholder, e.g. \"objectClass=person\"." => "bez żadnych symboli zastępczych np. \"objectClass=person\".",
"Group Filter" => "Grupa filtrów",
-"Defines the filter to apply, when retrieving groups." => "Definiuje filtry do zastosowania, podczas pobierania grup.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\".",
"Connection Settings" => "Konfiguracja połączeń",
"Configuration Active" => "Konfiguracja archiwum",
"When unchecked, this configuration will be skipped." => "Gdy niezaznaczone, ta konfiguracja zostanie pominięta.",
@@ -48,7 +43,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Nie używaj go dodatkowo dla połączeń protokołu LDAPS, zakończy się niepowodzeniem.",
"Case insensitve LDAP server (Windows)" => "Wielkość liter serwera LDAP (Windows)",
"Turn off SSL certificate validation." => "Wyłączyć sprawdzanie poprawności certyfikatu SSL.",
-"Not recommended, use for testing only." => "Niezalecane, użyj tylko testowo.",
"Cache Time-To-Live" => "Przechowuj czas życia",
"in seconds. A change empties the cache." => "w sekundach. Zmiana opróżnia pamięć podręczną.",
"Directory Settings" => "Ustawienia katalogów",
@@ -79,3 +73,4 @@
"Test Configuration" => "Konfiguracja testowa",
"Help" => "Pomoc"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index 35284b24b7a..88006e1b5d9 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Falha ao limpar os mapeamentos.",
"Failed to delete the server configuration" => "Falha ao deletar a configuração do servidor",
"The configuration is valid and the connection could be established!" => "A configuração é válida e a conexão foi estabelecida!",
@@ -29,14 +30,8 @@
"Password" => "Senha",
"For anonymous access, leave DN and Password empty." => "Para acesso anônimo, deixe DN e Senha vazios.",
"User Login Filter" => "Filtro de Login de Usuário",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define o filtro pra aplicar ao efetuar uma tentativa de login. %%uuid substitui o nome de usuário na ação de login.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "use %%uid placeholder, ex. \"uid=%%uid\"",
"User List Filter" => "Filtro de Lista de Usuário",
-"Defines the filter to apply, when retrieving users." => "Define filtro a ser aplicado ao obter usuários.",
-"without any placeholder, e.g. \"objectClass=person\"." => "sem nenhum espaço reservado, ex. \"objectClass=person\".",
"Group Filter" => "Filtro de Grupo",
-"Defines the filter to apply, when retrieving groups." => "Define o filtro a aplicar ao obter grupos.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sem nenhum espaço reservado, ex. \"objectClass=posixGroup\"",
"Connection Settings" => "Configurações de Conexão",
"Configuration Active" => "Configuração ativa",
"When unchecked, this configuration will be skipped." => "Quando não marcada, esta configuração será ignorada.",
@@ -50,8 +45,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Não use adicionalmente para conexões LDAPS, pois falhará.",
"Case insensitve LDAP server (Windows)" => "Servidor LDAP sensível à caixa alta (Windows)",
"Turn off SSL certificate validation." => "Desligar validação de certificado SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Se a conexão só funciona com esta opção, importe o certificado SSL do servidor LDAP no seu servidor %s.",
-"Not recommended, use for testing only." => "Não recomendado, use somente para testes.",
"Cache Time-To-Live" => "Cache Time-To-Live",
"in seconds. A change empties the cache." => "em segundos. Uma mudança esvaziará o cache.",
"Directory Settings" => "Configurações de Diretório",
@@ -87,3 +80,4 @@
"Test Configuration" => "Teste de Configuração",
"Help" => "Ajuda"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 0e5eac91c3e..b88ad18f0f6 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Falhou a limpar os mapas",
"Failed to delete the server configuration" => "Erro ao eliminar as configurações do servidor",
"The configuration is valid and the connection could be established!" => "A configuração está correcta e foi possível estabelecer a ligação!",
@@ -28,14 +29,8 @@
"Password" => "Password",
"For anonymous access, leave DN and Password empty." => "Para acesso anónimo, deixe DN e a Palavra-passe vazios.",
"User Login Filter" => "Filtro de login de utilizador",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "Use a variável %%uid , exemplo: \"uid=%%uid\"",
"User List Filter" => "Utilizar filtro",
-"Defines the filter to apply, when retrieving users." => "Defina o filtro a aplicar, ao recuperar utilizadores.",
-"without any placeholder, e.g. \"objectClass=person\"." => "Sem variável. Exemplo: \"objectClass=pessoa\".",
"Group Filter" => "Filtrar por grupo",
-"Defines the filter to apply, when retrieving groups." => "Defina o filtro a aplicar, ao recuperar grupos.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\".",
"Connection Settings" => "Definições de ligação",
"Configuration Active" => "Configuração activa",
"When unchecked, this configuration will be skipped." => "Se não estiver marcada, esta definição não será tida em conta.",
@@ -48,7 +43,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Não utilize para adicionar ligações LDAP, irá falhar!",
"Case insensitve LDAP server (Windows)" => "Servidor LDAP (Windows) não sensível a maiúsculas.",
"Turn off SSL certificate validation." => "Desligar a validação de certificado SSL.",
-"Not recommended, use for testing only." => "Não recomendado, utilizado apenas para testes!",
"Cache Time-To-Live" => "Cache do tempo de vida dos objetos no servidor",
"in seconds. A change empties the cache." => "em segundos. Uma alteração esvazia a cache.",
"Directory Settings" => "Definições de directorias",
@@ -79,3 +73,4 @@
"Test Configuration" => "Testar a configuração",
"Help" => "Ajuda"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index 2e03ddcca42..a0bacccb707 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "Ștergerea a eșuat",
"Success" => "Succes",
"Error" => "Eroare",
@@ -13,19 +14,12 @@
"Password" => "Parolă",
"For anonymous access, leave DN and Password empty." => "Pentru acces anonim, lăsați DN și Parolă libere.",
"User Login Filter" => "Filtrare după Nume Utilizator",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "folosiți substituentul %%uid , d.e. \"uid=%%uid\"",
"User List Filter" => "Filtrarea după lista utilizatorilor",
-"Defines the filter to apply, when retrieving users." => "Definește filtrele care trebui aplicate, când se peiau utilzatorii.",
-"without any placeholder, e.g. \"objectClass=person\"." => "fără substituenți, d.e. \"objectClass=person\".",
"Group Filter" => "Fitrare Grup",
-"Defines the filter to apply, when retrieving groups." => "Definește filtrele care se aplică, când se preiau grupurile.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "fără substituenți, d.e. \"objectClass=posixGroup\"",
"Port" => "Portul",
"Use TLS" => "Utilizează TLS",
"Case insensitve LDAP server (Windows)" => "Server LDAP insensibil la majuscule (Windows)",
"Turn off SSL certificate validation." => "Oprește validarea certificatelor SSL ",
-"Not recommended, use for testing only." => "Nu este recomandat, a se utiliza doar pentru testare.",
"in seconds. A change empties the cache." => "în secunde. O schimbare curăță memoria tampon.",
"User Display Name Field" => "Câmpul cu numele vizibil al utilizatorului",
"Base User Tree" => "Arborele de bază al Utilizatorilor",
@@ -38,3 +32,4 @@
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD.",
"Help" => "Ajutor"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index 704d8149904..f26e26f1e77 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Не удалось очистить соотвествия.",
"Failed to delete the server configuration" => "Не удалось удалить конфигурацию сервера",
"The configuration is valid and the connection could be established!" => "Конфигурация правильная и подключение может быть установлено!",
@@ -29,14 +30,8 @@
"Password" => "Пароль",
"For anonymous access, leave DN and Password empty." => "Для анонимного доступа оставьте DN и пароль пустыми.",
"User Login Filter" => "Фильтр входа пользователей",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "используйте заполнитель %%uid, например: \"uid=%%uid\"",
"User List Filter" => "Фильтр списка пользователей",
-"Defines the filter to apply, when retrieving users." => "Определяет фильтр для применения при получении пользователей.",
-"without any placeholder, e.g. \"objectClass=person\"." => "без заполнителя, например: \"objectClass=person\".",
"Group Filter" => "Фильтр группы",
-"Defines the filter to apply, when retrieving groups." => "Определяет фильтр для применения при получении группы.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без заполнения, например \"objectClass=posixGroup\".",
"Connection Settings" => "Настройки подключения",
"Configuration Active" => "Конфигурация активна",
"When unchecked, this configuration will be skipped." => "Когда галочка снята, эта конфигурация будет пропущена.",
@@ -49,7 +44,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Не используйте совместно с безопасными подключениями (LDAPS), это не сработает.",
"Case insensitve LDAP server (Windows)" => "Нечувствительный к регистру сервер LDAP (Windows)",
"Turn off SSL certificate validation." => "Отключить проверку сертификата SSL.",
-"Not recommended, use for testing only." => "Не рекомендуется, используйте только для тестирования.",
"Cache Time-To-Live" => "Кэш времени жизни",
"in seconds. A change empties the cache." => "в секундах. Изменение очистит кэш.",
"Directory Settings" => "Настройки каталога",
@@ -80,3 +74,4 @@
"Test Configuration" => "Тестовая конфигурация",
"Help" => "Помощь"
);
+$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);";
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
deleted file mode 100644
index 7b6833ebf8c..00000000000
--- a/apps/user_ldap/l10n/ru_RU.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Success" => "Успех",
-"Error" => "Ошибка"
-);
diff --git a/apps/user_ldap/l10n/si_LK.php b/apps/user_ldap/l10n/si_LK.php
index 1d81b341b46..5d2db636cf0 100644
--- a/apps/user_ldap/l10n/si_LK.php
+++ b/apps/user_ldap/l10n/si_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "මකාදැමීම අසාර්ථකයි",
"Success" => "සාර්ථකයි",
"Error" => "දෝෂයක්",
@@ -8,9 +9,8 @@
"User Login Filter" => "පරිශීලක පිවිසුම් පෙරහන",
"User List Filter" => "පරිශීලක ලැයිස්තු පෙරහන",
"Group Filter" => "කණ්ඩායම් පෙරහන",
-"Defines the filter to apply, when retrieving groups." => "කණ්ඩායම් සොයා ලබාගන්නා විට, යොදන පෙරහන නියම කරයි",
"Port" => "තොට",
"Use TLS" => "TLS භාවිතා කරන්න",
-"Not recommended, use for testing only." => "නිර්දේශ කළ නොහැක. පරීක්ෂණ සඳහා පමණක් භාවිත කරන්න",
"Help" => "උදව්"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index 6c0f10f8910..c5bb6a8a50c 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Nepodarilo sa vymazať mapovania.",
"Failed to delete the server configuration" => "Zlyhalo zmazanie nastavenia servera.",
"The configuration is valid and the connection could be established!" => "Nastavenie je v poriadku a pripojenie je stabilné.",
@@ -15,6 +16,7 @@
"Connection test failed" => "Test pripojenia zlyhal",
"Do you really want to delete the current Server Configuration?" => "Naozaj chcete zmazať súčasné nastavenie servera?",
"Confirm Deletion" => "Potvrdiť vymazanie",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenať neočakávané správanie. Požiadajte prosím vášho systémového administrátora pre zakázanie jedného z nich.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požádejte administrátora systému aby ho nainštaloval.",
"Server configuration" => "Nastavenia servera",
"Add Server Configuration" => "Pridať nastavenia servera.",
@@ -28,14 +30,8 @@
"Password" => "Heslo",
"For anonymous access, leave DN and Password empty." => "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
"User Login Filter" => "Filter prihlásenia používateľov",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "použite zástupný vzor %%uid, napr. \\\"uid=%%uid\\\"",
"User List Filter" => "Filter zoznamov používateľov",
-"Defines the filter to apply, when retrieving users." => "Definuje použitý filter, pre získanie používateľov.",
-"without any placeholder, e.g. \"objectClass=person\"." => "bez zástupných znakov, napr. \"objectClass=person\"",
"Group Filter" => "Filter skupiny",
-"Defines the filter to apply, when retrieving groups." => "Definuje použitý filter, pre získanie skupín.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez zástupných znakov, napr. \"objectClass=posixGroup\"",
"Connection Settings" => "Nastavenie pripojenia",
"Configuration Active" => "Nastavenia sú aktívne ",
"When unchecked, this configuration will be skipped." => "Ak nie je zaškrtnuté, nastavenie bude preskočené.",
@@ -44,20 +40,22 @@
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Zadajte záložný LDAP/AD. Musí to byť kópia hlavného LDAP/AD servera.",
"Backup (Replica) Port" => "Záložný server (kópia) port",
"Disable Main Server" => "Zakázať hlavný server",
+"Only connect to the replica server." => "Pripojiť sa len k záložnému serveru.",
"Use TLS" => "Použi TLS",
"Do not use it additionally for LDAPS connections, it will fail." => "Nepoužívajte pre pripojenie LDAPS, zlyhá.",
"Case insensitve LDAP server (Windows)" => "LDAP server nerozlišuje veľkosť znakov (Windows)",
"Turn off SSL certificate validation." => "Vypnúť overovanie SSL certifikátu.",
-"Not recommended, use for testing only." => "Nie je doporučované, len pre testovacie účely.",
"Cache Time-To-Live" => "Životnosť objektov v cache",
"in seconds. A change empties the cache." => "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť.",
"Directory Settings" => "Nastavenie priečinka",
"User Display Name Field" => "Pole pre zobrazenia mena používateľa",
+"The LDAP attribute to use to generate the user's display name." => "Atribút LDAP použitý na vygenerovanie zobrazovaného mena používateľa. ",
"Base User Tree" => "Základný používateľský strom",
"One User Base DN per line" => "Jedna používateľská základná DN na riadok",
"User Search Attributes" => "Atribúty vyhľadávania používateľov",
"Optional; one attribute per line" => "Voliteľné, jeden atribút na jeden riadok",
"Group Display Name Field" => "Pole pre zobrazenie mena skupiny",
+"The LDAP attribute to use to generate the groups's display name." => "Atribút LDAP použitý na vygenerovanie zobrazovaného mena skupiny.",
"Base Group Tree" => "Základný skupinový strom",
"One Group Base DN per line" => "Jedna skupinová základná DN na riadok",
"Group Search Attributes" => "Atribúty vyhľadávania skupín",
@@ -70,12 +68,16 @@
"User Home Folder Naming Rule" => "Pravidlo pre nastavenie mena používateľského priečinka dát",
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD.",
"Internal Username" => "Interné používateľské meno",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách používateľských mien bude číslo pridané / odobrané. Interné používateľské meno sa používa na internú identifikáciu používateľa. Je tiež predvoleným názvom používateľského domovského priečinka v ownCloud. Je tiež súčasťou URL pre vzdialený prístup, napríklad pre všetky služby * DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred verziou ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo namapovaných (pridaných) LDAP používateľov.",
"Internal Username Attribute:" => "Atribút interného používateľského mena:",
"Override UUID detection" => "Prepísať UUID detekciu",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID atribút je použitý na jedinečnú identifikáciu používateľov a skupín z LDAP. Naviac je na základe UUID vytvorené tiež interné použivateľské meno, ak nie je nastavené inak. Môžete predvolené nastavenie prepísať a použiť atribút ktorý si sami zvolíte. Musíte sa ale ubezpečiť, že atribút ktorý vyberiete bude uvedený pri použivateľoch, aj pri skupinách a je jedinečný. Ponechajte prázdne pre predvolené správanie. Zmena bude mať vplyv len na novo namapovaných (pridaných) používateľov a skupiny z LDAP.",
"UUID Attribute:" => "UUID atribút:",
"Username-LDAP User Mapping" => "Mapovanie názvov LDAP používateľských mien",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Použivateľské mená sa používajú pre uchovávanie a priraďovanie (meta)dát. Pre správnu identifikáciu a rozpoznanie používateľov bude mať každý používateľ z LDAP interné používateľské meno. To je nevyhnutné pre namapovanie používateľských mien na používateľov v LDAP. Vytvorené používateľské meno je namapované na UUID používateľa v LDAP. Naviac je cachovaná DN pre obmedzenie interakcie s LDAP, ale nie je používaná pre identifikáciu. Ak sa DN zmení, bude to správne rozpoznané. Interné používateľské meno sa používa všade. Vyčistenie namapování vymaže zvyšky všade. Vyčistenie naviac nie je špecifické, bude mať vplyv na všetky LDAP konfigurácie! Nikdy nečistite namapovanie v produkčnom prostredí, len v testovacej alebo experimentálnej fáze.",
"Clear Username-LDAP User Mapping" => "Zrušiť mapovanie LDAP používateľských mien",
"Clear Groupname-LDAP Group Mapping" => "Zrušiť mapovanie názvov LDAP skupín",
"Test Configuration" => "Test nastavenia",
"Help" => "Pomoc"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 63200df0e9c..703b643db58 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Preslikav ni bilo mogoče izbrisati",
"Failed to delete the server configuration" => "Brisanje nastavitev strežnika je spodletelo.",
"The configuration is valid and the connection could be established!" => "Nastavitev je veljavna, zato je povezavo mogoče vzpostaviti!",
@@ -28,14 +29,8 @@
"Password" => "Geslo",
"For anonymous access, leave DN and Password empty." => "Za brezimni dostop sta polji DN in geslo prazni.",
"User Login Filter" => "Filter prijav uporabnikov",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime v postopku prijave.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "Uporabite vsebnik %%uid, npr. \"uid=%%uid\".",
"User List Filter" => "Filter seznama uporabnikov",
-"Defines the filter to apply, when retrieving users." => "Določi filter za uporabo med pridobivanjem uporabnikov.",
-"without any placeholder, e.g. \"objectClass=person\"." => "Brez kateregakoli vsebnika, npr. \"objectClass=person\".",
"Group Filter" => "Filter skupin",
-"Defines the filter to apply, when retrieving groups." => "Določi filter za uporabo med pridobivanjem skupin.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\".",
"Connection Settings" => "Nastavitve povezave",
"Configuration Active" => "Dejavna nastavitev",
"When unchecked, this configuration will be skipped." => "Neizbrana možnost preskoči nastavitev.",
@@ -48,7 +43,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Strežnika ni priporočljivo uporabljati za povezave LDAPS. Povezava bo spodletela.",
"Case insensitve LDAP server (Windows)" => "Strežnik LDAP ne upošteva velikosti črk (Windows)",
"Turn off SSL certificate validation." => "Onemogoči določanje veljavnosti potrdila SSL.",
-"Not recommended, use for testing only." => "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja.",
"Cache Time-To-Live" => "Predpomni podatke TTL",
"in seconds. A change empties the cache." => "v sekundah. Sprememba izprazni predpomnilnik.",
"Directory Settings" => "Nastavitve mape",
@@ -79,3 +73,4 @@
"Test Configuration" => "Preizkusne nastavitve",
"Help" => "Pomoč"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/user_ldap/l10n/sq.php b/apps/user_ldap/l10n/sq.php
index 12324b9f966..2de62cc009a 100644
--- a/apps/user_ldap/l10n/sq.php
+++ b/apps/user_ldap/l10n/sq.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "Veprim i gabuar",
"Password" => "Kodi",
"Help" => "Ndihmë"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
index 5c066e675e4..d0c9290dc19 100644
--- a/apps/user_ldap/l10n/sr.php
+++ b/apps/user_ldap/l10n/sr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "Брисање није успело",
"Error" => "Грешка",
"Host" => "Домаћин",
@@ -9,19 +10,12 @@
"Password" => "Лозинка",
"For anonymous access, leave DN and Password empty." => "За анониман приступ, оставите поља DN и лозинка празним.",
"User Login Filter" => "Филтер за пријаву корисника",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Одређује филтер за примењивање при покушају пријаве. %%uid замењује корисничко име.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "користите чувар места %%uid, нпр. „uid=%%uid\"",
"User List Filter" => "Филтер за списак корисника",
-"Defines the filter to apply, when retrieving users." => "Одређује филтер за примењивање при прибављању корисника.",
-"without any placeholder, e.g. \"objectClass=person\"." => "без икаквог чувара места, нпр. „objectClass=person“.",
"Group Filter" => "Филтер групе",
-"Defines the filter to apply, when retrieving groups." => "Одређује филтер за примењивање при прибављању група.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без икаквог чувара места, нпр. „objectClass=posixGroup“.",
"Port" => "Порт",
"Use TLS" => "Користи TLS",
"Case insensitve LDAP server (Windows)" => "LDAP сервер осетљив на велика и мала слова (Windows)",
"Turn off SSL certificate validation." => "Искључите потврду SSL сертификата.",
-"Not recommended, use for testing only." => "Не препоручује се; користите само за тестирање.",
"in seconds. A change empties the cache." => "у секундама. Промена испражњава кеш меморију.",
"User Display Name Field" => "Име приказа корисника",
"Base User Tree" => "Основно стабло корисника",
@@ -31,3 +25,4 @@
"in bytes" => "у бајтовима",
"Help" => "Помоћ"
);
+$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);";
diff --git a/apps/user_ldap/l10n/sr@latin.php b/apps/user_ldap/l10n/sr@latin.php
index 005a76d4bbc..07db505ecf3 100644
--- a/apps/user_ldap/l10n/sr@latin.php
+++ b/apps/user_ldap/l10n/sr@latin.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Lozinka",
"Help" => "Pomoć"
);
+$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);";
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 2617ca414aa..c7fb33195d7 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "Fel vid rensning av mappningar",
"Failed to delete the server configuration" => "Misslyckades med att radera serverinställningen",
"The configuration is valid and the connection could be established!" => "Inställningen är giltig och anslutningen kunde upprättas!",
@@ -29,14 +30,8 @@
"Password" => "Lösenord",
"For anonymous access, leave DN and Password empty." => "För anonym åtkomst, lämna DN och lösenord tomt.",
"User Login Filter" => "Filter logga in användare",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "använd platshållare %%uid, t ex \"uid=%%uid\"",
"User List Filter" => "Filter lista användare",
-"Defines the filter to apply, when retrieving users." => "Definierar filter att tillämpa vid listning av användare.",
-"without any placeholder, e.g. \"objectClass=person\"." => "utan platshållare, t.ex. \"objectClass=person\".",
"Group Filter" => "Gruppfilter",
-"Defines the filter to apply, when retrieving groups." => "Definierar filter att tillämpa vid listning av grupper.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "utan platshållare, t.ex. \"objectClass=posixGroup\".",
"Connection Settings" => "Uppkopplingsinställningar",
"Configuration Active" => "Konfiguration aktiv",
"When unchecked, this configuration will be skipped." => "Ifall denna är avbockad så kommer konfigurationen att skippas.",
@@ -50,8 +45,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Använd inte för LDAPS-anslutningar, det kommer inte att fungera.",
"Case insensitve LDAP server (Windows)" => "LDAP-servern är okänslig för gemener och versaler (Windows)",
"Turn off SSL certificate validation." => "Stäng av verifiering av SSL-certifikat.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Om anslutningen bara fungerar med detta alternativ, importera LDAP-serverns SSL-certifikat i din% s server.",
-"Not recommended, use for testing only." => "Rekommenderas inte, använd bara för test. ",
"Cache Time-To-Live" => "Cache Time-To-Live",
"in seconds. A change empties the cache." => "i sekunder. En förändring tömmer cache.",
"Directory Settings" => "Mappinställningar",
@@ -87,3 +80,4 @@
"Test Configuration" => "Testa konfigurationen",
"Help" => "Hjälp"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ta_LK.php b/apps/user_ldap/l10n/ta_LK.php
index 0eed8ca12b5..25053f2e3d1 100644
--- a/apps/user_ldap/l10n/ta_LK.php
+++ b/apps/user_ldap/l10n/ta_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "நீக்கம் தோல்வியடைந்தது",
"Error" => "வழு",
"Host" => "ஓம்புனர்",
@@ -7,12 +8,10 @@
"You can specify Base DN for users and groups in the Advanced tab" => "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் ",
"User DN" => "பயனாளர் DN",
"Password" => "கடவுச்சொல்",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "எந்த ஒதுக்கீடும் இல்லாமல், உதாரணம். \"objectClass=posixGroup\".",
"Port" => "துறை ",
"Use TLS" => "TLS ஐ பயன்படுத்தவும்",
"Case insensitve LDAP server (Windows)" => "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)",
"Turn off SSL certificate validation." => "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்",
-"Not recommended, use for testing only." => "பரிந்துரைக்கப்படவில்லை, சோதனைக்காக மட்டும் பயன்படுத்தவும்.",
"in seconds. A change empties the cache." => "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்.",
"User Display Name Field" => "பயனாளர் காட்சிப்பெயர் புலம்",
"Base User Tree" => "தள பயனாளர் மரம்",
@@ -23,3 +22,4 @@
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்.",
"Help" => "உதவி"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/te.php b/apps/user_ldap/l10n/te.php
index 3f047631cf7..23728a9d34b 100644
--- a/apps/user_ldap/l10n/te.php
+++ b/apps/user_ldap/l10n/te.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "పొరపాటు",
"Password" => "సంకేతపదం",
"Help" => "సహాయం"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index a3e3ec2ac49..91d93e1235c 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to delete the server configuration" => "การลบการกำหนดค่าเซิร์ฟเวอร์ล้มเหลว",
"The configuration is valid and the connection could be established!" => "การกำหนดค่าถูกต้องและการเชื่อมต่อสามารถเชื่อมต่อได้!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "การกำหนดค่าถูกต้อง, แต่การผูกข้อมูลล้มเหลว, กรุณาตรวจสอบการตั้งค่าเซิร์ฟเวอร์และข้อมูลการเข้าใช้งาน",
@@ -25,21 +26,14 @@
"Password" => "รหัสผ่าน",
"For anonymous access, leave DN and Password empty." => "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้",
"User Login Filter" => "ตัวกรองข้อมูลการเข้าสู่ระบบของผู้ใช้งาน",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\"",
"User List Filter" => "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน",
-"Defines the filter to apply, when retrieving users." => "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน",
-"without any placeholder, e.g. \"objectClass=person\"." => "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\",",
"Group Filter" => "ตัวกรองข้อมูลกลุ่ม",
-"Defines the filter to apply, when retrieving groups." => "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\",",
"Connection Settings" => "ตั้งค่าการเชื่อมต่อ",
"Port" => "พอร์ต",
"Disable Main Server" => "ปิดใช้งานเซิร์ฟเวอร์หลัก",
"Use TLS" => "ใช้ TLS",
"Case insensitve LDAP server (Windows)" => "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)",
"Turn off SSL certificate validation." => "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL",
-"Not recommended, use for testing only." => "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น",
"in seconds. A change empties the cache." => "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า",
"Directory Settings" => "ตั้งค่าไดเร็กทอรี่",
"User Display Name Field" => "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ",
@@ -57,3 +51,4 @@
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD",
"Help" => "ช่วยเหลือ"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index aee38335343..fc9cceddf03 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to delete the server configuration" => "Sunucu yapılandırmasını silme başarısız oldu",
"The configuration is valid and the connection could be established!" => "Yapılandırma geçerli ve bağlantı kuruldu!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Yapılandırma geçerli fakat bağlanma(bind) başarısız. Lütfen Sunucu ayarları ve kimlik bilgilerini kontrol ediniz.",
@@ -25,14 +26,8 @@
"Password" => "Parola",
"For anonymous access, leave DN and Password empty." => "Anonim erişim için DN ve Parola alanlarını boş bırakın.",
"User Login Filter" => "Kullanıcı Oturum Filtresi",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Filter uyunlamak icin tayin ediyor, ne zaman girişmek isteminiz. % % uid adi kullanici girismeye karsi koymacak. ",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\"",
"User List Filter" => "Kullanıcı Liste Filtresi",
-"Defines the filter to apply, when retrieving users." => "Filter uyunmak icin tayin ediyor, ne zaman adi kullanici geri aliyor. ",
-"without any placeholder, e.g. \"objectClass=person\"." => "bir yer tutucusu olmadan, örneğin \"objectClass=person\"",
"Group Filter" => "Grup Süzgeci",
-"Defines the filter to apply, when retrieving groups." => "Filter uyunmak icin tayin ediyor, ne zaman grubalari tekrar aliyor. ",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "siz bir yer tutucu, mes. 'objectClass=posixGroup ('posixGrubu''. ",
"Connection Settings" => "Bağlantı ayarları",
"When unchecked, this configuration will be skipped." => "Ne zaman iptal, bu uynnlama isletici ",
"Port" => "Port",
@@ -44,7 +39,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Bu LDAPS baglama icin kullamaminiz, basamacak. ",
"Case insensitve LDAP server (Windows)" => "Dusme sunucu LDAP zor degil. (Windows)",
"Turn off SSL certificate validation." => "SSL sertifika doğrulamasını kapat.",
-"Not recommended, use for testing only." => "Önerilmez, sadece test için kullanın.",
"Cache Time-To-Live" => "Cache Time-To-Live ",
"in seconds. A change empties the cache." => "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir.",
"Directory Settings" => "Parametrar Listesin Adresinin ",
@@ -61,3 +55,4 @@
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kullanıcı adı bölümünü boş bırakın (varsayılan). ",
"Help" => "Yardım"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/ug.php b/apps/user_ldap/l10n/ug.php
index 8634cdbe1be..39382fed1f0 100644
--- a/apps/user_ldap/l10n/ug.php
+++ b/apps/user_ldap/l10n/ug.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "ئۆچۈرۈش مەغلۇپ بولدى",
"Error" => "خاتالىق",
"Host" => "باش ئاپپارات",
@@ -12,3 +13,4 @@
"Use TLS" => "TLS ئىشلەت",
"Help" => "ياردەم"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index 56c6f615ecc..5fb52761215 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to delete the server configuration" => "Не вдалося видалити конфігурацію сервера",
"The configuration is valid and the connection could be established!" => "Конфігурація вірна і зв'язок може бути встановлений ​​!",
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Конфігурація вірна, але встановити зв'язок не вдалося. Будь ласка, перевірте налаштування сервера і облікові дані.",
@@ -26,14 +27,8 @@
"Password" => "Пароль",
"For anonymous access, leave DN and Password empty." => "Для анонімного доступу, залиште DN і Пароль порожніми.",
"User Login Filter" => "Фільтр Користувачів, що під'єднуються",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\"",
"User List Filter" => "Фільтр Списку Користувачів",
-"Defines the filter to apply, when retrieving users." => "Визначає фільтр, який застосовується при отриманні користувачів",
-"without any placeholder, e.g. \"objectClass=person\"." => "без будь-якого заповнювача, наприклад: \"objectClass=person\".",
"Group Filter" => "Фільтр Груп",
-"Defines the filter to apply, when retrieving groups." => "Визначає фільтр, який застосовується при отриманні груп.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\".",
"Connection Settings" => "Налаштування З'єднання",
"Configuration Active" => "Налаштування Активне",
"When unchecked, this configuration will be skipped." => "Якщо \"галочка\" знята, ця конфігурація буде пропущена.",
@@ -46,7 +41,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Не використовуйте це додатково для під'єднання до LDAP, бо виконано не буде.",
"Case insensitve LDAP server (Windows)" => "Нечутливий до регістру LDAP сервер (Windows)",
"Turn off SSL certificate validation." => "Вимкнути перевірку SSL сертифіката.",
-"Not recommended, use for testing only." => "Не рекомендується, використовуйте лише для тестів.",
"Cache Time-To-Live" => "Час актуальності Кеша",
"in seconds. A change empties the cache." => "в секундах. Зміна очищує кеш.",
"Directory Settings" => "Налаштування Каталога",
@@ -70,3 +64,4 @@
"Test Configuration" => "Тестове налаштування",
"Help" => "Допомога"
);
+$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);";
diff --git a/apps/user_ldap/l10n/ur_PK.php b/apps/user_ldap/l10n/ur_PK.php
index 83570a596a2..a84be798f92 100644
--- a/apps/user_ldap/l10n/ur_PK.php
+++ b/apps/user_ldap/l10n/ur_PK.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "ایرر",
"Password" => "پاسورڈ",
"Help" => "مدد"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
index da7bc38e475..7ef961df7ad 100644
--- a/apps/user_ldap/l10n/vi.php
+++ b/apps/user_ldap/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "Xóa thất bại",
"Success" => "Thành công",
"Error" => "Lỗi",
@@ -11,14 +12,8 @@
"Password" => "Mật khẩu",
"For anonymous access, leave DN and Password empty." => "Cho phép truy cập nặc danh , DN và mật khẩu trống.",
"User Login Filter" => "Lọc người dùng đăng nhập",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Xác định các bộ lọc để áp dụng, khi đăng nhập . uid%% thay thế tên người dùng trong các lần đăng nhập.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "use %%uid placeholder, e.g. \"uid=%%uid\"",
"User List Filter" => "Lọc danh sách thành viên",
-"Defines the filter to apply, when retrieving users." => "Xác định các bộ lọc để áp dụng, khi người dụng sử dụng.",
-"without any placeholder, e.g. \"objectClass=person\"." => "mà không giữ chỗ nào, ví dụ như \"objectClass = person\".",
"Group Filter" => "Bộ lọc nhóm",
-"Defines the filter to apply, when retrieving groups." => "Xác định các bộ lọc để áp dụng, khi nhóm sử dụng.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "mà không giữ chỗ nào, ví dụ như \"objectClass = osixGroup\".",
"Connection Settings" => "Connection Settings",
"Port" => "Cổng",
"Backup (Replica) Port" => "Cổng sao lưu (Replica)",
@@ -27,7 +22,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "Do not use it additionally for LDAPS connections, it will fail.",
"Case insensitve LDAP server (Windows)" => "Trường hợp insensitve LDAP máy chủ (Windows)",
"Turn off SSL certificate validation." => "Tắt xác thực chứng nhận SSL",
-"Not recommended, use for testing only." => "Không khuyến khích, Chỉ sử dụng để thử nghiệm.",
"in seconds. A change empties the cache." => "trong vài giây. Một sự thay đổi bộ nhớ cache.",
"Directory Settings" => "Directory Settings",
"User Display Name Field" => "Hiển thị tên người sử dụng",
@@ -43,3 +37,4 @@
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD",
"Help" => "Giúp đỡ"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php
index fe52e32361e..306b84a588e 100644
--- a/apps/user_ldap/l10n/zh_CN.GB2312.php
+++ b/apps/user_ldap/l10n/zh_CN.GB2312.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Deletion failed" => "删除失败",
"Success" => "成功",
"Error" => "出错",
@@ -11,19 +12,12 @@
"Password" => "密码",
"For anonymous access, leave DN and Password empty." => "匿名访问请留空判别名和密码。",
"User Login Filter" => "用户登录过滤器",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "定义尝试登录时要应用的过滤器。用 %%uid 替换登录操作中使用的用户名。",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "使用 %%uid 占位符,例如 \"uid=%%uid\"",
"User List Filter" => "用户列表过滤器",
-"Defines the filter to apply, when retrieving users." => "定义撷取用户时要应用的过滤器。",
-"without any placeholder, e.g. \"objectClass=person\"." => "不能使用占位符,例如 \"objectClass=person\"。",
"Group Filter" => "群组过滤器",
-"Defines the filter to apply, when retrieving groups." => "定义撷取群组时要应用的过滤器",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "不能使用占位符,例如 \"objectClass=posixGroup\"。",
"Port" => "端口",
"Use TLS" => "使用 TLS",
"Case insensitve LDAP server (Windows)" => "大小写不敏感的 LDAP 服务器 (Windows)",
"Turn off SSL certificate validation." => "关闭 SSL 证书校验。",
-"Not recommended, use for testing only." => "不推荐,仅供测试",
"in seconds. A change empties the cache." => "以秒计。修改会清空缓存。",
"User Display Name Field" => "用户显示名称字段",
"Base User Tree" => "基本用户树",
@@ -34,3 +28,4 @@
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "用户名请留空 (默认)。否则,请指定一个 LDAP/AD 属性。",
"Help" => "帮助"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index 9abe4e7a967..c30cb421505 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "清除映射失败。",
"Failed to delete the server configuration" => "未能删除服务器配置",
"The configuration is valid and the connection could be established!" => "配置有效,能够建立连接!",
@@ -28,14 +29,8 @@
"Password" => "密码",
"For anonymous access, leave DN and Password empty." => "启用匿名访问,将DN和密码保留为空",
"User Login Filter" => "用户登录过滤",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "定义当尝试登录时的过滤器。 在登录过程中,%%uid将会被用户名替换",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "使用 %%uid作为占位符,例如“uid=%%uid”",
"User List Filter" => "用户列表过滤",
-"Defines the filter to apply, when retrieving users." => "定义拉取用户时的过滤器",
-"without any placeholder, e.g. \"objectClass=person\"." => "没有任何占位符,如 \"objectClass=person\".",
"Group Filter" => "组过滤",
-"Defines the filter to apply, when retrieving groups." => "定义拉取组信息时的过滤器",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "无需占位符,例如\"objectClass=posixGroup\"",
"Connection Settings" => "连接设置",
"Configuration Active" => "现行配置",
"When unchecked, this configuration will be skipped." => "当反选后,此配置将被忽略。",
@@ -48,7 +43,6 @@
"Do not use it additionally for LDAPS connections, it will fail." => "对于 LDAPS 连接不要额外启用它,连接必然失败。",
"Case insensitve LDAP server (Windows)" => "大小写敏感LDAP服务器(Windows)",
"Turn off SSL certificate validation." => "关闭SSL证书验证",
-"Not recommended, use for testing only." => "暂不推荐,仅供测试",
"Cache Time-To-Live" => "缓存存活时间",
"in seconds. A change empties the cache." => "以秒计。修改将清空缓存。",
"Directory Settings" => "目录设置",
@@ -79,3 +73,4 @@
"Test Configuration" => "测试配置",
"Help" => "帮助"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_HK.php b/apps/user_ldap/l10n/zh_HK.php
index ba55c414790..b656f0fc464 100644
--- a/apps/user_ldap/l10n/zh_HK.php
+++ b/apps/user_ldap/l10n/zh_HK.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Success" => "成功",
"Error" => "錯誤",
"Password" => "密碼",
"Port" => "連接埠",
"Help" => "幫助"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index 3612ca53c1d..38bed895742 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Failed to clear the mappings." => "清除映射失敗",
"Failed to delete the server configuration" => "刪除伺服器設定時失敗",
"The configuration is valid and the connection could be established!" => "設定有效且連線可建立",
@@ -26,14 +27,8 @@
"Password" => "密碼",
"For anonymous access, leave DN and Password empty." => "匿名連接時請將DN與密碼欄位留白",
"User Login Filter" => "使用者登入過濾器",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "試圖登入時會定義要套用的篩選器。登入過程中%%uid會取代使用者名稱。",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "請使用 %%uid placeholder,例如:\"uid=%%uid\"",
"User List Filter" => "使用者名單篩選器",
-"Defines the filter to apply, when retrieving users." => "檢索使用者時定義要套用的篩選器",
-"without any placeholder, e.g. \"objectClass=person\"." => "請勿使用任何placeholder,例如:\"objectClass=person\"。",
"Group Filter" => "群組篩選器",
-"Defines the filter to apply, when retrieving groups." => "檢索群組時,定義要套用的篩選器",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "請勿使用任何placeholder,例如:\"objectClass=posixGroup\"。",
"Connection Settings" => "連線設定",
"Configuration Active" => "設定為主動模式",
"When unchecked, this configuration will be skipped." => "沒有被勾選時,此設定會被略過。",
@@ -45,7 +40,6 @@
"Use TLS" => "使用TLS",
"Case insensitve LDAP server (Windows)" => "不區分大小寫的LDAP伺服器(Windows)",
"Turn off SSL certificate validation." => "關閉 SSL 憑證驗證",
-"Not recommended, use for testing only." => "不推薦使用,僅供測試用途。",
"Cache Time-To-Live" => "快取的存活時間",
"in seconds. A change empties the cache." => "以秒為單位。更變後會清空快取。",
"Directory Settings" => "目錄選項",
@@ -70,3 +64,4 @@
"Test Configuration" => "測試此設定",
"Help" => "說明"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 36c8e648b1a..e5d9b4d5b40 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -29,6 +29,9 @@ class Connection {
private $configID;
private $configured = false;
+ //whether connection should be kept on __destruct
+ private $dontDestruct = false;
+
//cache handler
protected $cache;
@@ -77,17 +80,31 @@ class Connection {
public function __construct($configPrefix = '', $configID = 'user_ldap') {
$this->configPrefix = $configPrefix;
$this->configID = $configID;
- $this->cache = \OC_Cache::getGlobalCache();
+ $memcache = new \OC\Memcache\Factory();
+ if($memcache->isAvailable()) {
+ $this->cache = $memcache->create();
+ } else {
+ $this->cache = \OC_Cache::getGlobalCache();
+ }
$this->config['hasPagedResultSupport'] = (function_exists('ldap_control_paged_result')
&& function_exists('ldap_control_paged_result_response'));
}
public function __destruct() {
- if(is_resource($this->ldapConnectionRes)) {
+ if(!$this->dontDestruct && is_resource($this->ldapConnectionRes)) {
@ldap_unbind($this->ldapConnectionRes);
};
}
+ /**
+ * @brief defines behaviour when the instance is cloned
+ */
+ public function __clone() {
+ //a cloned instance inherits the connection resource. It may use it,
+ //but it may not disconnect it
+ $this->dontDestruct = true;
+ }
+
public function __get($name) {
if(!$this->configured) {
$this->readConfiguration();
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index f65f466789f..4c9dd07a12c 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -71,6 +71,34 @@ class Helper {
}
/**
+ *
+ * @brief determines the host for every configured connection
+ * @return an array with configprefix as keys
+ *
+ */
+ static public function getServerConfigurationHosts() {
+ $referenceConfigkey = 'ldap_host';
+
+ $query = '
+ SELECT DISTINCT `configkey`, `configvalue`
+ FROM `*PREFIX*appconfig`
+ WHERE `appid` = \'user_ldap\'
+ AND `configkey` LIKE ?
+ ';
+ $query = \OCP\DB::prepare($query);
+ $configHosts = $query->execute(array('%'.$referenceConfigkey))->fetchAll();
+ $result = array();
+
+ foreach($configHosts as $configHost) {
+ $len = strlen($configHost['configkey']) - strlen($referenceConfigkey);
+ $prefix = substr($configHost['configkey'], 0, $len);
+ $result[$prefix] = $configHost['configvalue'];
+ }
+
+ return $result;
+ }
+
+ /**
* @brief deletes a given saved LDAP/AD server configuration.
* @param string the configuration prefix of the config to delete
* @return bool true on success, false otherwise
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index d626afed6c3..6b7666d4ca1 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -82,7 +82,7 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
$hasChanged = true;
}
foreach(array_diff($actualUsers, $knownUsers) as $addedUser) {
- \OCP\Util::emitHook('OC_User', 'post_addFromGroup', array('uid' => $addedUser, 'gid' => $group));
+ \OCP\Util::emitHook('OC_User', 'post_addToGroup', array('uid' => $addedUser, 'gid' => $group));
\OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – "'.$addedUser.'" added to "'.$group.'".',
\OCP\Util::INFO);
diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php
index c80e2163475..ae3e3be7361 100644
--- a/apps/user_ldap/lib/proxy.php
+++ b/apps/user_ldap/lib/proxy.php
@@ -101,4 +101,4 @@ abstract class Proxy {
public function clearCache() {
$this->cache->clear($this->getCacheKey(null));
}
-} \ No newline at end of file
+}
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 22e2dac6d26..7169192a18e 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -44,7 +44,9 @@ OCP\Util::addstyle('user_ldap', 'settings');
$tmpl = new OCP\Template('user_ldap', 'settings');
$prefixes = \OCA\user_ldap\lib\Helper::getServerConfigurationPrefixes();
+$hosts = \OCA\user_ldap\lib\Helper::getServerConfigurationHosts();
$tmpl->assign('serverConfigurationPrefixes', $prefixes);
+$tmpl->assign('serverConfigurationHosts', $hosts);
// assign default values
if(!isset($ldap)) {
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 95aa592594b..e214d57fb1d 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -24,7 +24,7 @@
$sel = ' selected';
foreach($_['serverConfigurationPrefixes'] as $prefix) {
?>
- <option value="<?php p($prefix); ?>"<?php p($sel); ?>><?php p($i++); ?>. Server</option>
+ <option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($i++); ?>. Server: <?php p($_['serverConfigurationHosts'][$prefix]); ?></option>
<?php
}
}
@@ -51,18 +51,15 @@
<p><label for="ldap_login_filter"><?php p($l->t('User Login Filter'));?></label>
<input type="text" id="ldap_login_filter" name="ldap_login_filter"
data-default="<?php p($_['ldap_login_filter_default']); ?>"
- title="<?php p($l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action.'));?>" />
- <br /><small><?php p($l->t('use %%uid placeholder, e.g. "uid=%%uid"'));?></small></p>
+ title="<?php p($l->t('Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: "uid=%%uid"'));?>" /></p>
<p><label for="ldap_userlist_filter"><?php p($l->t('User List Filter'));?></label>
<input type="text" id="ldap_userlist_filter" name="ldap_userlist_filter"
data-default="<?php p($_['ldap_userlist_filter_default']); ?>"
- title="<?php p($l->t('Defines the filter to apply, when retrieving users.'));?>" />
- <br /><small><?php p($l->t('without any placeholder, e.g. "objectClass=person".'));?></small></p>
+ title="<?php p($l->t('Defines the filter to apply, when retrieving users (no placeholders). Example: "objectClass=person"'));?>" /></p>
<p><label for="ldap_group_filter"><?php p($l->t('Group Filter'));?></label>
<input type="text" id="ldap_group_filter" name="ldap_group_filter"
data-default="<?php p($_['ldap_group_filter_default']); ?>"
- title="<?php p($l->t('Defines the filter to apply, when retrieving groups.'));?>" />
- <br /><small><?php p($l->t('without any placeholder, e.g. "objectClass=posixGroup".'));?></small></p>
+ title="<?php p($l->t('Defines the filter to apply, when retrieving groups (no placeholders). Example: "objectClass=posixGroup"'));?>" /></p>
</fieldset>
<fieldset id="ldapSettings-2">
<div id="ldapAdvancedAccordion">
@@ -75,7 +72,7 @@
<p><label for="ldap_override_main_server"><?php p($l->t('Disable Main Server'));?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php p($_['ldap_override_main_server_default']); ?>" title="<?php p($l->t('Only connect to the replica server.'));?>" /></p>
<p><label for="ldap_tls"><?php p($l->t('Use TLS'));?></label><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1" data-default="<?php p($_['ldap_tls_default']); ?>" title="<?php p($l->t('Do not use it additionally for LDAPS connections, it will fail.'));?>" /></p>
<p><label for="ldap_nocase"><?php p($l->t('Case insensitve LDAP server (Windows)'));?></label><input type="checkbox" id="ldap_nocase" name="ldap_nocase" data-default="<?php p($_['ldap_nocase_default']); ?>" value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) p(' checked'); ?>></p>
- <p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', $theme->getName() ));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/><small><?php p($l->t('Not recommended, use for testing only.'));?></small></p>
+ <p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('Not recommended, use it for testing only! If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', $theme->getName() ));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/></p>
<p><label for="ldap_cache_ttl"><?php p($l->t('Cache Time-To-Live'));?></label><input type="number" id="ldap_cache_ttl" name="ldap_cache_ttl" title="<?php p($l->t('in seconds. A change empties the cache.'));?>" data-default="<?php p($_['ldap_cache_ttl_default']); ?>" /></p>
</div>
<h3><?php p($l->t('Directory Settings'));?></h3>
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 41e2926605e..850ca0df995 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -77,11 +77,6 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
}
$dn = $ldap_users[0];
- //are the credentials OK?
- if(!$this->areCredentialsValid($dn, $password)) {
- return false;
- }
-
//do we have a username for him/her?
$ocname = $this->dn2username($dn);
@@ -90,6 +85,11 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
$this->updateQuota($dn);
$this->updateEmail($dn);
+ //are the credentials OK?
+ if(!$this->areCredentialsValid($dn, $password)) {
+ return false;
+ }
+
//give back the display name
return $ocname;
}
diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php
index 73cc0963182..0722d8871a4 100644
--- a/apps/user_ldap/user_proxy.php
+++ b/apps/user_ldap/user_proxy.php
@@ -198,4 +198,4 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
return $this->refBackend->hasUserListings();
}
-} \ No newline at end of file
+}
diff --git a/apps/user_webdavauth/l10n/ar.php b/apps/user_webdavauth/l10n/ar.php
index e708a054099..bdb335fadb4 100644
--- a/apps/user_webdavauth/l10n/ar.php
+++ b/apps/user_webdavauth/l10n/ar.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "تأكد شخصية ال WebDAV"
);
+$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;";
diff --git a/apps/user_webdavauth/l10n/bg_BG.php b/apps/user_webdavauth/l10n/bg_BG.php
index 4f2a7609d73..14e6b280fd2 100644
--- a/apps/user_webdavauth/l10n/bg_BG.php
+++ b/apps/user_webdavauth/l10n/bg_BG.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV идентификация"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/ca.php b/apps/user_webdavauth/l10n/ca.php
index b046e58cee6..e1f8fd9b2ec 100644
--- a/apps/user_webdavauth/l10n/ca.php
+++ b/apps/user_webdavauth/l10n/ca.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticació WebDAV",
"Address: " => "Adreça:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Les credencials d'usuari s'enviaran a aquesta adreça. Aquest connector comprova la resposta i interpreta els codis d'estat 401 i 403 com a credencials no vàlides, i qualsevol altra resposta com a credencials vàlides."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/cs_CZ.php b/apps/user_webdavauth/l10n/cs_CZ.php
index e6664d4d7b6..dfeac535eb8 100644
--- a/apps/user_webdavauth/l10n/cs_CZ.php
+++ b/apps/user_webdavauth/l10n/cs_CZ.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Ověření WebDAV",
"Address: " => "Adresa:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Uživatelské přihlašovací údaje budou odeslány na tuto adresu. Tento plugin zkontroluje odpověď serveru a interpretuje návratový kód HTTP 401 a 403 jako neplatné přihlašovací údaje a jakýkoli jiný jako platné přihlašovací údaje."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_webdavauth/l10n/da.php b/apps/user_webdavauth/l10n/da.php
index 347267e53c7..2889a1b42a0 100644
--- a/apps/user_webdavauth/l10n/da.php
+++ b/apps/user_webdavauth/l10n/da.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV-godkendelse",
"Address: " => "Adresse:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Bruger oplysningerne vil blive sendt til denne adresse. Plugin'et registrerer responsen og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/de.php b/apps/user_webdavauth/l10n/de.php
index f0e7f5dc6ef..3ddc0331334 100644
--- a/apps/user_webdavauth/l10n/de.php
+++ b/apps/user_webdavauth/l10n/de.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV Authentifikation",
"Address: " => "Addresse: ",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php
index ff55a5d8951..2c31957d251 100644
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ b/apps/user_webdavauth/l10n/de_DE.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV-Authentifizierung",
"Address: " => "Adresse:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/el.php b/apps/user_webdavauth/l10n/el.php
index 7150e77b9dc..4a9ab3bafcc 100644
--- a/apps/user_webdavauth/l10n/el.php
+++ b/apps/user_webdavauth/l10n/el.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Αυθεντικοποίηση μέσω WebDAV ",
"Address: " => "Διεύθυνση:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Τα διαπιστευτήρια του χρήστη θα σταλούν σε αυτή την διεύθυνση. Αυτό το πρόσθετο ελέγχει την απόκριση και θα ερμηνεύσει τους κωδικούς κατάστασης HTTP 401 και 402 ως μη έγκυρα διαπιστευτήρια και όλες τις άλλες αποκρίσεις ως έγκυρα διαπιστευτήρια."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/eo.php b/apps/user_webdavauth/l10n/eo.php
index 0e1fda7c4c2..ddcac32ca1b 100644
--- a/apps/user_webdavauth/l10n/eo.php
+++ b/apps/user_webdavauth/l10n/eo.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV-aŭtentigo"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/es.php b/apps/user_webdavauth/l10n/es.php
index 262122cf9c3..cd8ec6659a4 100644
--- a/apps/user_webdavauth/l10n/es.php
+++ b/apps/user_webdavauth/l10n/es.php
@@ -1,3 +1,7 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "Autenticación de WevDAV"
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "Autenticación de WevDAV",
+"Address: " => "Dirección:",
+"The user credentials will be sent to this address. 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 dirección. 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."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/es_AR.php b/apps/user_webdavauth/l10n/es_AR.php
index 262122cf9c3..608b0ad8179 100644
--- a/apps/user_webdavauth/l10n/es_AR.php
+++ b/apps/user_webdavauth/l10n/es_AR.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticación de WevDAV"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/et_EE.php b/apps/user_webdavauth/l10n/et_EE.php
index e2f359f738e..34b07c654a5 100644
--- a/apps/user_webdavauth/l10n/et_EE.php
+++ b/apps/user_webdavauth/l10n/et_EE.php
@@ -1,3 +1,7 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV autentimine"
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV autentimine",
+"Address: " => "Aadress:",
+"The user credentials will be sent to this address. 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 saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab HTTP vastuskoodid 401 ja 403 kui vigased, ning kõik teised vastused kui korrektsed kasutajatunnused."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/eu.php b/apps/user_webdavauth/l10n/eu.php
index 686df69f08a..29794115fcd 100644
--- a/apps/user_webdavauth/l10n/eu.php
+++ b/apps/user_webdavauth/l10n/eu.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV Autentikazioa",
"Address: " => "Helbidea:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Erabiltzailearen kredentzialak helbide honetara bidaliko dira. Plugin honek erantzuna aztertu eta HTTP 401 eta 403 egoera-kodeak kredentzial ez-egokitzat hartuko ditu, eta beste edozein erantzun, aldiz, kredentzial egokitzat."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/fi_FI.php b/apps/user_webdavauth/l10n/fi_FI.php
index ed5085f7f05..a31e09bc72a 100644
--- a/apps/user_webdavauth/l10n/fi_FI.php
+++ b/apps/user_webdavauth/l10n/fi_FI.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV-todennus",
"Address: " => "Osoite:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Käyttäjätiedot lähetetään tähän osoitteeseen. Liitännäinen tarkistaa vastauksen, ja tulkitsee HTTP-tilakoodit 401 ja 403 vääriksi käyttäjätiedoiksi. Kaikki muut vastaukset tulkitaan kelvollisiksi käyttäjätiedoiksi."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php
index 1957bbaa30b..0130e35c816 100644
--- a/apps/user_webdavauth/l10n/fr.php
+++ b/apps/user_webdavauth/l10n/fr.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Authentification WebDAV"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/gl.php b/apps/user_webdavauth/l10n/gl.php
index a989f013021..1d0c38e08f8 100644
--- a/apps/user_webdavauth/l10n/gl.php
+++ b/apps/user_webdavauth/l10n/gl.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticación WebDAV",
"Address: " => "Enderezo:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "As credenciais do usuario serán enviadas a este enderezo. Este engadido comproba a resposta e interpretará os códigos de estado 401 e 403 como credenciais incorrectas, e todas as outras respostas como credenciais correctas."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/he.php b/apps/user_webdavauth/l10n/he.php
index 724acc0e3d2..d11fce81a36 100644
--- a/apps/user_webdavauth/l10n/he.php
+++ b/apps/user_webdavauth/l10n/he.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "הזדהות מול WebDAV"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/hu_HU.php b/apps/user_webdavauth/l10n/hu_HU.php
index 97423ce5fb7..63fc084ff4c 100644
--- a/apps/user_webdavauth/l10n/hu_HU.php
+++ b/apps/user_webdavauth/l10n/hu_HU.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV hitelesítés"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/id.php b/apps/user_webdavauth/l10n/id.php
index 22ca0557532..278055ce8c2 100644
--- a/apps/user_webdavauth/l10n/id.php
+++ b/apps/user_webdavauth/l10n/id.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Otentikasi WebDAV"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/is.php b/apps/user_webdavauth/l10n/is.php
index 10dcfa6e3d3..4fcab076542 100644
--- a/apps/user_webdavauth/l10n/is.php
+++ b/apps/user_webdavauth/l10n/is.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV Auðkenni"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/it.php b/apps/user_webdavauth/l10n/it.php
index 0d2b3f7f7c1..7e2003997e5 100644
--- a/apps/user_webdavauth/l10n/it.php
+++ b/apps/user_webdavauth/l10n/it.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticazione WebDAV",
"Address: " => "Indirizzo:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Le credenziali dell'utente saranno inviate a questo indirizzo. Questa estensione controlla la risposta e interpreterà i codici di stato HTTP 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/ja_JP.php b/apps/user_webdavauth/l10n/ja_JP.php
index 6dbbc8ce856..bab7be008ef 100644
--- a/apps/user_webdavauth/l10n/ja_JP.php
+++ b/apps/user_webdavauth/l10n/ja_JP.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV 認証",
"Address: " => "アドレス:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ユーザーの権限情報をこのアドレスに送信します。このプラグインは応答をチェックし、HTTP状態コードが 401 と 403 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/ka_GE.php b/apps/user_webdavauth/l10n/ka_GE.php
index 343cccd64f1..c2aa956072c 100644
--- a/apps/user_webdavauth/l10n/ka_GE.php
+++ b/apps/user_webdavauth/l10n/ka_GE.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV აუთენთიფიკაცია"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/ko.php b/apps/user_webdavauth/l10n/ko.php
index ff1d4cb805e..2d2c4d70e73 100644
--- a/apps/user_webdavauth/l10n/ko.php
+++ b/apps/user_webdavauth/l10n/ko.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV 인증"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/lt_LT.php b/apps/user_webdavauth/l10n/lt_LT.php
index 106c1d034cd..90fc2d5ac3e 100644
--- a/apps/user_webdavauth/l10n/lt_LT.php
+++ b/apps/user_webdavauth/l10n/lt_LT.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV autorizavimas"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/lv.php b/apps/user_webdavauth/l10n/lv.php
index 24dbc9c8600..7ce96285881 100644
--- a/apps/user_webdavauth/l10n/lv.php
+++ b/apps/user_webdavauth/l10n/lv.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV autentifikācija"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/nl.php b/apps/user_webdavauth/l10n/nl.php
index 68669710f2f..d763789f17a 100644
--- a/apps/user_webdavauth/l10n/nl.php
+++ b/apps/user_webdavauth/l10n/nl.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV authenticatie",
"Address: " => "Adres:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "De ingloggegevens worden opgestuurd naar dit adres. Deze plugin controleert de terugkoppeling en interpreteert de HTTP statuscodes 401 en 403 als invalide inloggegevens, en alle andere terugkoppelingen als valide inloggegevens."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/nn_NO.php b/apps/user_webdavauth/l10n/nn_NO.php
index beb8af80bda..519b942f9f5 100644
--- a/apps/user_webdavauth/l10n/nn_NO.php
+++ b/apps/user_webdavauth/l10n/nn_NO.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV-autentisering"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/pl.php b/apps/user_webdavauth/l10n/pl.php
index 5dc99eb0c20..9c39be04385 100644
--- a/apps/user_webdavauth/l10n/pl.php
+++ b/apps/user_webdavauth/l10n/pl.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Uwierzytelnienie WebDAV",
"Address: " => "Adres:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Dane uwierzytelniające użytkownika zostaną wysłane na ten adres. Wtyczka sprawdza odpowiedź i będzie interpretował status HTTP 401 i 403 jako nieprawidłowe dane uwierzytelniające i wszystkie inne odpowiedzi jako prawidłowe uwierzytelnienie."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/pt_BR.php b/apps/user_webdavauth/l10n/pt_BR.php
index f5c000ae6e0..6dde16ff4e0 100644
--- a/apps/user_webdavauth/l10n/pt_BR.php
+++ b/apps/user_webdavauth/l10n/pt_BR.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticação WebDAV",
"Address: " => "Endereço:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "As credenciais de usuário serão enviadas para este endereço. Este plugin verifica a resposta e interpretará os códigos de status HTTP 401 e 403 como \"credenciais inválidas\", e todas as outras respostas como \"credenciais válidas\"."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/pt_PT.php b/apps/user_webdavauth/l10n/pt_PT.php
index 75bfe976b46..f21d9c0bb9a 100644
--- a/apps/user_webdavauth/l10n/pt_PT.php
+++ b/apps/user_webdavauth/l10n/pt_PT.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Autenticação WebDAV",
"Address: " => "Endereço:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "As credenciais do utilizador vão ser enviadas para endereço 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 respostas como válidas."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/ro.php b/apps/user_webdavauth/l10n/ro.php
index 177f06154fb..5780805a884 100644
--- a/apps/user_webdavauth/l10n/ro.php
+++ b/apps/user_webdavauth/l10n/ro.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Autentificare WebDAV"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/user_webdavauth/l10n/ru.php b/apps/user_webdavauth/l10n/ru.php
index effd19d0f9a..76c18a37c20 100644
--- a/apps/user_webdavauth/l10n/ru.php
+++ b/apps/user_webdavauth/l10n/ru.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Идентификация WebDAV",
"Address: " => "Адрес:",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Учётные данные пользователя будут отправлены на этот адрес. Плагин проверит ответ и будет рассматривать HTTP коды 401 и 403 как неверные учётные данные, при любом другом ответе - учётные данные пользователя верны."
);
+$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);";
diff --git a/apps/user_webdavauth/l10n/ru_RU.php b/apps/user_webdavauth/l10n/ru_RU.php
deleted file mode 100644
index 46f74cb972f..00000000000
--- a/apps/user_webdavauth/l10n/ru_RU.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV аутентификация",
-"URL: http://" => "URL: http://"
-);
diff --git a/apps/user_webdavauth/l10n/sk_SK.php b/apps/user_webdavauth/l10n/sk_SK.php
index 9f2d8049c12..017f923c2b5 100644
--- a/apps/user_webdavauth/l10n/sk_SK.php
+++ b/apps/user_webdavauth/l10n/sk_SK.php
@@ -1,3 +1,7 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV overenie"
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV overenie",
+"Address: " => "Adresa: ",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Používateľské prihlasovacie údaje budú odoslané na túto adresu. Tento plugin skontroluje odpoveď servera a interpretuje návratový kód HTTP 401 a 403 ako neplatné prihlasovacie údaje a akýkoľvek iný ako platné prihlasovacie údaje."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_webdavauth/l10n/sl.php b/apps/user_webdavauth/l10n/sl.php
index 93e6ce3fc42..f58232b37bd 100644
--- a/apps/user_webdavauth/l10n/sl.php
+++ b/apps/user_webdavauth/l10n/sl.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Overitev WebDAV"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/user_webdavauth/l10n/sr.php b/apps/user_webdavauth/l10n/sr.php
index 07f067c343a..5cb00494033 100644
--- a/apps/user_webdavauth/l10n/sr.php
+++ b/apps/user_webdavauth/l10n/sr.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV провера идентитета"
);
+$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);";
diff --git a/apps/user_webdavauth/l10n/sv.php b/apps/user_webdavauth/l10n/sv.php
index 6aae1c2e1a8..7595e61efe5 100644
--- a/apps/user_webdavauth/l10n/sv.php
+++ b/apps/user_webdavauth/l10n/sv.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV Autentisering",
"Address: " => "Adress: ",
"The user credentials will be sent to this address. 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."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/th_TH.php b/apps/user_webdavauth/l10n/th_TH.php
index f73058ee42e..102adaca4ab 100644
--- a/apps/user_webdavauth/l10n/th_TH.php
+++ b/apps/user_webdavauth/l10n/th_TH.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV Authentication"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/tr.php b/apps/user_webdavauth/l10n/tr.php
index fc593631785..907fb88b864 100644
--- a/apps/user_webdavauth/l10n/tr.php
+++ b/apps/user_webdavauth/l10n/tr.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV Kimlik doğrulaması"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/ug.php b/apps/user_webdavauth/l10n/ug.php
index 7231d0c5708..8ad7963d49f 100644
--- a/apps/user_webdavauth/l10n/ug.php
+++ b/apps/user_webdavauth/l10n/ug.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV سالاھىيەت دەلىللەش"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/uk.php b/apps/user_webdavauth/l10n/uk.php
index ade36d140f3..fcde044ec75 100644
--- a/apps/user_webdavauth/l10n/uk.php
+++ b/apps/user_webdavauth/l10n/uk.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Аутентифікація WebDAV"
);
+$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);";
diff --git a/apps/user_webdavauth/l10n/vi.php b/apps/user_webdavauth/l10n/vi.php
index 137362b95f5..1ab4687922f 100644
--- a/apps/user_webdavauth/l10n/vi.php
+++ b/apps/user_webdavauth/l10n/vi.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "Xác thực WebDAV"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php
index f23a692a811..69046042160 100644
--- a/apps/user_webdavauth/l10n/zh_CN.php
+++ b/apps/user_webdavauth/l10n/zh_CN.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV 认证"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/zh_TW.php b/apps/user_webdavauth/l10n/zh_TW.php
index 5e8cab26571..013a1652f32 100644
--- a/apps/user_webdavauth/l10n/zh_TW.php
+++ b/apps/user_webdavauth/l10n/zh_TW.php
@@ -1,3 +1,7 @@
-<?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV 認證"
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV 認證",
+"Address: " => "為址",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "使用者憑證將會被傳送到此位址。此外掛程式將會檢查回應,HTTP statuscodes 401與403將會被理解為無效憑證,而所有其他的回應將會被理解為有效憑證。"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index c9c64207798..e829453dbcc 100644
--- a/core/ajax/translations.php
+++ b/core/ajax/translations.php
@@ -27,4 +27,4 @@ $app = OC_App::cleanAppId($app);
$l = OC_L10N::get( $app );
-OC_JSON::success(array('data' => $l->getTranslations()));
+OC_JSON::success(array('data' => $l->getTranslations(), 'plural_form' => $l->getPluralFormString()));
diff --git a/core/css/auth.css b/core/css/auth.css
index bce7fa7b711..0adc10c77d9 100644
--- a/core/css/auth.css
+++ b/core/css/auth.css
@@ -36,4 +36,4 @@ h2 img {
font-size:1.2em;
margin:.7em;
padding:0;
-} \ No newline at end of file
+}
diff --git a/core/css/styles.css b/core/css/styles.css
index 0dd66fb5b7c..52a265d2031 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -19,7 +19,10 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
#body-user #header, #body-settings #header {
position:fixed; top:0; left:0; right:0; z-index:100; height:45px; line-height:2.5em;
background:#1d2d44 url('../img/noise.png') repeat;
- -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; }
+ -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5);
+ -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5);
+ box-shadow:0 0 10px rgba(0, 0, 0, .5);
+}
#body-login {
text-align: center;
@@ -42,7 +45,7 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"],
textarea, select,
button, .button,
-#quota, div.jp-progress, .pager li a {
+#quota, .pager li a {
width:10em; margin:.3em; padding:.6em .5em .4em;
font-size:1em;
background:#fff; color:#333; border:1px solid #ddd; outline:none;
@@ -82,7 +85,7 @@ input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#
/* BUTTONS */
input[type="submit"], input[type="button"],
button, .button,
-#quota, div.jp-progress, select, .pager li a {
+#quota, select, .pager li a {
width:auto; padding:.4em;
background-color:rgba(240,240,240,.9); font-weight:bold; color:#555; text-shadow:rgba(255,255,255,.9) 0 1px 0; border:1px solid rgba(190,190,190,.9); cursor:pointer;
-moz-box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; -webkit-box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset;
@@ -142,7 +145,7 @@ a.disabled, a.disabled:hover, a.disabled:focus {
.searchbox input[type="search"] { font-size:1.2em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; margin-top:10px; float:right; }
input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; }
-#select_all{ margin-top:.4em !important;}
+#select_all{ margin-top:.4em }
/* CONTENT ------------------------------------------------------------------ */
#controls {
@@ -158,7 +161,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
#content { position:relative; height:100%; width:100%; }
#content .hascontrols { position: relative; top: 2.9em; }
#content-wrapper {
- position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:64px;
+ position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:80px;
-moz-box-sizing:border-box; box-sizing:border-box;
}
#leftcontent, .leftcontent {
@@ -193,11 +196,12 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
#body-login #datadirContent label,
#body-login form input[type="checkbox"]+label {
text-align: center;
- color: #000;
+ color: #ccc;
text-shadow: 0 1px 0 rgba(255,255,255,.1);
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
- filter: alpha(opacity=80);
- opacity: .8;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
+ filter: alpha(opacity=60);
+ opacity: .6;
+ text-shadow: 0 -1px 0 rgba(0,0,0,.5);
}
#body-login div.buttons { text-align:center; }
@@ -304,6 +308,31 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
#body-login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
#body-login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;}
+#body-login #remember_login:hover+label,
+#body-login #remember_login:focus+label {
+ color: #fff !important;
+}
+
+#body-login #showAdvanced > img {
+ height: 16px;
+ width: 16px;
+ padding: 4px;
+ box-sizing: border-box;
+}
+
+#body-login p.info a, #body-login #showAdvanced {
+ color: #ccc;
+}
+
+#body-login p.info a:hover, #body-login p.info a:focus {
+ color: #fff;
+}
+
+
+#body-login p.info{
+ white-space: nowrap;
+}
+
/* Show password toggle */
#show, #dbpassword {
position: absolute;
@@ -378,6 +407,16 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
color: #dd3b3b !important;
font-weight: bold;
}
+.error pre {
+ white-space: pre-wrap;
+ text-align: left;
+}
+
+.error-wide {
+ width: 800px;
+ margin-left: -250px;
+}
+
/* Fixes for log in page, TODO should be removed some time */
#body-login .update,
#body-login .error {
@@ -437,17 +476,30 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
/* NAVIGATION ------------------------------------------------------------- */
#navigation {
- position:fixed; float:left; width:64px; padding-top:3.5em; z-index:75; height:100%;
+ position: fixed;
+ float: left;
+ width: 80px;
+ padding-top: 3.5em;
+ z-index: 75;
+ height: 100%;
background:#383c43 url('../img/noise.png') repeat;
-moz-box-shadow:0 0 7px #000; -webkit-box-shadow:0 0 7px #000; box-shadow:0 0 7px #000;
overflow:hidden; box-sizing:border-box; -moz-box-sizing:border-box;
+ /* prevent ugly selection effect on accidental selection */
+ -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
+}
+#navigation:hover {
+ overflow-y: auto; /* show scrollbar only on hover */
}
-#navigation:hover { overflow-y:auto; } /* show scrollbar only on hover */
#navigation a span {
- display:block;
- text-decoration:none; font-size:10px; text-align:center;
- color:#fff; text-shadow:#000 0 -1px 0;
+ display: block;
+ text-decoration: none;
+ font-size: 11px;
+ text-align: center;
+ color: #fff;
+ text-shadow: #000 0 -1px 0;
white-space:nowrap; overflow:hidden; text-overflow:ellipsis; /* ellipsize long app names */
+ padding-bottom: 10px;
}
/* icon opacity and hover effect */
@@ -472,14 +524,20 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
filter: alpha(opacity=100);
opacity: 1;
}
-
- /* positioning */
#navigation .icon {
- display:block;
- width:32px; height:32px;
- margin:0 16px 0; padding:8px 0 4px;
+ display: block;
+ width: 32px;
+ height: 32px;
+ margin-left: 24px;
+ padding: 10px 0 4px;
+ }
+ #navigation li:first-child .icon { /* special rule for Files icon as it's first */
+ padding-top: 20px;
}
- #navigation li:first-child a { padding-top:16px; }
+
+#apps-management {
+ opacity: .6;
+}
/* USER MENU */
@@ -493,13 +551,31 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
background:#383c43 url('../img/noise.png') repeat;
border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid;
-moz-box-shadow:0 0 7px rgb(29,45,68); -webkit-box-shadow:0 0 7px rgb(29,45,68); box-shadow:0 0 7px rgb(29,45,68);
+ -moz-box-sizing: border-box; box-sizing: border-box;
+ /* prevent ugly selection effect on accidental selection */
+ -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
}
#expanddiv a {
- display:block; color:#fff; text-shadow:0 -1px 0 #000; padding:0 8px;
- -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7;
+ display: block;
+ height: 40px;
+ color: #fff;
+ text-shadow: 0 -1px 0 #000;
+ padding: 4px 12px 0;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+ filter: alpha(opacity=70);
+ opacity: .7;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ }
+ #expanddiv a img {
+ margin-bottom: -3px;
+ margin-right: 6px;
+ }
+ #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active {
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+ filter: alpha(opacity=100);
+ opacity: 1;
}
- #expanddiv a img { margin-bottom:-3px; }
- #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
/* VARIOUS REUSABLE SELECTORS */
@@ -532,7 +608,7 @@ tbody tr:hover, tr:active { background-color:#f8f8f8; }
.personalblock > legend, th, dt, label { font-weight:bold; }
code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; }
-#quota div, div.jp-play-bar, div.jp-seek-bar {
+#quota div {
padding: 0;
background-color: rgb(220,220,220);
font-weight: normal;
@@ -540,7 +616,6 @@ code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono
-moz-border-radius-bottomleft: .4em; -webkit-border-bottom-left-radius: .4em; border-bottom-left-radius:.4em;
-moz-border-radius-topleft: .4em; -webkit-border-top-left-radius: .4em; border-top-left-radius: .4em; }
#quotatext {padding:.6em 1em;}
-div.jp-play-bar, div.jp-seek-bar { padding:0; }
.pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; }
.pager li { display:inline-block; }
@@ -596,7 +671,7 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;}
#category_addinput { width:10em; }
/* ---- APP SETTINGS ---- */
-.popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888; color:#333; padding:10px; position:fixed !important; z-index:200; }
+.popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888; color:#333; padding:10px; position:fixed !important; z-index:100; }
.popup.topright { top:7em; right:1em; }
.popup.bottomleft { bottom:1em; left:33em; }
.popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/close.svg') no-repeat center; }
@@ -631,13 +706,15 @@ div.crumb:active {
height: 100%;
width: 100%;
}
+#app * {
+ -moz-box-sizing: border-box; box-sizing: border-box;
+}
/* Navigation: folder like structure */
#app-navigation {
- width: 250px;
+ width: 300px;
height: 100%;
float: left;
- padding-bottom: 32px;
-moz-box-sizing: border-box; box-sizing: border-box;
background-color: #f8f8f8;
border-right: 1px solid #ccc;
@@ -654,7 +731,8 @@ div.crumb:active {
text-shadow: 0 1px 0 rgba(255,255,255,.9);
}
#app-navigation .active,
-#app-navigation .active a { /* active navigation entry or folder */
+#app-navigation .active a,
+#app-navigation li:hover > a {
background-color: #ddd;
text-shadow: 0 1px 0 rgba(255,255,255,.7);
}
@@ -662,49 +740,38 @@ div.crumb:active {
/* special rules for first-level entries and folders */
#app-navigation > ul > li {
background-color: #eee;
- border-top: 1px solid #fff;
- border-bottom: 1px solid #ddd;
-}
-#app-navigation > ul > .active {
- border-top: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
}
#app-navigation .with-icon a {
- padding-left: 32px;
- background-size: 16px 16px; background-position: 10px center; background-repeat: no-repeat;
+ padding-left: 44px;
+ background-size: 16px 16px;
+ background-position: 14px center;
+ background-repeat: no-repeat;
}
#app-navigation li > a {
display: block;
width: 100%;
- padding: 0 16px;
+ height: 44px;
+ padding: 12px;
overflow: hidden;
-moz-box-sizing: border-box; box-sizing: border-box;
- line-height: 32px;
white-space: nowrap;
text-overflow: ellipsis;
color: #333;
}
-#app-navigation li:hover > a {
- background-color: #ddd;
-}
-#app-navigation > ul > li:hover {
- border-top: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
-}
#app-navigation .collapse {
display: none; /* hide collapse button intially */
}
#app-navigation .collapsible > .collapse {
position: absolute;
- left: 6px;
- top: 5px;
- height: 16px;
- width: 16px;
+ height: 44px;
+ width: 44px;
+ margin: 0;
+ padding: 0;
background: none; background-image: url('../img/actions/triangle-s.svg');
- background-size: 16px 16px; background-repeat: no-repeat;
+ background-size: 16px; background-repeat: no-repeat; background-position: center;
border: none;
border-radius: 0;
outline: none !important;
@@ -754,13 +821,29 @@ div.crumb:active {
#app-navigation > ul .open:hover {
-moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc;
- border-top: 1px solid #ccc;
}
#app-navigation > ul .open ul {
display: block;
}
+
+/* counter and actions */
+#app-navigation .utils {
+ position: absolute;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ font-size: 12px;
+}
+ #app-navigation .utils button,
+ #app-navigation .utils .counter {
+ width: 44px;
+ height: 44px;
+ padding-top: 12px;
+ }
+
+
/* drag and drop */
#app-navigation .drag-and-drop {
-moz-transition: padding-bottom 500ms ease 0s;
@@ -788,7 +871,7 @@ div.crumb:active {
/* settings area */
#app-settings {
position: fixed;
- width: 249px;
+ width: 299px;
bottom: 0;
border-top: 1px solid #ccc;
}
@@ -821,9 +904,25 @@ div.crumb:active {
}
/* icons */
+.folder-icon, .delete-icon, .edit-icon, .progress-icon {
+ background-repeat: no-repeat;
+ background-position: center;
+}
.folder-icon { background-image: url('../img/places/folder.svg'); }
.delete-icon { background-image: url('../img/actions/delete.svg'); }
+.delete-icon:hover, .delete-icon:focus {
+ background-image: url('../img/actions/delete-hover.svg');
+}
.edit-icon { background-image: url('../img/actions/rename.svg'); }
+.progress-icon {
+ background-image: url('../img/loading.gif');
+ background-size: 16px;
+ /* force show the loading icon, not only on hover */
+ -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+ filter:alpha(opacity=100);
+ opacity: 1 !important;
+ display: inline !important;
+}
/* buttons */
button.loading {
@@ -843,6 +942,10 @@ button.loading {
::-moz-focus-inner {
border: 0;
}
+.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
+.lte8 .delete-icon:hover, .delete-icon:focus {
+ background-image: url('../img/actions/delete-hover.png');
+}
/* IE8 needs background to be set to same color to make transparency look good. */
.lte9 #body-login form input[type="text"] {
diff --git a/core/doc/admin/index.php b/core/doc/admin/index.html
index 7785f2ce2f1..7785f2ce2f1 100644
--- a/core/doc/admin/index.php
+++ b/core/doc/admin/index.html
diff --git a/core/doc/user/index.php b/core/doc/user/index.html
index ede62f05aee..ede62f05aee 100644
--- a/core/doc/user/index.php
+++ b/core/doc/user/index.html
diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png
new file mode 100644
index 00000000000..99f549faf9b
--- /dev/null
+++ b/core/img/actions/delete-hover.png
Binary files differ
diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg
new file mode 100644
index 00000000000..568185c5c70
--- /dev/null
+++ b/core/img/actions/delete-hover.svg
@@ -0,0 +1,12 @@
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <path fill="#d40000" d="M8,1c-3.866,0-7,3.134-7,7s3.134,7,7,7,7-3.134,7-7-3.134-7-7-7zm-2.8438,2.75l2.8438,2.8438,2.844-2.8438,1.406,1.4062-2.8438,2.8438,2.8438,2.844-1.406,1.406-2.844-2.8438-2.8438,2.8438-1.4062-1.406,2.8438-2.844-2.8438-2.8438,1.4062-1.4062z"/>
+</svg>
diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png
index 99f549faf9b..0d8c89a56e2 100644
--- a/core/img/actions/delete.png
+++ b/core/img/actions/delete.png
Binary files differ
diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg
index 568185c5c70..ef564bfd482 100644
--- a/core/img/actions/delete.svg
+++ b/core/img/actions/delete.svg
@@ -1,12 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <metadata>
- <rdf:RDF>
- <cc:Work rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
- <dc:title/>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <path fill="#d40000" d="M8,1c-3.866,0-7,3.134-7,7s3.134,7,7,7,7-3.134,7-7-3.134-7-7-7zm-2.8438,2.75l2.8438,2.8438,2.844-2.8438,1.406,1.4062-2.8438,2.8438,2.8438,2.844-1.406,1.406-2.844-2.8438-2.8438,2.8438-1.4062-1.406,2.8438-2.844-2.8438-2.8438,1.4062-1.4062z"/>
+ <g transform="translate(0 -1036.4)">
+ <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z"/>
+ </g>
</svg>
diff --git a/core/img/actions/more.png b/core/img/actions/more.png
new file mode 100644
index 00000000000..edcafdd9bbf
--- /dev/null
+++ b/core/img/actions/more.png
Binary files differ
diff --git a/core/img/actions/more.svg b/core/img/actions/more.svg
new file mode 100644
index 00000000000..9ab5d4243d9
--- /dev/null
+++ b/core/img/actions/more.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <path d="m3 6c-1.1046 0-2 0.8954-2 2s0.8954 2 2 2 2-0.8954 2-2-0.8954-2-2-2zm5 0c-1.1046 0-2 0.8954-2 2s0.8954 2 2 2 2-0.8954 2-2-0.8954-2-2-2zm5 0c-1.105 0-2 0.8954-2 2s0.895 2 2 2 2-0.8954 2-2-0.895-2-2-2z" fill-rule="evenodd"/>
+</svg>
diff --git a/core/img/actions/password.png b/core/img/actions/password.png
index edcafdd9bbf..07365a5775e 100644
--- a/core/img/actions/password.png
+++ b/core/img/actions/password.png
Binary files differ
diff --git a/core/img/actions/password.svg b/core/img/actions/password.svg
index 9ab5d4243d9..a9b29fda093 100644
--- a/core/img/actions/password.svg
+++ b/core/img/actions/password.svg
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
- <path d="m3 6c-1.1046 0-2 0.8954-2 2s0.8954 2 2 2 2-0.8954 2-2-0.8954-2-2-2zm5 0c-1.1046 0-2 0.8954-2 2s0.8954 2 2 2 2-0.8954 2-2-0.8954-2-2-2zm5 0c-1.105 0-2 0.8954-2 2s0.895 2 2 2 2-0.8954 2-2-0.895-2-2-2z" fill-rule="evenodd"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="16px" width="16px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 71 100"><metadata><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata>
+<path d="M8,1c-2.2091,0-4,1.7909-4,4v2h-1v7h10v-7h-1v-2c0-2.2091-1.791-4-4-4zm0,2c1.1046,0,2,0.89543,2,2v2h-4v-2c0-1.1046,0.8954-2,2-2z" transform="matrix(6.25,0,0,6.25,-14.5,0)" fill="#000"/>
</svg>
diff --git a/core/js/compatibility.js b/core/js/compatibility.js
index b690803ca77..6548f95d42b 100644
--- a/core/js/compatibility.js
+++ b/core/js/compatibility.js
@@ -24,7 +24,7 @@ if (typeof Object.keys !== 'function') {
}
}
return k;
- }
+ };
}
/**
diff --git a/core/js/config.js b/core/js/config.js
index 563df4e6632..52d1c3aee25 100644
--- a/core/js/config.js
+++ b/core/js/config.js
@@ -9,7 +9,7 @@ OC.AppConfig={
getCall:function(action,data,callback){
data.action=action;
$.getJSON(OC.AppConfig.url,data,function(result){
- if(result.status='success'){
+ if(result.status==='success'){
if(callback){
callback(result.data);
}
@@ -19,7 +19,7 @@ OC.AppConfig={
postCall:function(action,data,callback){
data.action=action;
$.post(OC.AppConfig.url,data,function(result){
- if(result.status='success'){
+ if(result.status==='success'){
if(callback){
callback(result.data);
}
diff --git a/core/js/jquery.infieldlabel.js b/core/js/jquery.infieldlabel.js
index 8a76da1b140..fad15102bcb 100644
--- a/core/js/jquery.infieldlabel.js
+++ b/core/js/jquery.infieldlabel.js
@@ -174,4 +174,4 @@
});
};
-}(jQuery)); \ No newline at end of file
+}(jQuery));
diff --git a/core/js/jquery.inview.js b/core/js/jquery.inview.js
index 9687cd83368..511ae95415e 100644
--- a/core/js/jquery.inview.js
+++ b/core/js/jquery.inview.js
@@ -131,4 +131,4 @@
// By the way, iOS (iPad, iPhone, ...) seems to not execute, or at least delays
// intervals while the user scrolls. Therefore the inview event might fire a bit late there
setInterval(checkInView, 250);
-})(jQuery); \ No newline at end of file
+})(jQuery);
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index 7413927e3b2..bafbd0e0e9f 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -13,7 +13,7 @@
this.originalCss = {
display: this.element[0].style.display,
width: this.element[0].style.width,
- height: this.element[0].style.height,
+ height: this.element[0].style.height
};
this.originalTitle = this.element.attr('title');
@@ -152,7 +152,7 @@
content_height -= this.$buttonrow.outerHeight(true);
}
this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body');
- content_height = Math.min(content_height, this.parent.height()-20)
+ content_height = Math.min(content_height, this.parent.height()-20);
this.element.css({
height: content_height + 'px',
width: this.$dialog.innerWidth()-20 + 'px'
@@ -187,7 +187,7 @@
}
},
widget: function() {
- return this.$dialog
+ return this.$dialog;
},
close: function() {
this._destroyOverlay();
@@ -200,10 +200,10 @@
},
destroy: function() {
if(this.$title) {
- this.$title.remove()
+ this.$title.remove();
}
if(this.$buttonrow) {
- this.$buttonrow.remove()
+ this.$buttonrow.remove();
}
if(this.originalTitle) {
diff --git a/core/js/js.js b/core/js/js.js
index 03f660be62c..d580b6113e6 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1,6 +1,6 @@
/**
* Disable console output unless DEBUG mode is enabled.
- * Add
+ * Add
* define('DEBUG', true);
* To the end of config/config.php to enable debug mode.
* The undefined checks fix the broken ie8 console
@@ -24,60 +24,121 @@ if (oc_debug !== true || typeof console === "undefined" || typeof console.log ==
}
}
-/**
- * translate a string
- * @param app the id of the app for which to translate the string
- * @param text the string to translate
- * @return string
- */
-function t(app,text, vars){
- if( !( t.cache[app] )){
- $.ajax(OC.filePath('core','ajax','translations.php'),{
- async:false,//todo a proper sollution for this without sync ajax calls
- data:{'app': app},
- type:'POST',
- success:function(jsondata){
+function initL10N(app) {
+ if (!( t.cache[app] )) {
+ $.ajax(OC.filePath('core', 'ajax', 'translations.php'), {
+ async: false,//todo a proper solution for this without sync ajax calls
+ data: {'app': app},
+ type: 'POST',
+ success: function (jsondata) {
t.cache[app] = jsondata.data;
+ t.plural_form = jsondata.plural_form;
}
});
// Bad answer ...
- if( !( t.cache[app] )){
+ if (!( t.cache[app] )) {
t.cache[app] = [];
}
}
- var _build = function (text, vars) {
- return text.replace(/{([^{}]*)}/g,
+ if (typeof t.plural_function == 'undefined') {
+ t.plural_function = function (n) {
+ var p = (n != 1) ? 1 : 0;
+ return { 'nplural' : 2, 'plural' : p };
+ };
+
+ /**
+ * code below has been taken from jsgettext - which is LGPL licensed
+ * https://developer.berlios.de/projects/jsgettext/
+ * http://cvs.berlios.de/cgi-bin/viewcvs.cgi/jsgettext/jsgettext/lib/Gettext.js
+ */
+ var pf_re = new RegExp('^(\\s*nplurals\\s*=\\s*[0-9]+\\s*;\\s*plural\\s*=\\s*(?:\\s|[-\\?\\|&=!<>+*/%:;a-zA-Z0-9_\(\)])+)', 'm');
+ if (pf_re.test(t.plural_form)) {
+ //ex english: "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+ //pf = "nplurals=2; plural=(n != 1);";
+ //ex russian: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10< =4 && (n%100<10 or n%100>=20) ? 1 : 2)
+ //pf = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)";
+ var pf = t.plural_form;
+ if (! /;\s*$/.test(pf)) pf = pf.concat(';');
+ /* We used to use eval, but it seems IE has issues with it.
+ * We now use "new Function", though it carries a slightly
+ * bigger performance hit.
+ var code = 'function (n) { var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) }; };';
+ Gettext._locale_data[domain].head.plural_func = eval("("+code+")");
+ */
+ var code = 'var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) };';
+ t.plural_function = new Function("n", code);
+ } else {
+ console.log("Syntax error in language file. Plural-Forms header is invalid ["+t.plural_forms+"]");
+ }
+ }
+}
+/**
+ * translate a string
+ * @param app the id of the app for which to translate the string
+ * @param text the string to translate
+ * @param vars (optional) FIXME
+ * @param count (optional) number to replace %n with
+ * @return string
+ */
+function t(app, text, vars, count){
+ initL10N(app);
+ var _build = function (text, vars, count) {
+ return text.replace(/%n/g, count).replace(/{([^{}]*)}/g,
function (a, b) {
var r = vars[b];
return typeof r === 'string' || typeof r === 'number' ? r : a;
}
);
};
+ var translation = text;
if( typeof( t.cache[app][text] ) !== 'undefined' ){
- if(typeof vars === 'object') {
- return _build(t.cache[app][text], vars);
- } else {
- return t.cache[app][text];
+ translation = t.cache[app][text];
+ }
+
+ if(typeof vars === 'object' || count !== undefined ) {
+ return _build(translation, vars, count);
+ } else {
+ return translation;
+ }
+}
+t.cache = {};
+
+/**
+ * translate a string
+ * @param app the id of the app for which to translate the string
+ * @param text_singular the string to translate for exactly one object
+ * @param text_plural the string to translate for n objects
+ * @param count number to determine whether to use singular or plural
+ * @param vars (optional) FIXME
+ * @return string
+ */
+function n(app, text_singular, text_plural, count, vars) {
+ initL10N(app);
+ var identifier = '_' + text_singular + '__' + text_plural + '_';
+ if( typeof( t.cache[app][identifier] ) !== 'undefined' ){
+ var translation = t.cache[app][identifier];
+ if ($.isArray(translation)) {
+ var plural = t.plural_function(count);
+ return t(app, translation[plural.plural], vars, count);
}
}
+
+ if(count === 1) {
+ return t(app, text_singular, vars, count);
+ }
else{
- if(typeof vars === 'object') {
- return _build(text, vars);
- } else {
- return text;
- }
+ return t(app, text_plural, vars, count);
}
}
-t.cache={};
-/*
+/**
* Sanitizes a HTML string
-* @param string
+* @param s string
* @return Sanitized string
*/
function escapeHTML(s) {
- return s.toString().split('&').join('&amp;').split('<').join('&lt;').split('"').join('&quot;');
+ return s.toString().split('&').join('&amp;').split('<').join('&lt;').split('"').join('&quot;');
}
/**
@@ -96,6 +157,7 @@ var OC={
PERMISSION_UPDATE:2,
PERMISSION_DELETE:8,
PERMISSION_SHARE:16,
+ PERMISSION_ALL:31,
webroot:oc_webroot,
appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false,
currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
@@ -696,13 +758,10 @@ $(document).ready(function(){
});
// all the tipsy stuff needs to be here (in reverse order) to work
- $('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true});
- $('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true});
$('.displayName .action').tipsy({gravity:'se', fade:true, live:true});
$('.password .action').tipsy({gravity:'se', fade:true, live:true});
$('#upload').tipsy({gravity:'w', fade:true});
$('.selectedActions a').tipsy({gravity:'s', fade:true, live:true});
- $('a.delete').tipsy({gravity: 'e', fade:true, live:true});
$('a.action').tipsy({gravity:'s', fade:true, live:true});
$('td .modified').tipsy({gravity:'s', fade:true, live:true});
@@ -751,15 +810,13 @@ function relative_modified_date(timestamp) {
var diffdays = Math.round(diffhours/24);
var diffmonths = Math.round(diffdays/31);
if(timediff < 60) { return t('core','seconds ago'); }
- else if(timediff < 120) { return t('core','1 minute ago'); }
- else if(timediff < 3600) { return t('core','{minutes} minutes ago',{minutes: diffminutes}); }
- else if(timediff < 7200) { return t('core','1 hour ago'); }
- else if(timediff < 86400) { return t('core','{hours} hours ago',{hours: diffhours}); }
+ else if(timediff < 3600) { return n('core','%n minute ago', '%n minutes ago', diffminutes); }
+ else if(timediff < 86400) { return n('core', '%n hour ago', '%n hours ago', diffhours); }
else if(timediff < 86400) { return t('core','today'); }
else if(timediff < 172800) { return t('core','yesterday'); }
- else if(timediff < 2678400) { return t('core','{days} days ago',{days: diffdays}); }
+ else if(timediff < 2678400) { return n('core', '%n day ago', '%n days ago', diffdays); }
else if(timediff < 5184000) { return t('core','last month'); }
- else if(timediff < 31556926) { return t('core','{months} months ago',{months: diffmonths}); }
+ else if(timediff < 31556926) { return n('core', '%n month ago', '%n months ago', diffmonths); }
//else if(timediff < 31556926) { return t('core','months ago'); }
else if(timediff < 63113852) { return t('core','last year'); }
else { return t('core','years ago'); }
@@ -773,7 +830,7 @@ OC.get=function(name) {
var namespaces = name.split(".");
var tail = namespaces.pop();
var context=window;
-
+
for(var i = 0; i < namespaces.length; i++) {
context = context[namespaces[i]];
if(!context){
@@ -792,7 +849,7 @@ OC.set=function(name, value) {
var namespaces = name.split(".");
var tail = namespaces.pop();
var context=window;
-
+
for(var i = 0; i < namespaces.length; i++) {
if(!context[namespaces[i]]){
context[namespaces[i]]={};
diff --git a/core/js/listview.js b/core/js/listview.js
index 3a713a6222c..18d0bdeaf7c 100644
--- a/core/js/listview.js
+++ b/core/js/listview.js
@@ -11,11 +11,11 @@ ListView.generateTable=function(collumns){
html+='<thead>';
html+='</head>';
html+='<tbody>';
- html+'<tr class="template">';
+ html+='<tr class="template">';
$.each(collumns,function(index,collumn){
html+='<th class="'+collumn.toLower()+'"</th>';
});
- html+'</tr>';
+ html+='</tr>';
html+='</tbody>';
html='</table>';
return $(html);
diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 48d521e1856..373fd2d41a2 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -25,7 +25,7 @@
'labels':[],
'oncheck':false,
'onuncheck':false,
- 'minWidth': 'default;',
+ 'minWidth': 'default;'
};
$(this).attr('data-msid', multiSelectId);
$.extend(settings,options);
@@ -200,7 +200,7 @@
return false;
}
var li=$(this).parent();
- var val = $(this).val()
+ var val = $(this).val();
var select=button.parent().next();
if(typeof settings.createCallback === 'function') {
var response = settings.createCallback(select, val);
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index f4bc174b5eb..4092b8d0746 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -79,9 +79,15 @@ var OCdialogs = {
title: title
}).data('path', '');
- if (modal === undefined) { modal = false };
- if (multiselect === undefined) { multiselect = false };
- if (mimetype_filter === undefined) { mimetype_filter = '' };
+ if (modal === undefined) {
+ modal = false;
+ }
+ if (multiselect === undefined) {
+ multiselect = false;
+ }
+ if (mimetype_filter === undefined) {
+ mimetype_filter = '';
+ }
$('body').append(self.$filePicker);
@@ -106,7 +112,7 @@ var OCdialogs = {
datapath.push(self.$filePicker.data('path') + '/' + $(element).text());
});
} else {
- var datapath = self.$filePicker.data('path');
+ datapath = self.$filePicker.data('path');
datapath += '/' + self.$filelist.find('.filepicker_element_selected .filename').text();
}
callback(datapath);
@@ -117,10 +123,6 @@ var OCdialogs = {
text: t('core', 'Choose'),
click: functionToCall,
defaultButton: true
- },
- {
- text: t('core', 'Cancel'),
- click: function(){self.$filePicker.ocdialog('close'); }
}];
self.$filePicker.ocdialog({
@@ -155,7 +157,9 @@ var OCdialogs = {
message: content,
type: dialog_type
});
- if (modal === undefined) { modal = false };
+ if (modal === undefined) {
+ modal = false;
+ }
$('body').append($dlg);
var buttonlist = [];
switch (buttons) {
@@ -163,7 +167,9 @@ var OCdialogs = {
buttonlist = [{
text: t('core', 'Yes'),
click: function(){
- if (callback !== undefined) { callback(true) };
+ if (callback !== undefined) {
+ callback(true);
+ }
$(dialog_id).ocdialog('close');
},
defaultButton: true
@@ -171,7 +177,9 @@ var OCdialogs = {
{
text: t('core', 'No'),
click: function(){
- if (callback !== undefined) { callback(false) };
+ if (callback !== undefined) {
+ callback(false);
+ }
$(dialog_id).ocdialog('close');
}
}];
@@ -179,7 +187,9 @@ var OCdialogs = {
case OCdialogs.OK_BUTTON:
var functionToCall = function() {
$(dialog_id).ocdialog('close');
- if(callback !== undefined) { callback() };
+ if(callback !== undefined) {
+ callback();
+ }
};
buttonlist[0] = {
text: t('core', 'Ok'),
@@ -187,7 +197,7 @@ var OCdialogs = {
defaultButton: true
};
break;
- };
+ }
$(dialog_id).ocdialog({
closeOnEscape: true,
@@ -269,7 +279,7 @@ var OCdialogs = {
var sorted = dirs.concat(others);
$.each(sorted, function(idx, entry) {
- $li = self.$listTmpl.octemplate({
+ var $li = self.$listTmpl.octemplate({
type: entry.type,
dir: dir,
filename: entry.name,
@@ -287,13 +297,13 @@ var OCdialogs = {
*/
_fillSlug: function() {
this.$dirTree.empty();
- var self = this
+ var self = this;
var path = this.$filePicker.data('path');
var $template = $('<span data-dir="{dir}">{name}</span>');
if(path) {
var paths = path.split('/');
$.each(paths, function(index, dir) {
- var dir = paths.pop();
+ dir = paths.pop();
if(dir === '') {
return false;
}
@@ -327,7 +337,7 @@ var OCdialogs = {
$element.toggleClass('filepicker_element_selected');
return;
} else if ( $element.data('type') === 'dir' ) {
- this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname'))
+ this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname'));
}
}
};
diff --git a/core/js/oc-requesttoken.js b/core/js/oc-requesttoken.js
index f4cf286b8aa..6cc6b5a855b 100644
--- a/core/js/oc-requesttoken.js
+++ b/core/js/oc-requesttoken.js
@@ -1,3 +1,3 @@
$(document).bind('ajaxSend', function(elm, xhr, s) {
xhr.setRequestHeader('requesttoken', oc_requesttoken);
-}); \ No newline at end of file
+});
diff --git a/core/js/oc-vcategories.js b/core/js/oc-vcategories.js
index c745dbc5fbd..c297a24680d 100644
--- a/core/js/oc-vcategories.js
+++ b/core/js/oc-vcategories.js
@@ -23,7 +23,7 @@ var OCCategories= {
d.css('cursor', 'wait').find('input,button:not(#category_addbutton)')
.prop('disabled', true).css('cursor', 'wait');
}
- }
+ };
var dlg = $('#edit_categories_dialog').dialog({
modal: true,
height: 350, minHeight:200, width: 250, minWidth: 200,
diff --git a/core/js/router.js b/core/js/router.js
index b94721673a7..44e7c30602e 100644
--- a/core/js/router.js
+++ b/core/js/router.js
@@ -1,4 +1,4 @@
-OC.router_base_url = OC.webroot + '/index.php',
+OC.router_base_url = OC.webroot + '/index.php';
OC.Router = {
// register your ajax requests to load after the loading of the routes
// has finished. otherwise you face problems with race conditions
diff --git a/core/js/share.js b/core/js/share.js
index b4b5159b0b5..27c16f38b92 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -22,9 +22,9 @@ OC.Share={
if (itemType != 'file' && itemType != 'folder') {
$('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
} else {
- var file = $('tr').filterAttr('data-id', item);
+ var file = $('tr[data-id="'+item+'"]');
if (file.length > 0) {
- var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
+ var action = $(file).find('.fileactions .action[data-action="Share"]');
var img = action.find('img').attr('src', image);
action.addClass('permanent');
action.html(' '+t('core', 'Shared')).prepend(img);
@@ -36,7 +36,7 @@ OC.Share={
// Search for possible parent folders that are shared
while (path != last) {
if (path == data['path']) {
- var actions = $('.fileactions .action').filterAttr('data-action', 'Share');
+ var actions = $('.fileactions .action[data-action="Share"]');
$.each(actions, function(index, action) {
var img = $(action).find('img');
if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
@@ -103,9 +103,9 @@ OC.Share={
var checkReshare = true;
if (typeof OC.Share.statuses[itemSource] === 'undefined') {
// NOTE: Check does not always work and misses some shares, fix later
- checkShares = true;
+ var checkShares = true;
} else {
- checkShares = true;
+ var checkShares = true;
}
$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, itemSource: itemSource, checkReshare: checkReshare, checkShares: checkShares }, async: false, success: function(result) {
if (result && result.status === 'success') {
@@ -228,23 +228,23 @@ OC.Share={
});
}
$('#shareWith').autocomplete({minLength: 1, source: function(search, response) {
- // if (cache[search.term]) {
- // response(cache[search.term]);
- // } else {
+ // if (cache[search.term]) {
+ // response(cache[search.term]);
+ // } else {
$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term, itemShares: OC.Share.itemShares }, function(result) {
if (result.status == 'success' && result.data.length > 0) {
response(result.data);
} else {
// Suggest sharing via email if valid email address
-// var pattern = new RegExp(/^[+a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/i);
-// if (pattern.test(search.term)) {
-// response([{label: t('core', 'Share via email:')+' '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
-// } else {
+// var pattern = new RegExp(/^[+a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/i);
+// if (pattern.test(search.term)) {
+// response([{label: t('core', 'Share via email:')+' '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
+// } else {
response([t('core', 'No people found')]);
-// }
+// }
}
});
- // }
+ // }
},
focus: function(event, focused) {
event.preventDefault();
@@ -256,8 +256,8 @@ OC.Share={
var shareType = selected.item.value.shareType;
var shareWith = selected.item.value.shareWith;
$(this).val(shareWith);
- // Default permissions are Read and Share
- var permissions = OC.PERMISSION_READ | OC.PERMISSION_SHARE;
+ // Default permissions are Edit (CRUD) and Share
+ var permissions = OC.PERMISSION_ALL;
OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, function() {
OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, possiblePermissions);
$('#shareWith').val('');
diff --git a/core/js/visitortimezone.js b/core/js/visitortimezone.js
index 58a1e9ea355..ee0105c783d 100644
--- a/core/js/visitortimezone.js
+++ b/core/js/visitortimezone.js
@@ -1,4 +1,4 @@
$(document).ready(function () {
var visitortimezone = (-new Date().getTimezoneOffset() / 60);
$('#timezone-offset').val(visitortimezone);
-}); \ No newline at end of file
+});
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index dc78e44c8d7..41447055609 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -1,5 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Settings" => "Instellings",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
"Password" => "Wagwoord",
"Use the following link to reset your password: {link}" => "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
"You will receive a link to reset your password via Email." => "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.",
@@ -26,7 +31,6 @@
"Log out" => "Teken uit",
"Lost your password?" => "Jou wagwoord verloor?",
"remember" => "onthou",
-"Log in" => "Teken aan",
-"prev" => "vorige",
-"next" => "volgende"
+"Log in" => "Teken aan"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index b236e63082c..84f076f3018 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "نوع التصنيف لم يدخل",
"No category to add?" => "ألا توجد فئة للإضافة؟",
"This category already exists: %s" => "هذا التصنيف موجود مسبقا : %s",
@@ -28,20 +29,17 @@
"December" => "كانون الاول",
"Settings" => "إعدادات",
"seconds ago" => "منذ ثواني",
-"1 minute ago" => "منذ دقيقة",
-"{minutes} minutes ago" => "{minutes} منذ دقائق",
-"1 hour ago" => "قبل ساعة مضت",
-"{hours} hours ago" => "{hours} ساعة مضت",
+"_%n minute ago_::_%n minutes ago_" => array("","","","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","","","",""),
"today" => "اليوم",
"yesterday" => "يوم أمس",
-"{days} days ago" => "{days} يوم سابق",
+"_%n day ago_::_%n days ago_" => array("","","","","",""),
"last month" => "الشهر الماضي",
-"{months} months ago" => "{months} شهر مضت",
+"_%n month ago_::_%n months ago_" => array("","","","","",""),
"months ago" => "شهر مضى",
"last year" => "السنةالماضية",
"years ago" => "سنة مضت",
"Choose" => "اختيار",
-"Cancel" => "الغاء",
"Yes" => "نعم",
"No" => "لا",
"Ok" => "موافق",
@@ -82,7 +80,6 @@
"Email sent" => "تم ارسال البريد الالكتروني",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "حصل خطأ في عملية التحديث, يرجى ارسال تقرير بهذه المشكلة الى <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
-"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." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
"Username" => "إسم المستخدم",
@@ -124,7 +121,6 @@
"remember" => "تذكر",
"Log in" => "أدخل",
"Alternative Logins" => "اسماء دخول بديلة",
-"prev" => "السابق",
-"next" => "التالي",
"Updating ownCloud to version %s, this may take a while." => "جاري تحديث Owncloud الى اصدار %s , قد يستغرق هذا بعض الوقت."
);
+$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;";
diff --git a/core/l10n/be.php b/core/l10n/be.php
index ecf16e5d6a7..83f0d99a2e4 100644
--- a/core/l10n/be.php
+++ b/core/l10n/be.php
@@ -1,6 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","",""),
+"_%n day ago_::_%n days ago_" => array("","","",""),
+"_%n month ago_::_%n months ago_" => array("","","",""),
"Advanced" => "Дасведчаны",
-"Finish setup" => "Завяршыць ўстаноўку.",
-"prev" => "Папярэдняя",
-"next" => "Далей"
+"Finish setup" => "Завяршыць ўстаноўку."
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 608f26bc861..8afe42f206b 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"No categories selected for deletion." => "Няма избрани категории за изтриване",
"Sunday" => "Неделя",
"Monday" => "Понеделник",
@@ -21,14 +22,15 @@
"December" => "Декември",
"Settings" => "Настройки",
"seconds ago" => "преди секунди",
-"1 minute ago" => "преди 1 минута",
-"1 hour ago" => "преди 1 час",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "днес",
"yesterday" => "вчера",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "последният месец",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "последната година",
"years ago" => "последните години",
-"Cancel" => "Отказ",
"Yes" => "Да",
"No" => "Не",
"Ok" => "Добре",
@@ -65,7 +67,6 @@
"Log out" => "Изход",
"Lost your password?" => "Забравена парола?",
"remember" => "запомни",
-"Log in" => "Вход",
-"prev" => "пред.",
-"next" => "следващо"
+"Log in" => "Вход"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 5c171af567c..5e65d681ec2 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "ক্যাটেগরির ধরণটি প্রদান করা হয় নি।",
"No category to add?" => "যোগ করার মত কোন ক্যাটেগরি নেই ?",
"Object type not provided." => "অবজেক্টের ধরণটি প্রদান করা হয় নি।",
@@ -27,20 +28,17 @@
"December" => "ডিসেম্বর",
"Settings" => "নিয়ামকসমূহ",
"seconds ago" => "সেকেন্ড পূর্বে",
-"1 minute ago" => "১ মিনিট পূর্বে",
-"{minutes} minutes ago" => "{minutes} মিনিট পূর্বে",
-"1 hour ago" => "1 ঘন্টা পূর্বে",
-"{hours} hours ago" => "{hours} ঘন্টা পূর্বে",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "আজ",
"yesterday" => "গতকাল",
-"{days} days ago" => "{days} দিন পূর্বে",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "গত মাস",
-"{months} months ago" => "{months} মাস পূর্বে",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "মাস পূর্বে",
"last year" => "গত বছর",
"years ago" => "বছর পূর্বে",
"Choose" => "বেছে নিন",
-"Cancel" => "বাতির",
"Yes" => "হ্যাঁ",
"No" => "না",
"Ok" => "তথাস্তু",
@@ -79,7 +77,6 @@
"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." => "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
"Username" => "ব্যবহারকারী",
@@ -113,7 +110,6 @@
"Lost your password?" => "কূটশব্দ হারিয়েছেন?",
"remember" => "মনে রাখ",
"Log in" => "প্রবেশ",
-"prev" => "পূর্ববর্তী",
-"next" => "পরবর্তী",
"Updating ownCloud to version %s, this may take a while." => "%s ভার্সনে ownCloud পরিবর্ধন করা হচ্ছে, এজন্য কিছু সময় প্রয়োজন।"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/bs.php b/core/l10n/bs.php
index 6b65cf81f28..885518f9136 100644
--- a/core/l10n/bs.php
+++ b/core/l10n/bs.php
@@ -1,4 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("","",""),
"Share" => "Podijeli",
"Add" => "Dodaj"
);
+$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);";
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 497067b09fb..abff5bbbdb4 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s ha compartit »%s« amb tu",
"Category type not provided." => "No s'ha especificat el tipus de categoria.",
"No category to add?" => "No voleu afegir cap categoria?",
@@ -29,20 +30,17 @@
"December" => "Desembre",
"Settings" => "Configuració",
"seconds ago" => "segons enrere",
-"1 minute ago" => "fa 1 minut",
-"{minutes} minutes ago" => "fa {minutes} minuts",
-"1 hour ago" => "fa 1 hora",
-"{hours} hours ago" => "fa {hours} hores",
+"_%n minute ago_::_%n minutes ago_" => array("fa %n minut","fa %n minuts"),
+"_%n hour ago_::_%n hours ago_" => array("fa %n hora","fa %n hores"),
"today" => "avui",
"yesterday" => "ahir",
-"{days} days ago" => "fa {days} dies",
+"_%n day ago_::_%n days ago_" => array("fa %n dies","fa %n dies"),
"last month" => "el mes passat",
-"{months} months ago" => "fa {months} mesos",
+"_%n month ago_::_%n months ago_" => array("fa %n mes","fa %n mesos"),
"months ago" => "mesos enrere",
"last year" => "l'any passat",
"years ago" => "anys enrere",
"Choose" => "Escull",
-"Cancel" => "Cancel·la",
"Error loading file picker template" => "Error en carregar la plantilla del seleccionador de fitxers",
"Yes" => "Sí",
"No" => "No",
@@ -85,7 +83,7 @@
"Email sent" => "El correu electrónic s'ha enviat",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
-"ownCloud password reset" => "estableix de nou la contrasenya Owncloud",
+"%s password reset" => "restableix la contrasenya %s",
"Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu.<br>Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local.",
"Request failed!<br>Did you make sure your email/username was right?" => "La petició ha fallat!<br>Esteu segur que el correu/nom d'usuari és correcte?",
@@ -128,6 +126,7 @@
"Finish setup" => "Acaba la configuració",
"%s is available. Get more information on how to update." => "%s està disponible. Obtingueu més informació de com actualitzar.",
"Log out" => "Surt",
+"More apps" => "Més aplicacions",
"Automatic logon rejected!" => "L'ha rebutjat l'acceditació automàtica!",
"If you did not change your password recently, your account may be compromised!" => "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!",
"Please change your password to secure your account again." => "Canvieu la contrasenya de nou per assegurar el vostre compte.",
@@ -136,7 +135,6 @@
"Log in" => "Inici de sessió",
"Alternative Logins" => "Acreditacions alternatives",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ei,<br><br>només fer-te saber que %s ha compartit %s amb tu.<br><a href=\"%s\">Mira-ho:</a><br><br>Salut!",
-"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."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 8974840994a..78614eef0e7 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s s vámi sdílí »%s«",
"Category type not provided." => "Nezadán typ kategorie.",
"No category to add?" => "Žádná kategorie k přidání?",
@@ -29,20 +30,17 @@
"December" => "Prosinec",
"Settings" => "Nastavení",
"seconds ago" => "před pár vteřinami",
-"1 minute ago" => "před minutou",
-"{minutes} minutes ago" => "před {minutes} minutami",
-"1 hour ago" => "před hodinou",
-"{hours} hours ago" => "před {hours} hodinami",
+"_%n minute ago_::_%n minutes ago_" => array("před %n minutou","před %n minutami","před %n minutami"),
+"_%n hour ago_::_%n hours ago_" => array("před %n hodinou","před %n hodinami","před %n hodinami"),
"today" => "dnes",
"yesterday" => "včera",
-"{days} days ago" => "před {days} dny",
+"_%n day ago_::_%n days ago_" => array("před %n dnem","před %n dny","před %n dny"),
"last month" => "minulý měsíc",
-"{months} months ago" => "před {months} měsíci",
+"_%n month ago_::_%n months ago_" => array("před %n měsícem","před %n měsíci","před %n měsíci"),
"months ago" => "před měsíci",
"last year" => "minulý rok",
"years ago" => "před lety",
"Choose" => "Vybrat",
-"Cancel" => "Zrušit",
"Error loading file picker template" => "Chyba při načítání šablony výběru souborů",
"Yes" => "Ano",
"No" => "Ne",
@@ -85,7 +83,7 @@
"Email sent" => "E-mail odeslán",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>",
"The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
-"ownCloud password reset" => "Obnovení hesla pro ownCloud",
+"%s password reset" => "reset hesla %s",
"Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu.<br>Pokud jej v krátké době neobdržíte, zkontrolujte váš koš a složku spam.<br>Pokud jej nenaleznete, kontaktujte svého správce.",
"Request failed!<br>Did you make sure your email/username was right?" => "Požadavek selhal!<br>Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?",
@@ -128,6 +126,7 @@
"Finish setup" => "Dokončit nastavení",
"%s is available. Get more information on how to update." => "%s je dostupná. Získejte více informací k postupu aktualizace.",
"Log out" => "Odhlásit se",
+"More apps" => "Více aplikací",
"Automatic logon rejected!" => "Automatické přihlášení odmítnuto!",
"If you did not change your password recently, your account may be compromised!" => "Pokud jste v nedávné době neměnili své heslo, Váš účet může být kompromitován!",
"Please change your password to secure your account again." => "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu.",
@@ -136,7 +135,6 @@
"Log in" => "Přihlásit",
"Alternative Logins" => "Alternativní přihlášení",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ahoj,<br><br>jenom vám chci oznámit, že %s s vámi sdílí %s.\nPodívat se můžete <br><a href=\"%s\">zde</a>.<br><br>Díky",
-"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."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index 0f9d9205a60..442970fbb0b 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "Math o gategori heb ei ddarparu.",
"No category to add?" => "Dim categori i'w ychwanegu?",
"This category already exists: %s" => "Mae'r categori hwn eisoes yn bodoli: %s",
@@ -28,20 +29,17 @@
"December" => "Rhagfyr",
"Settings" => "Gosodiadau",
"seconds ago" => "eiliad yn ôl",
-"1 minute ago" => "1 munud yn ôl",
-"{minutes} minutes ago" => "{minutes} munud yn ôl",
-"1 hour ago" => "1 awr yn ôl",
-"{hours} hours ago" => "{hours} awr yn ôl",
+"_%n minute ago_::_%n minutes ago_" => array("","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","",""),
"today" => "heddiw",
"yesterday" => "ddoe",
-"{days} days ago" => "{days} diwrnod yn ôl",
+"_%n day ago_::_%n days ago_" => array("","","",""),
"last month" => "mis diwethaf",
-"{months} months ago" => "{months} mis yn ôl",
+"_%n month ago_::_%n months ago_" => array("","","",""),
"months ago" => "misoedd yn ôl",
"last year" => "y llynedd",
"years ago" => "blwyddyn yn ôl",
"Choose" => "Dewisiwch",
-"Cancel" => "Diddymu",
"Yes" => "Ie",
"No" => "Na",
"Ok" => "Iawn",
@@ -82,7 +80,6 @@
"Email sent" => "Anfonwyd yr e-bost",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">gymuned ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
-"ownCloud password reset" => "ailosod cyfrinair ownCloud",
"Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Anfonwyd y ddolen i ailosod eich cyfrinair i'ch cyfeiriad ebost.<br>Os nad yw'n cyrraedd o fewn amser rhesymol gwiriwch eich plygell spam/sothach.<br>Os nad yw yno, cysylltwch â'ch gweinyddwr lleol.",
"Request failed!<br>Did you make sure your email/username was right?" => "Methodd y cais!<br>Gwiriwch eich enw defnyddiwr ac ebost.",
@@ -127,7 +124,6 @@
"remember" => "cofio",
"Log in" => "Mewngofnodi",
"Alternative Logins" => "Mewngofnodiadau Amgen",
-"prev" => "blaenorol",
-"next" => "nesaf",
"Updating ownCloud to version %s, this may take a while." => "Yn diweddaru owncloud i fersiwn %s, gall hyn gymryd amser."
);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 5646acd3dca..79ccc20d495 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s delte »%s« med sig",
"Category type not provided." => "Kategori typen ikke er fastsat.",
"No category to add?" => "Ingen kategori at tilføje?",
@@ -29,20 +30,17 @@
"December" => "December",
"Settings" => "Indstillinger",
"seconds ago" => "sekunder siden",
-"1 minute ago" => "1 minut siden",
-"{minutes} minutes ago" => "{minutes} minutter siden",
-"1 hour ago" => "1 time siden",
-"{hours} hours ago" => "{hours} timer siden",
+"_%n minute ago_::_%n minutes ago_" => array("%n minut siden","%n minutter siden"),
+"_%n hour ago_::_%n hours ago_" => array("%n time siden","%n timer siden"),
"today" => "i dag",
"yesterday" => "i går",
-"{days} days ago" => "{days} dage siden",
+"_%n day ago_::_%n days ago_" => array("%n dag siden","%n dage siden"),
"last month" => "sidste måned",
-"{months} months ago" => "{months} måneder siden",
+"_%n month ago_::_%n months ago_" => array("%n måned siden","%n måneder siden"),
"months ago" => "måneder siden",
"last year" => "sidste år",
"years ago" => "år siden",
"Choose" => "Vælg",
-"Cancel" => "Annuller",
"Error loading file picker template" => "Fejl ved indlæsning af filvælger skabelon",
"Yes" => "Ja",
"No" => "Nej",
@@ -85,12 +83,13 @@
"Email sent" => "E-mail afsendt",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouds community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
-"ownCloud password reset" => "Nulstil ownCloud kodeord",
+"%s password reset" => "%s adgangskode nulstillet",
"Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linket til at nulstille dit kodeord er blevet sendt til din e-post. <br> Hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam / junk mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
"Request failed!<br>Did you make sure your email/username was right?" => "Anmodning mislykkedes!<br>Er du sikker på at din e-post / brugernavn var korrekt?",
"You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
"Username" => "Brugernavn",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?",
"Yes, I really want to reset my password now" => "Ja, Jeg ønsker virkelig at nulstille mit kodeord",
"Request reset" => "Anmod om nulstilling",
"Your password was reset" => "Dit kodeord blev nulstillet",
@@ -104,6 +103,7 @@
"Help" => "Hjælp",
"Access forbidden" => "Adgang forbudt",
"Cloud not found" => "Sky ikke fundet",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo\n\ndette blot for at lade dig vide, at %s har delt %s med dig.\nSe det: %s\n\nHej",
"Edit categories" => "Rediger kategorier",
"Add" => "Tilføj",
"Security Warning" => "Sikkerhedsadvarsel",
@@ -112,6 +112,7 @@
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen sikker tilfældighedsgenerator til tal er tilgængelig. Aktiver venligst OpenSSL udvidelsen.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Uden en sikker tilfældighedsgenerator til tal kan en angriber måske gætte dit gendan kodeord og overtage din konto",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
"Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
"Advanced" => "Avanceret",
"Data folder" => "Datamappe",
@@ -125,6 +126,7 @@
"Finish setup" => "Afslut opsætning",
"%s is available. Get more information on how to update." => "%s er tilgængelig. Få mere information om, hvordan du opdaterer.",
"Log out" => "Log ud",
+"More apps" => "Flere programmer",
"Automatic logon rejected!" => "Automatisk login afvist!",
"If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!",
"Please change your password to secure your account again." => "Skift adgangskode for at sikre din konto igen.",
@@ -132,7 +134,7 @@
"remember" => "husk",
"Log in" => "Log ind",
"Alternative Logins" => "Alternative logins",
-"prev" => "forrige",
-"next" => "næste",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>dette blot for at lade dig vide, at %s har delt \"%s\" med dig.<br><a href=\"%s\">Se det!</a><br><br>Hej",
"Updating ownCloud to version %s, this may take a while." => "Opdatere Owncloud til version %s, dette kan tage et stykke tid."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de.php b/core/l10n/de.php
index fe4b3d5fd8e..2fe2f564124 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s teilte »%s« mit Ihnen",
"Category type not provided." => "Kategorie nicht angegeben.",
"No category to add?" => "Keine Kategorie hinzuzufügen?",
@@ -29,20 +30,17 @@
"December" => "Dezember",
"Settings" => "Einstellungen",
"seconds ago" => "Gerade eben",
-"1 minute ago" => "vor einer Minute",
-"{minutes} minutes ago" => "Vor {minutes} Minuten",
-"1 hour ago" => "Vor einer Stunde",
-"{hours} hours ago" => "Vor {hours} Stunden",
+"_%n minute ago_::_%n minutes ago_" => array("Vor %n Minute","Vor %n Minuten"),
+"_%n hour ago_::_%n hours ago_" => array("Vor %n Stunde","Vor %n Stunden"),
"today" => "Heute",
"yesterday" => "Gestern",
-"{days} days ago" => "Vor {days} Tag(en)",
+"_%n day ago_::_%n days ago_" => array("Vor %n Tag","Vor %n Tagen"),
"last month" => "Letzten Monat",
-"{months} months ago" => "Vor {months} Monaten",
+"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
"months ago" => "Vor Monaten",
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
"Choose" => "Auswählen",
-"Cancel" => "Abbrechen",
"Error loading file picker template" => "Dateiauswahltemplate konnte nicht geladen werden",
"Yes" => "Ja",
"No" => "Nein",
@@ -85,7 +83,7 @@
"Email sent" => "E-Mail wurde verschickt",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
-"ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
+"%s password reset" => "%s-Passwort zurücksetzen",
"Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden.<br>Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
"Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Hast Du darauf geachtet, dass Deine E-Mail/Dein Benutzername korrekt war?",
@@ -128,6 +126,7 @@
"Finish setup" => "Installation abschließen",
"%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
"Log out" => "Abmelden",
+"More apps" => "Mehr Apps",
"Automatic logon rejected!" => "Automatischer Login zurückgewiesen!",
"If you did not change your password recently, your account may be compromised!" => "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAccount kompromittiert sein!",
"Please change your password to secure your account again." => "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen.",
@@ -136,7 +135,6 @@
"Log in" => "Einloggen",
"Alternative Logins" => "Alternative Logins",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br/><br/>wollte dich nur kurz informieren, dass %s gerade %s mit dir geteilt hat.<br/><a href=\"%s\">Schau es dir an.</a><br/><br/>Gruß!",
-"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."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php
new file mode 100644
index 00000000000..c0e3e80f0a3
--- /dev/null
+++ b/core/l10n/de_AT.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"More apps" => "Mehr Apps"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
new file mode 100644
index 00000000000..3e622ace6f6
--- /dev/null
+++ b/core/l10n/de_CH.php
@@ -0,0 +1,139 @@
+<?php
+$TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s teilt »%s« mit Ihnen",
+"Category type not provided." => "Kategorie nicht angegeben.",
+"No category to add?" => "Keine Kategorie hinzuzufügen?",
+"This category already exists: %s" => "Die nachfolgende Kategorie existiert bereits: %s",
+"Object type not provided." => "Objekttyp nicht angegeben.",
+"%s ID not provided." => "%s ID nicht angegeben.",
+"Error adding %s to favorites." => "Fehler beim Hinzufügen von %s zu den Favoriten.",
+"No categories selected for deletion." => "Es wurden keine Kategorien zum Löschen ausgewählt.",
+"Error removing %s from favorites." => "Fehler beim Entfernen von %s von den Favoriten.",
+"Sunday" => "Sonntag",
+"Monday" => "Montag",
+"Tuesday" => "Dienstag",
+"Wednesday" => "Mittwoch",
+"Thursday" => "Donnerstag",
+"Friday" => "Freitag",
+"Saturday" => "Samstag",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "März",
+"April" => "April",
+"May" => "Mai",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Dezember",
+"Settings" => "Einstellungen",
+"seconds ago" => "Gerade eben",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"today" => "Heute",
+"yesterday" => "Gestern",
+"_%n day ago_::_%n days ago_" => array("",""),
+"last month" => "Letzten Monat",
+"_%n month ago_::_%n months ago_" => array("",""),
+"months ago" => "Vor Monaten",
+"last year" => "Letztes Jahr",
+"years ago" => "Vor Jahren",
+"Choose" => "Auswählen",
+"Error loading file picker template" => "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten.",
+"Yes" => "Ja",
+"No" => "Nein",
+"Ok" => "OK",
+"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
+"Error" => "Fehler",
+"The app name is not specified." => "Der App-Name ist nicht angegeben.",
+"The required file {file} is not installed!" => "Die benötigte Datei {file} ist nicht installiert!",
+"Shared" => "Geteilt",
+"Share" => "Teilen",
+"Error while sharing" => "Fehler beim Teilen",
+"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
+"Error while changing permissions" => "Fehler bei der Änderung der Rechte",
+"Shared with you and the group {group} by {owner}" => "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
+"Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
+"Share with" => "Teilen mit",
+"Share with link" => "Über einen Link teilen",
+"Password protect" => "Passwortschutz",
+"Password" => "Passwort",
+"Allow Public Upload" => "Öffentliches Hochladen erlauben",
+"Email link to person" => "Link per E-Mail verschicken",
+"Send" => "Senden",
+"Set expiration date" => "Ein Ablaufdatum setzen",
+"Expiration date" => "Ablaufdatum",
+"Share via email:" => "Mittels einer E-Mail teilen:",
+"No people found" => "Niemand gefunden",
+"Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt",
+"Shared in {item} with {user}" => "Freigegeben in {item} von {user}",
+"Unshare" => "Freigabe aufheben",
+"can edit" => "kann bearbeiten",
+"access control" => "Zugriffskontrolle",
+"create" => "erstellen",
+"update" => "aktualisieren",
+"delete" => "löschen",
+"share" => "teilen",
+"Password protected" => "Passwortgeschützt",
+"Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
+"Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
+"Sending ..." => "Sende ...",
+"Email sent" => "Email gesendet",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
+"Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen Zeitspanne erhalten, prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?",
+"You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
+"Username" => "Benutzername",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
+"Yes, I really want to reset my password now" => "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
+"Request reset" => "Zurücksetzung anfordern",
+"Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
+"To login page" => "Zur Login-Seite",
+"New password" => "Neues Passwort",
+"Reset password" => "Passwort zurücksetzen",
+"Personal" => "Persönlich",
+"Users" => "Benutzer",
+"Apps" => "Apps",
+"Admin" => "Administrator",
+"Help" => "Hilfe",
+"Access forbidden" => "Zugriff verboten",
+"Cloud not found" => "Cloud wurde nicht gefunden",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\nViele Grüsse!",
+"Edit categories" => "Kategorien ändern",
+"Add" => "Hinzufügen",
+"Security Warning" => "Sicherheitshinweis",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
+"Please update your PHP installation to use %s securely." => "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Ihr Konto zu übernehmen.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
+"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
+"Advanced" => "Fortgeschritten",
+"Data folder" => "Datenverzeichnis",
+"Configure the database" => "Datenbank einrichten",
+"will be used" => "wird verwendet",
+"Database user" => "Datenbank-Benutzer",
+"Database password" => "Datenbank-Passwort",
+"Database name" => "Datenbank-Name",
+"Database tablespace" => "Datenbank-Tablespace",
+"Database host" => "Datenbank-Host",
+"Finish setup" => "Installation abschliessen",
+"%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
+"Log out" => "Abmelden",
+"More apps" => "Mehr Apps",
+"Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
+"If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!",
+"Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.",
+"Lost your password?" => "Passwort vergessen?",
+"remember" => "merken",
+"Log in" => "Einloggen",
+"Alternative Logins" => "Alternative Logins",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüsse!",
+"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 4242bbb1aae..60f5418727a 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s geteilt »%s« mit Ihnen",
"Category type not provided." => "Kategorie nicht angegeben.",
"No category to add?" => "Keine Kategorie hinzuzufügen?",
@@ -29,20 +30,17 @@
"December" => "Dezember",
"Settings" => "Einstellungen",
"seconds ago" => "Gerade eben",
-"1 minute ago" => "Vor 1 Minute",
-"{minutes} minutes ago" => "Vor {minutes} Minuten",
-"1 hour ago" => "Vor einer Stunde",
-"{hours} hours ago" => "Vor {hours} Stunden",
+"_%n minute ago_::_%n minutes ago_" => array("Vor %n Minute","Vor %n Minuten"),
+"_%n hour ago_::_%n hours ago_" => array("Vor %n Stunde","Vor %n Stunden"),
"today" => "Heute",
"yesterday" => "Gestern",
-"{days} days ago" => "Vor {days} Tag(en)",
+"_%n day ago_::_%n days ago_" => array("Vor %n Tag","Vor %n Tagen"),
"last month" => "Letzten Monat",
-"{months} months ago" => "Vor {months} Monaten",
+"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
"months ago" => "Vor Monaten",
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
"Choose" => "Auswählen",
-"Cancel" => "Abbrechen",
"Error loading file picker template" => "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten.",
"Yes" => "Ja",
"No" => "Nein",
@@ -85,7 +83,7 @@
"Email sent" => "Email gesendet",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
-"ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
+"%s password reset" => "%s-Passwort zurücksetzen",
"Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen Zeitspanne erhalten, prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator.",
"Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?",
@@ -128,6 +126,7 @@
"Finish setup" => "Installation abschließen",
"%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
"Log out" => "Abmelden",
+"More apps" => "Mehr Apps",
"Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
"If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!",
"Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.",
@@ -136,7 +135,6 @@
"Log in" => "Einloggen",
"Alternative Logins" => "Alternative Logins",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüße!",
-"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."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 80f14feafe5..51a3a68d788 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "Ο %s διαμοιράστηκε μαζί σας το »%s«",
"Category type not provided." => "Δεν δώθηκε τύπος κατηγορίας.",
"No category to add?" => "Δεν έχετε κατηγορία να προσθέσετε;",
@@ -29,20 +30,17 @@
"December" => "Δεκέμβριος",
"Settings" => "Ρυθμίσεις",
"seconds ago" => "δευτερόλεπτα πριν",
-"1 minute ago" => "1 λεπτό πριν",
-"{minutes} minutes ago" => "{minutes} λεπτά πριν",
-"1 hour ago" => "1 ώρα πριν",
-"{hours} hours ago" => "{hours} ώρες πριν",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "σήμερα",
"yesterday" => "χτες",
-"{days} days ago" => "{days} ημέρες πριν",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "τελευταίο μήνα",
-"{months} months ago" => "{months} μήνες πριν",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "μήνες πριν",
"last year" => "τελευταίο χρόνο",
"years ago" => "χρόνια πριν",
"Choose" => "Επιλέξτε",
-"Cancel" => "Άκυρο",
"Error loading file picker template" => "Σφάλμα φόρτωσης αρχείου επιλογέα προτύπου",
"Yes" => "Ναι",
"No" => "Όχι",
@@ -85,7 +83,6 @@
"Email sent" => "Το Email απεστάλη ",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ στείλτε αναφορά στην <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">κοινότητα ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
-"ownCloud password reset" => "Επαναφορά συνθηματικού ownCloud",
"Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Ο σύνδεσμος για να επανακτήσετε τον κωδικό σας έχει σταλεί στο email <br>αν δεν το λάβετε μέσα σε ορισμένο διάστημα, ελέγξετε τους φακελλους σας spam/junk <br> αν δεν είναι εκεί ρωτήστε τον τοπικό σας διαχειριστή ",
"Request failed!<br>Did you make sure your email/username was right?" => "Η αίτηση απέτυχε! Βεβαιωθηκατε ότι το email σας / username ειναι σωστο? ",
@@ -136,7 +133,6 @@
"Log in" => "Είσοδος",
"Alternative Logins" => "Εναλλακτικές Συνδέσεις",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Γεια σας,<br><br>σας ενημερώνουμε ότι ο %s διαμοιράστηκε μαζί σας το »%s«.<br><a href=\"%s\">Δείτε το!</a><br><br>Γεια χαρά!",
-"prev" => "προηγούμενο",
-"next" => "επόμενο",
"Updating ownCloud to version %s, this may take a while." => "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/en@pirate.php b/core/l10n/en@pirate.php
index 482632f3fda..997d1f88c46 100644
--- a/core/l10n/en@pirate.php
+++ b/core/l10n/en@pirate.php
@@ -1,3 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
"Password" => "Passcode"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index db611139344..fc688b103a6 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s kunhavigis “%s” kun vi",
"Category type not provided." => "Ne proviziĝis tipon de kategorio.",
"No category to add?" => "Ĉu neniu kategorio estas aldonota?",
@@ -29,20 +30,17 @@
"December" => "Decembro",
"Settings" => "Agordo",
"seconds ago" => "sekundoj antaŭe",
-"1 minute ago" => "antaŭ 1 minuto",
-"{minutes} minutes ago" => "antaŭ {minutes} minutoj",
-"1 hour ago" => "antaŭ 1 horo",
-"{hours} hours ago" => "antaŭ {hours} horoj",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "hodiaŭ",
"yesterday" => "hieraŭ",
-"{days} days ago" => "antaŭ {days} tagoj",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "lastamonate",
-"{months} months ago" => "antaŭ {months} monatoj",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "monatoj antaŭe",
"last year" => "lastajare",
"years ago" => "jaroj antaŭe",
"Choose" => "Elekti",
-"Cancel" => "Nuligi",
"Yes" => "Jes",
"No" => "Ne",
"Ok" => "Akcepti",
@@ -83,7 +81,6 @@
"Email sent" => "La retpoŝtaĵo sendiĝis",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La ĝisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
-"ownCloud password reset" => "La pasvorto de ownCloud restariĝis.",
"Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
"Request failed!<br>Did you make sure your email/username was right?" => "La peto malsukcesis!<br />Ĉu vi certiĝis, ke via retpoŝto/uzantonomo ĝustas?",
"You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
@@ -128,7 +125,6 @@
"Log in" => "Ensaluti",
"Alternative Logins" => "Alternativaj ensalutoj",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Saluton:<br /><br />Ni nur sciigas vin, ke %s kunhavigis “%s” kun vi.<br /><a href=\"%s\">Vidu ĝin</a><br /><br />Ĝis!",
-"prev" => "maljena",
-"next" => "jena",
"Updating ownCloud to version %s, this may take a while." => "ownCloud ĝisdatiĝas al eldono %s, tio ĉi povas daŭri je iom da tempo."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 84064e54add..9e7f5656683 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s compatido »%s« contigo",
"Category type not provided." => "Tipo de categoría no proporcionado.",
"No category to add?" => "¿Ninguna categoría para añadir?",
@@ -29,20 +30,17 @@
"December" => "Diciembre",
"Settings" => "Ajustes",
"seconds ago" => "hace segundos",
-"1 minute ago" => "hace 1 minuto",
-"{minutes} minutes ago" => "hace {minutes} minutos",
-"1 hour ago" => "Hace 1 hora",
-"{hours} hours ago" => "Hace {hours} horas",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "hoy",
"yesterday" => "ayer",
-"{days} days ago" => "hace {days} días",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "el mes pasado",
-"{months} months ago" => "Hace {months} meses",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "hace meses",
"last year" => "el año pasado",
"years ago" => "hace años",
"Choose" => "Seleccionar",
-"Cancel" => "Cancelar",
"Error loading file picker template" => "Error cargando la plantilla del seleccionador de archivos",
"Yes" => "Sí",
"No" => "No",
@@ -83,9 +81,8 @@
"Error setting expiration date" => "Error estableciendo fecha de caducidad",
"Sending ..." => "Enviando...",
"Email sent" => "Correo electrónico enviado",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</ a>.",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
-"ownCloud password reset" => "Reseteo contraseña de ownCloud",
"Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. <br> Si no está allí, pregunte a su administrador local.",
"Request failed!<br>Did you make sure your email/username was right?" => "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?",
@@ -136,7 +133,6 @@
"Log in" => "Entrar",
"Alternative Logins" => "Inicios de sesión alternativos",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Oye,<br><br>sólo te hago saber que %s compartido %s contigo,<br><a href=\"%s\">\nMíralo!</a><br><br>Disfrutalo!",
-"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."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 1f8f5a80127..cd51ba2f441 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s compartió \"%s\" con vos",
"Category type not provided." => "Tipo de categoría no provisto. ",
"No category to add?" => "¿Ninguna categoría para añadir?",
@@ -29,20 +30,17 @@
"December" => "diciembre",
"Settings" => "Configuración",
"seconds ago" => "segundos atrás",
-"1 minute ago" => "hace 1 minuto",
-"{minutes} minutes ago" => "hace {minutes} minutos",
-"1 hour ago" => "1 hora atrás",
-"{hours} hours ago" => "hace {hours} horas",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "hoy",
"yesterday" => "ayer",
-"{days} days ago" => "hace {days} días",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "el mes pasado",
-"{months} months ago" => "{months} meses atrás",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "meses atrás",
"last year" => "el año pasado",
"years ago" => "años atrás",
"Choose" => "Elegir",
-"Cancel" => "Cancelar",
"Error loading file picker template" => "Error al cargar la plantilla del seleccionador de archivos",
"Yes" => "Sí",
"No" => "No",
@@ -85,7 +83,6 @@
"Email sent" => "e-mail mandado",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización no pudo ser completada. Por favor, reportá el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
-"ownCloud password reset" => "Restablecer contraseña de ownCloud",
"Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña fue enviada a tu e-mail. <br> Si no lo recibís en un plazo de tiempo razonable, revisá tu carpeta de spam / correo no deseado. <br> Si no está ahí, preguntale a tu administrador.",
"Request failed!<br>Did you make sure your email/username was right?" => "¡Error en el pedido! <br> ¿Estás seguro de que tu dirección de correo electrónico o nombre de usuario son correcto?",
@@ -134,7 +131,6 @@
"Log in" => "Iniciar sesión",
"Alternative Logins" => "Nombre alternativos de usuarios",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hola,<br><br>Simplemente te informo que %s compartió %s con vos.<br><a href=\"%s\">Miralo acá:</a><br><br>¡Chau!",
-"prev" => "anterior",
-"next" => "siguiente",
"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede demorar un rato."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 869972a8b83..a13ed032221 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s jagas sinuga »%s«",
"Category type not provided." => "Kategooria tüüp puudub.",
"No category to add?" => "Pole kategooriat, mida lisada?",
@@ -29,20 +30,17 @@
"December" => "Detsember",
"Settings" => "Seaded",
"seconds ago" => "sekundit tagasi",
-"1 minute ago" => "1 minut tagasi",
-"{minutes} minutes ago" => "{minutes} minutit tagasi",
-"1 hour ago" => "1 tund tagasi",
-"{hours} hours ago" => "{hours} tundi tagasi",
+"_%n minute ago_::_%n minutes ago_" => array("%n minut tagasi","%n minutit tagasi"),
+"_%n hour ago_::_%n hours ago_" => array("%n tund tagasi","%n tundi tagasi"),
"today" => "täna",
"yesterday" => "eile",
-"{days} days ago" => "{days} päeva tagasi",
+"_%n day ago_::_%n days ago_" => array("%n päev tagasi","%n päeva tagasi"),
"last month" => "viimasel kuul",
-"{months} months ago" => "{months} kuud tagasi",
+"_%n month ago_::_%n months ago_" => array("%n kuu tagasi","%n kuud tagasi"),
"months ago" => "kuu tagasi",
"last year" => "viimasel aastal",
"years ago" => "aastat tagasi",
"Choose" => "Vali",
-"Cancel" => "Loobu",
"Error loading file picker template" => "Viga failivalija malli laadimisel",
"Yes" => "Jah",
"No" => "Ei",
@@ -85,7 +83,7 @@
"Email sent" => "E-kiri on saadetud",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uuendus ebaõnnestus. Palun teavita probleemidest <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kogukonda</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
-"ownCloud password reset" => "ownCloud parooli taastamine",
+"%s password reset" => "%s parooli lähtestus",
"Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Link parooli vahetuseks on saadetud Sinu e-posti aadressile.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge.<br>Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.",
"Request failed!<br>Did you make sure your email/username was right?" => "Päring ebaõnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on õiged?",
@@ -128,6 +126,7 @@
"Finish setup" => "Lõpeta seadistamine",
"%s is available. Get more information on how to update." => "%s on saadaval. Vaata lähemalt kuidas uuendada.",
"Log out" => "Logi välja",
+"More apps" => "Rohkem rakendusi",
"Automatic logon rejected!" => "Automaatne sisselogimine lükati tagasi!",
"If you did not change your password recently, your account may be compromised!" => "Kui sa ei muutnud oma parooli hiljuti, siis võib su kasutajakonto olla ohustatud!",
"Please change your password to secure your account again." => "Palun muuda parooli, et oma kasutajakonto uuesti turvata.",
@@ -136,7 +135,6 @@
"Log in" => "Logi sisse",
"Alternative Logins" => "Alternatiivsed sisselogimisviisid",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei,<br><br>lihtsalt annan sulle teada, et %s jagas sinuga »%s«.<br><a href=\"%s\">Vaata seda!</a><br><br>Tervitades!",
-"prev" => "eelm",
-"next" => "järgm",
"Updating ownCloud to version %s, this may take a while." => "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 016e96b751f..280c5a94b60 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s-ek »%s« zurekin partekatu du",
"Category type not provided." => "Kategoria mota ez da zehaztu.",
"No category to add?" => "Ez dago gehitzeko kategoriarik?",
@@ -29,20 +30,17 @@
"December" => "Abendua",
"Settings" => "Ezarpenak",
"seconds ago" => "segundu",
-"1 minute ago" => "orain dela minutu 1",
-"{minutes} minutes ago" => "orain dela {minutes} minutu",
-"1 hour ago" => "orain dela ordu bat",
-"{hours} hours ago" => "orain dela {hours} ordu",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "gaur",
"yesterday" => "atzo",
-"{days} days ago" => "orain dela {days} egun",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "joan den hilabetean",
-"{months} months ago" => "orain dela {months} hilabete",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "hilabete",
"last year" => "joan den urtean",
"years ago" => "urte",
"Choose" => "Aukeratu",
-"Cancel" => "Ezeztatu",
"Error loading file picker template" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan",
"Yes" => "Bai",
"No" => "Ez",
@@ -85,7 +83,6 @@
"Email sent" => "Eposta bidalia",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
-"ownCloud password reset" => "ownCloud-en pasahitza berrezarri",
"Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora \nepe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan ipini.",
"Request failed!<br>Did you make sure your email/username was right?" => "Eskaerak huts egin du!<br>Ziur zaude posta/pasahitza zuzenak direla?",
@@ -136,7 +133,6 @@
"Log in" => "Hasi saioa",
"Alternative Logins" => "Beste erabiltzaile izenak",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.<br><a href=\"%s\">\nIkusi ezazu</a><br><br>Ongi jarraitu!",
-"prev" => "aurrekoa",
-"next" => "hurrengoa",
"Updating ownCloud to version %s, this may take a while." => "ownCloud %s bertsiora eguneratzen, denbora har dezake."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index c13c6a0e345..a9e17a194ae 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s به اشتراک گذاشته شده است »%s« توسط شما",
"Category type not provided." => "نوع دسته بندی ارائه نشده است.",
"No category to add?" => "آیا گروه دیگری برای افزودن ندارید",
@@ -29,20 +30,17 @@
"December" => "دسامبر",
"Settings" => "تنظیمات",
"seconds ago" => "ثانیه‌ها پیش",
-"1 minute ago" => "1 دقیقه پیش",
-"{minutes} minutes ago" => "{دقیقه ها} دقیقه های پیش",
-"1 hour ago" => "1 ساعت پیش",
-"{hours} hours ago" => "{ساعت ها} ساعت ها پیش",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "امروز",
"yesterday" => "دیروز",
-"{days} days ago" => "{روزها} روزهای پیش",
+"_%n day ago_::_%n days ago_" => array(""),
"last month" => "ماه قبل",
-"{months} months ago" => "{ماه ها} ماه ها پیش",
+"_%n month ago_::_%n months ago_" => array(""),
"months ago" => "ماه‌های قبل",
"last year" => "سال قبل",
"years ago" => "سال‌های قبل",
"Choose" => "انتخاب کردن",
-"Cancel" => "منصرف شدن",
"Error loading file picker template" => "خطا در بارگذاری قالب انتخاب کننده فایل",
"Yes" => "بله",
"No" => "نه",
@@ -85,7 +83,6 @@
"Email sent" => "ایمیل ارسال شد",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "به روز رسانی ناموفق بود. لطفا این خطا را به <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">جامعه ی OwnCloud</a> گزارش نمایید.",
"The update was successful. Redirecting you to ownCloud now." => "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
-"ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
"Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است.<br>اگر آن رادر یک زمان مشخصی دریافت نکرده اید، لطفا هرزنامه/ پوشه های ناخواسته را بررسی کنید.<br>در صورت نبودن از مدیر خود بپرسید.",
"Request failed!<br>Did you make sure your email/username was right?" => "درخواست رد شده است !<br> آیا مطمئن هستید که ایمیل/ نام کاربری شما صحیح میباشد ؟",
@@ -134,7 +131,6 @@
"Log in" => "ورود",
"Alternative Logins" => "ورود متناوب",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "اینجا<br><br> فقط به شما اجازه میدهد که بدانید %s به اشتراک گذاشته شده»%s« توسط شما.<br><a href=\"%s\"> مشاهده آن!</a><br><br> به سلامتی!",
-"prev" => "بازگشت",
-"next" => "بعدی",
"Updating ownCloud to version %s, this may take a while." => "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/fi.php b/core/l10n/fi.php
index 655d544d393..956ab312337 100644
--- a/core/l10n/fi.php
+++ b/core/l10n/fi.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Settings" => "asetukset",
"Username" => "Käyttäjätunnus"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 75209d260ef..d3cfe01293e 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s jakoi kohteen »%s« kanssasi",
"Category type not provided." => "Luokan tyyppiä ei määritelty.",
"No category to add?" => "Ei lisättävää luokkaa?",
@@ -27,20 +28,17 @@
"December" => "joulukuu",
"Settings" => "Asetukset",
"seconds ago" => "sekuntia sitten",
-"1 minute ago" => "1 minuutti sitten",
-"{minutes} minutes ago" => "{minutes} minuuttia sitten",
-"1 hour ago" => "1 tunti sitten",
-"{hours} hours ago" => "{hours} tuntia sitten",
+"_%n minute ago_::_%n minutes ago_" => array("%n minuutti sitten","%n minuuttia sitten"),
+"_%n hour ago_::_%n hours ago_" => array("%n tunti sitten","%n tuntia sitten"),
"today" => "tänään",
"yesterday" => "eilen",
-"{days} days ago" => "{days} päivää sitten",
+"_%n day ago_::_%n days ago_" => array("%n päivä sitten","%n päivää sitten"),
"last month" => "viime kuussa",
-"{months} months ago" => "{months} kuukautta sitten",
+"_%n month ago_::_%n months ago_" => array("%n kuukausi sitten","%n kuukautta sitten"),
"months ago" => "kuukautta sitten",
"last year" => "viime vuonna",
"years ago" => "vuotta sitten",
"Choose" => "Valitse",
-"Cancel" => "Peru",
"Yes" => "Kyllä",
"No" => "Ei",
"Ok" => "Ok",
@@ -58,6 +56,7 @@
"Share with link" => "Jaa linkillä",
"Password protect" => "Suojaa salasanalla",
"Password" => "Salasana",
+"Allow Public Upload" => "Salli julkinen lähetys",
"Email link to person" => "Lähetä linkki sähköpostitse",
"Send" => "Lähetä",
"Set expiration date" => "Aseta päättymispäivä",
@@ -79,7 +78,6 @@
"Email sent" => "Sähköposti lähetetty",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-yhteisölle</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
-"ownCloud password reset" => "ownCloud-salasanan nollaus",
"Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linkki salasanan nollaamiseen on lähetetty sähköpostiisi.<br>Jos et saa viestiä pian, tarkista roskapostikansiosi.<br>Jos et löydä viestiä roskapostinkaan seasta, ota yhteys ylläpitäjään.",
"Request failed!<br>Did you make sure your email/username was right?" => "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?",
@@ -120,6 +118,7 @@
"Finish setup" => "Viimeistele asennus",
"%s is available. Get more information on how to update." => "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
"Log out" => "Kirjaudu ulos",
+"More apps" => "Lisää sovelluksia",
"Automatic logon rejected!" => "Automaattinen sisäänkirjautuminen hylättiin!",
"If you did not change your password recently, your account may be compromised!" => "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu.",
"Please change your password to secure your account again." => "Vaihda salasanasi suojataksesi tilisi uudelleen.",
@@ -128,7 +127,6 @@
"Log in" => "Kirjaudu sisään",
"Alternative Logins" => "Vaihtoehtoiset kirjautumiset",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei!<br><br>%s jakoi kohteen »%s« kanssasi.<br><a href=\"%s\">Katso se tästä!</a><br><br>Näkemiin!",
-"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."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 055b6c02e41..3f85cb1503f 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s partagé »%s« avec vous",
"Category type not provided." => "Type de catégorie non spécifié.",
"No category to add?" => "Pas de catégorie à ajouter ?",
@@ -29,20 +30,17 @@
"December" => "décembre",
"Settings" => "Paramètres",
"seconds ago" => "il y a quelques secondes",
-"1 minute ago" => "il y a une minute",
-"{minutes} minutes ago" => "il y a {minutes} minutes",
-"1 hour ago" => "Il y a une heure",
-"{hours} hours ago" => "Il y a {hours} heures",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "aujourd'hui",
"yesterday" => "hier",
-"{days} days ago" => "il y a {days} jours",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "le mois dernier",
-"{months} months ago" => "Il y a {months} mois",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "il y a plusieurs mois",
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
"Choose" => "Choisir",
-"Cancel" => "Annuler",
"Error loading file picker template" => "Erreur de chargement du modèle du sélecteur de fichier",
"Yes" => "Oui",
"No" => "Non",
@@ -85,7 +83,6 @@
"Email sent" => "Email envoyé",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La mise à jour a échoué. Veuillez signaler ce problème à la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communauté ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.",
-"ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
"Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Le lien permettant de réinitialiser votre mot de passe vous a été transmis.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local.",
"Request failed!<br>Did you make sure your email/username was right?" => "Requête en échec!<br>Avez-vous vérifié vos courriel/nom d'utilisateur?",
@@ -134,7 +131,6 @@
"Log in" => "Connexion",
"Alternative Logins" => "Logins alternatifs",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Salut,<br><br>je veux juste vous signaler %s partagé »%s« avec vous.<br><a href=\"%s\">Voyez-le!</a><br><br>Bonne continuation!",
-"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."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 02f3e80b9c8..9db68bbbd05 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s compartiu «%s» con vostede",
"Category type not provided." => "Non se indicou o tipo de categoría",
"No category to add?" => "Sen categoría que engadir?",
@@ -29,20 +30,17 @@
"December" => "decembro",
"Settings" => "Axustes",
"seconds ago" => "segundos atrás",
-"1 minute ago" => "hai 1 minuto",
-"{minutes} minutes ago" => "hai {minutes} minutos",
-"1 hour ago" => "Vai 1 hora",
-"{hours} hours ago" => "hai {hours} horas",
+"_%n minute ago_::_%n minutes ago_" => array("hai %n minuto","hai %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("hai %n hora","hai %n horas"),
"today" => "hoxe",
"yesterday" => "onte",
-"{days} days ago" => "hai {days} días",
+"_%n day ago_::_%n days ago_" => array("hai %n día","hai %n días"),
"last month" => "último mes",
-"{months} months ago" => "hai {months} meses",
+"_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"),
"months ago" => "meses atrás",
"last year" => "último ano",
"years ago" => "anos atrás",
"Choose" => "Escoller",
-"Cancel" => "Cancelar",
"Error loading file picker template" => "Produciuse un erro ao cargar o modelo do selector de ficheiros",
"Yes" => "Si",
"No" => "Non",
@@ -85,7 +83,7 @@
"Email sent" => "Correo enviado",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualización non foi satisfactoria, informe deste problema á <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
-"ownCloud password reset" => "Restabelecer o contrasinal de ownCloud",
+"%s password reset" => "Restabelecer o contrasinal %s",
"Use the following link to reset your password: {link}" => "Usa a seguinte ligazón para restabelecer o contrasinal: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Envióuselle ao seu correo unha ligazón para restabelecer o seu contrasinal.<br>Se non o recibe nun prazo razoábel de tempo, revise o seu cartafol de correo lixo ou de non desexados.<br> Se non o atopa aí pregúntelle ao seu administrador local..",
"Request failed!<br>Did you make sure your email/username was right?" => "Non foi posíbel facer a petición!<br>Asegúrese de que o seu enderezo de correo ou nome de usuario é correcto.",
@@ -128,6 +126,7 @@
"Finish setup" => "Rematar a configuración",
"%s is available. Get more information on how to update." => "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
"Log out" => "Desconectar",
+"More apps" => "Máis aplicativos",
"Automatic logon rejected!" => "Rexeitouse a entrada automática",
"If you did not change your password recently, your account may be compromised!" => "Se non fixo recentemente cambios de contrasinal é posíbel que a súa conta estea comprometida!",
"Please change your password to secure your account again." => "Cambie de novo o seu contrasinal para asegurar a súa conta.",
@@ -136,7 +135,6 @@
"Log in" => "Conectar",
"Alternative Logins" => "Accesos alternativos",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ola,<br><br>só facerlle saber que %s compartiu «%s» con vostede.<br><a href=\"%s\">Véxao!</a><br><br>Saúdos!",
-"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."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 7624fd8491d..7f3f4dfdd32 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "סוג הקטגוריה לא סופק.",
"No category to add?" => "אין קטגוריה להוספה?",
"This category already exists: %s" => "הקטגוריה הבאה כבר קיימת: %s",
@@ -28,20 +29,17 @@
"December" => "דצמבר",
"Settings" => "הגדרות",
"seconds ago" => "שניות",
-"1 minute ago" => "לפני דקה אחת",
-"{minutes} minutes ago" => "לפני {minutes} דקות",
-"1 hour ago" => "לפני שעה",
-"{hours} hours ago" => "לפני {hours} שעות",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "היום",
"yesterday" => "אתמול",
-"{days} days ago" => "לפני {days} ימים",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "חודש שעבר",
-"{months} months ago" => "לפני {months} חודשים",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "חודשים",
"last year" => "שנה שעברה",
"years ago" => "שנים",
"Choose" => "בחירה",
-"Cancel" => "ביטול",
"Error loading file picker template" => "שגיאה בטעינת תבנית בחירת הקבצים",
"Yes" => "כן",
"No" => "לא",
@@ -83,7 +81,6 @@
"Email sent" => "הודעת הדוא״ל נשלחה",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "תהליך העדכון לא הושלם בהצלחה. נא דווח את הבעיה ב<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">קהילת ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
-"ownCloud password reset" => "איפוס הססמה של ownCloud",
"Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "הקישור לאיפוס הססמה שלך נשלח אליך בדוא״ל.<br>אם לא קיבלת את הקישור תוך זמן סביר, מוטב לבדוק את תיבת הזבל שלך.<br>אם ההודעה לא שם, כדאי לשאול את מנהל הרשת שלך .",
"Request failed!<br>Did you make sure your email/username was right?" => "הבקשה נכשלה!<br>האם כתובת הדוא״ל/שם המשתמש שלך נכונים?",
@@ -128,7 +125,6 @@
"remember" => "שמירת הססמה",
"Log in" => "כניסה",
"Alternative Logins" => "כניסות אלטרנטיביות",
-"prev" => "הקודם",
-"next" => "הבא",
"Updating ownCloud to version %s, this may take a while." => "מעדכן את ownCloud אל גרסא %s, זה עלול לקחת זמן מה."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index 4285f8ce577..00cb5926d70 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"January" => "जनवरी",
"February" => "फरवरी",
"March" => "मार्च",
@@ -12,6 +13,10 @@
"November" => "नवंबर",
"December" => "दिसम्बर",
"Settings" => "सेटिंग्स",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
"Error" => "त्रुटि",
"Share" => "साझा करें",
"Share with" => "के साथ साझा",
@@ -36,7 +41,6 @@
"Database name" => "डेटाबेस का नाम",
"Finish setup" => "सेटअप समाप्त करे",
"Log out" => "लोग आउट",
-"remember" => "याद रखें",
-"prev" => "पिछला",
-"next" => "अगला"
+"remember" => "याद रखें"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 3eb556e9f63..97fbfb8b97f 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"No category to add?" => "Nemate kategorija koje možete dodati?",
"No categories selected for deletion." => "Niti jedna kategorija nije odabrana za brisanje.",
"Sunday" => "nedelja",
@@ -22,14 +23,17 @@
"December" => "Prosinac",
"Settings" => "Postavke",
"seconds ago" => "sekundi prije",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
"today" => "danas",
"yesterday" => "jučer",
+"_%n day ago_::_%n days ago_" => array("","",""),
"last month" => "prošli mjesec",
+"_%n month ago_::_%n months ago_" => array("","",""),
"months ago" => "mjeseci",
"last year" => "prošlu godinu",
"years ago" => "godina",
"Choose" => "Izaberi",
-"Cancel" => "Odustani",
"Yes" => "Da",
"No" => "Ne",
"Ok" => "U redu",
@@ -57,7 +61,6 @@
"Password protected" => "Zaštita lozinkom",
"Error unsetting expiration date" => "Greška prilikom brisanja datuma isteka",
"Error setting expiration date" => "Greška prilikom postavljanja datuma isteka",
-"ownCloud password reset" => "ownCloud resetiranje lozinke",
"Use the following link to reset your password: {link}" => "Koristite ovaj link da biste poništili lozinku: {link}",
"You will receive a link to reset your password via Email." => "Primit ćete link kako biste poništili zaporku putem e-maila.",
"Username" => "Korisničko ime",
@@ -89,7 +92,6 @@
"Log out" => "Odjava",
"Lost your password?" => "Izgubili ste lozinku?",
"remember" => "zapamtiti",
-"Log in" => "Prijava",
-"prev" => "prethodan",
-"next" => "sljedeći"
+"Log in" => "Prijava"
);
+$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;";
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 1d83ad54ce7..c231d7f9a44 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s megosztotta Önnel ezt: »%s«",
"Category type not provided." => "Nincs megadva a kategória típusa.",
"No category to add?" => "Nincs hozzáadandó kategória?",
@@ -29,20 +30,17 @@
"December" => "december",
"Settings" => "Beállítások",
"seconds ago" => "pár másodperce",
-"1 minute ago" => "1 perce",
-"{minutes} minutes ago" => "{minutes} perce",
-"1 hour ago" => "1 órája",
-"{hours} hours ago" => "{hours} órája",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "ma",
"yesterday" => "tegnap",
-"{days} days ago" => "{days} napja",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "múlt hónapban",
-"{months} months ago" => "{months} hónapja",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "több hónapja",
"last year" => "tavaly",
"years ago" => "több éve",
"Choose" => "Válasszon",
-"Cancel" => "Mégsem",
"Error loading file picker template" => "Nem sikerült betölteni a fájlkiválasztó sablont",
"Yes" => "Igen",
"No" => "Nem",
@@ -85,7 +83,6 @@
"Email sent" => "Az emailt elküldtük",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A frissítés nem sikerült. Kérem értesítse erről a problémáról az <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud közösséget</a>.",
"The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
-"ownCloud password reset" => "ownCloud jelszó-visszaállítás",
"Use the following link to reset your password: {link}" => "Használja ezt a linket a jelszó ismételt beállításához: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Emailben fog kapni egy linket, amivel új jelszót tud majd beállítani magának. <br>Ha a levél nem jött meg, holott úgy érzi, hogy már meg kellett volna érkeznie, akkor ellenőrizze a spam/levélszemét mappáját. <br>Ha ott sincsen, akkor érdeklődjön a rendszergazdánál.",
"Request failed!<br>Did you make sure your email/username was right?" => "A kérést nem sikerült teljesíteni! <br>Biztos, hogy jó emailcímet/felhasználónevet adott meg?",
@@ -136,7 +133,6 @@
"Log in" => "Bejelentkezés",
"Alternative Logins" => "Alternatív bejelentkezés",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Üdv!<br><br>Új hír: %s megosztotta Önnel ezt: »%s«.<br><a href=\"%s\">Itt nézhető meg!</a><br><br>Minden jót!",
-"prev" => "előző",
-"next" => "következő",
"Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hy.php b/core/l10n/hy.php
index de0c725c73b..9965d4731b0 100644
--- a/core/l10n/hy.php
+++ b/core/l10n/hy.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Sunday" => "Կիրակի",
"Monday" => "Երկուշաբթի",
"Tuesday" => "Երեքշաբթի",
@@ -17,5 +18,10 @@
"September" => "Սեպտեմբեր",
"October" => "Հոկտեմբեր",
"November" => "Նոյեմբեր",
-"December" => "Դեկտեմբեր"
+"December" => "Դեկտեմբեր",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 8c9b6b88ef3..0556d5d1295 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Sunday" => "Dominica",
"Monday" => "Lunedi",
"Tuesday" => "Martedi",
@@ -19,12 +20,14 @@
"November" => "Novembre",
"December" => "Decembre",
"Settings" => "Configurationes",
-"Cancel" => "Cancellar",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
"Error" => "Error",
"Share" => "Compartir",
"Password" => "Contrasigno",
"Send" => "Invia",
-"ownCloud password reset" => "Reinitialisation del contrasigno de ownCLoud",
"Username" => "Nomine de usator",
"Request reset" => "Requestar reinitialisation",
"Your password was reset" => "Tu contrasigno esseva reinitialisate",
@@ -52,7 +55,6 @@
"Log out" => "Clauder le session",
"Lost your password?" => "Tu perdeva le contrasigno?",
"remember" => "memora",
-"Log in" => "Aperir session",
-"prev" => "prev",
-"next" => "prox"
+"Log in" => "Aperir session"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 716cf39d556..fc6cb788fb0 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "Tipe kategori tidak diberikan.",
"No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
"This category already exists: %s" => "Kategori ini sudah ada: %s",
@@ -28,20 +29,17 @@
"December" => "Desember",
"Settings" => "Setelan",
"seconds ago" => "beberapa detik yang lalu",
-"1 minute ago" => "1 menit yang lalu",
-"{minutes} minutes ago" => "{minutes} menit yang lalu",
-"1 hour ago" => "1 jam yang lalu",
-"{hours} hours ago" => "{hours} jam yang lalu",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "hari ini",
"yesterday" => "kemarin",
-"{days} days ago" => "{days} hari yang lalu",
+"_%n day ago_::_%n days ago_" => array(""),
"last month" => "bulan kemarin",
-"{months} months ago" => "{months} bulan yang lalu",
+"_%n month ago_::_%n months ago_" => array(""),
"months ago" => "beberapa bulan lalu",
"last year" => "tahun kemarin",
"years ago" => "beberapa tahun lalu",
"Choose" => "Pilih",
-"Cancel" => "Batal",
"Yes" => "Ya",
"No" => "Tidak",
"Ok" => "Oke",
@@ -82,7 +80,6 @@
"Email sent" => "Email terkirim",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitas ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
-"ownCloud password reset" => "Setel ulang sandi ownCloud",
"Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
"You will receive a link to reset your password via Email." => "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
"Username" => "Nama pengguna",
@@ -124,7 +121,6 @@
"remember" => "selalu masuk",
"Log in" => "Masuk",
"Alternative Logins" => "Cara Alternatif untuk Masuk",
-"prev" => "sebelumnya",
-"next" => "selanjutnya",
"Updating ownCloud to version %s, this may take a while." => "Memperbarui ownCloud ke versi %s, prosesnya akan berlangsung beberapa saat."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 3d3ce41b27a..8211421cf35 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "Flokkur ekki gefin",
"No category to add?" => "Enginn flokkur til að bæta við?",
"Object type not provided." => "Tegund ekki í boði.",
@@ -27,20 +28,17 @@
"December" => "Desember",
"Settings" => "Stillingar",
"seconds ago" => "sek.",
-"1 minute ago" => "Fyrir 1 mínútu",
-"{minutes} minutes ago" => "{minutes} min síðan",
-"1 hour ago" => "Fyrir 1 klst.",
-"{hours} hours ago" => "fyrir {hours} klst.",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "í dag",
"yesterday" => "í gær",
-"{days} days ago" => "{days} dagar síðan",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "síðasta mánuði",
-"{months} months ago" => "fyrir {months} mánuðum",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "mánuðir síðan",
"last year" => "síðasta ári",
"years ago" => "einhverjum árum",
"Choose" => "Veldu",
-"Cancel" => "Hætta við",
"Yes" => "Já",
"No" => "Nei",
"Ok" => "Í lagi",
@@ -80,7 +78,6 @@
"Sending ..." => "Sendi ...",
"Email sent" => "Tölvupóstur sendur",
"The update was successful. Redirecting you to ownCloud now." => "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
-"ownCloud password reset" => "endursetja ownCloud lykilorð",
"Use the following link to reset your password: {link}" => "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
"You will receive a link to reset your password via Email." => "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
"Username" => "Notendanafn",
@@ -120,7 +117,6 @@
"Lost your password?" => "Týndir þú lykilorðinu?",
"remember" => "muna eftir mér",
"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."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 31ccdb38e66..7a0af92070d 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s ha condiviso «%s» con te",
"Category type not provided." => "Tipo di categoria non fornito.",
"No category to add?" => "Nessuna categoria da aggiungere?",
@@ -29,20 +30,17 @@
"December" => "Dicembre",
"Settings" => "Impostazioni",
"seconds ago" => "secondi fa",
-"1 minute ago" => "Un minuto fa",
-"{minutes} minutes ago" => "{minutes} minuti fa",
-"1 hour ago" => "1 ora fa",
-"{hours} hours ago" => "{hours} ore fa",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "oggi",
"yesterday" => "ieri",
-"{days} days ago" => "{days} giorni fa",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "mese scorso",
-"{months} months ago" => "{months} mesi fa",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "mesi fa",
"last year" => "anno scorso",
"years ago" => "anni fa",
"Choose" => "Scegli",
-"Cancel" => "Annulla",
"Error loading file picker template" => "Errore durante il caricamento del modello del selezionatore di file",
"Yes" => "Sì",
"No" => "No",
@@ -85,7 +83,6 @@
"Email sent" => "Messaggio inviato",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunità di ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
-"ownCloud password reset" => "Ripristino password di ownCloud",
"Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Il collegamento per ripristinare la password è stato inviato al tuo indirizzo di posta.<br>Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
"Request failed!<br>Did you make sure your email/username was right?" => "Richiesta non riuscita!<br>Sei sicuro che l'indirizzo di posta/nome utente fosse corretto?",
@@ -136,7 +133,6 @@
"Log in" => "Accedi",
"Alternative Logins" => "Accessi alternativi",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso «%s» con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!",
-"prev" => "precedente",
-"next" => "successivo",
"Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 7c837800b0f..31d2f92eff2 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%sが あなたと »%s«を共有しました",
"Category type not provided." => "カテゴリタイプは提供されていません。",
"No category to add?" => "追加するカテゴリはありませんか?",
@@ -29,20 +30,17 @@
"December" => "12月",
"Settings" => "設定",
"seconds ago" => "数秒前",
-"1 minute ago" => "1 分前",
-"{minutes} minutes ago" => "{minutes} 分前",
-"1 hour ago" => "1 時間前",
-"{hours} hours ago" => "{hours} 時間前",
+"_%n minute ago_::_%n minutes ago_" => array("%n 分前"),
+"_%n hour ago_::_%n hours ago_" => array("%n 時間後"),
"today" => "今日",
"yesterday" => "昨日",
-"{days} days ago" => "{days} 日前",
+"_%n day ago_::_%n days ago_" => array("%n 日後"),
"last month" => "一月前",
-"{months} months ago" => "{months} 月前",
+"_%n month ago_::_%n months ago_" => array("%n カ月後"),
"months ago" => "月前",
"last year" => "一年前",
"years ago" => "年前",
"Choose" => "選択",
-"Cancel" => "キャンセル",
"Error loading file picker template" => "ファイルピッカーのテンプレートの読み込みエラー",
"Yes" => "はい",
"No" => "いいえ",
@@ -85,7 +83,7 @@
"Email sent" => "メールを送信しました",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新に成功しました。この問題を <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> にレポートしてください。",
"The update was successful. Redirecting you to ownCloud now." => "更新に成功しました。今すぐownCloudにリダイレクトします。",
-"ownCloud password reset" => "ownCloudのパスワードをリセットします",
+"%s password reset" => "%s パスワードリセット",
"Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "パスワードリセットのリンクをあなたのメールアドレスに送信しました。<br>しばらくたっても受信出来ない場合は、スパム/迷惑メールフォルダを確認して下さい。<br>もしそこにもない場合は、管理者に問い合わせてください。",
"Request failed!<br>Did you make sure your email/username was right?" => "リクエストに失敗しました!<br>あなたのメール/ユーザ名が正しいことを確認しましたか?",
@@ -110,9 +108,11 @@
"Add" => "追加",
"Security Warning" => "セキュリティ警告",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)という脆弱性が含まれています。",
+"Please update your PHP installation to use %s securely." => "%s を安全に利用する為に インストールされているPHPをアップデートしてください。",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にして下さい。",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "セキュアな乱数生成器が無い場合、攻撃者がパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess ファイルが動作していないため、おそらくあなたのデータディレクトリもしくはファイルはインターネットからアクセス可能です。",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。",
"Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
"Advanced" => "詳細設定",
"Data folder" => "データフォルダ",
@@ -126,6 +126,7 @@
"Finish setup" => "セットアップを完了します",
"%s is available. Get more information on how to update." => "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。",
"Log out" => "ログアウト",
+"More apps" => "他のアプリ",
"Automatic logon rejected!" => "自動ログインは拒否されました!",
"If you did not change your password recently, your account may be compromised!" => "最近パスワードを変更していない場合、あなたのアカウントは危険にさらされているかもしれません。",
"Please change your password to secure your account again." => "アカウント保護の為、パスワードを再度の変更をお願いいたします。",
@@ -134,7 +135,6 @@
"Log in" => "ログイン",
"Alternative Logins" => "代替ログイン",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>それでは。",
-"prev" => "前",
-"next" => "次",
"Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ka.php b/core/l10n/ka.php
index b8deeb1e550..b6700f00f94 100644
--- a/core/l10n/ka.php
+++ b/core/l10n/ka.php
@@ -1,12 +1,16 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"seconds ago" => "წამის წინ",
-"1 minute ago" => "1 წუთის წინ",
-"1 hour ago" => "1 საათის წინ",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "დღეს",
"yesterday" => "გუშინ",
+"_%n day ago_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array(""),
"Password" => "პაროლი",
"Personal" => "პერსონა",
"Users" => "მომხმარებლები",
"Admin" => "ადმინისტრატორი",
"Help" => "შველა"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index f664c9b5ce3..0f4b23906d6 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "კატეგორიის ტიპი არ არის განხილული.",
"No category to add?" => "არ არის კატეგორია დასამატებლად?",
"This category already exists: %s" => "კატეგორია უკვე არსებობს: %s",
@@ -28,20 +29,17 @@
"December" => "დეკემბერი",
"Settings" => "პარამეტრები",
"seconds ago" => "წამის წინ",
-"1 minute ago" => "1 წუთის წინ",
-"{minutes} minutes ago" => "{minutes} წუთის წინ",
-"1 hour ago" => "1 საათის წინ",
-"{hours} hours ago" => "{hours} საათის წინ",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "დღეს",
"yesterday" => "გუშინ",
-"{days} days ago" => "{days} დღის წინ",
+"_%n day ago_::_%n days ago_" => array(""),
"last month" => "გასულ თვეში",
-"{months} months ago" => "{months} თვის წინ",
+"_%n month ago_::_%n months ago_" => array(""),
"months ago" => "თვის წინ",
"last year" => "ბოლო წელს",
"years ago" => "წლის წინ",
"Choose" => "არჩევა",
-"Cancel" => "უარყოფა",
"Yes" => "კი",
"No" => "არა",
"Ok" => "დიახ",
@@ -82,7 +80,6 @@
"Email sent" => "იმეილი გაიგზავნა",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "განახლება ვერ განხორციელდა. გთხოვთ შეგვატყობინოთ ამ პრობლემის შესახებ აქ: <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
-"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." => "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
"Username" => "მომხმარებლის სახელი",
@@ -124,7 +121,6 @@
"remember" => "დამახსოვრება",
"Log in" => "შესვლა",
"Alternative Logins" => "ალტერნატიული Login–ი",
-"prev" => "წინა",
-"next" => "შემდეგი",
"Updating ownCloud to version %s, this may take a while." => "ownCloud–ის განახლება %s–ვერსიამდე. ეს მოითხოვს გარკვეულ დროს."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/kn.php b/core/l10n/kn.php
new file mode 100644
index 00000000000..556cca20dac
--- /dev/null
+++ b/core/l10n/kn.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index e534da85e9e..4c2d33e3010 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "분류 형식이 제공되지 않았습니다.",
"No category to add?" => "추가할 분류가 없습니까?",
"This category already exists: %s" => "분류가 이미 존재합니다: %s",
@@ -28,20 +29,17 @@
"December" => "12월",
"Settings" => "설정",
"seconds ago" => "초 전",
-"1 minute ago" => "1분 전",
-"{minutes} minutes ago" => "{minutes}분 전",
-"1 hour ago" => "1시간 전",
-"{hours} hours ago" => "{hours}시간 전",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "오늘",
"yesterday" => "어제",
-"{days} days ago" => "{days}일 전",
+"_%n day ago_::_%n days ago_" => array(""),
"last month" => "지난 달",
-"{months} months ago" => "{months}개월 전",
+"_%n month ago_::_%n months ago_" => array(""),
"months ago" => "개월 전",
"last year" => "작년",
"years ago" => "년 전",
"Choose" => "선택",
-"Cancel" => "취소",
"Yes" => "예",
"No" => "아니요",
"Ok" => "승락",
@@ -83,7 +81,6 @@
"Email sent" => "이메일 발송됨",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "업데이트가 실패하였습니다. 이 문제를 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 커뮤니티</a>에 보고해 주십시오.",
"The update was successful. Redirecting you to ownCloud now." => "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
-"ownCloud password reset" => "ownCloud 암호 재설정",
"Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
"Request failed!<br>Did you make sure your email/username was right?" => "요청이 실패했습니다!<br>email 주소와 사용자 명을 정확하게 넣으셨나요?",
"You will receive a link to reset your password via Email." => "이메일로 암호 재설정 링크를 보냈습니다.",
@@ -127,7 +124,6 @@
"remember" => "기억하기",
"Log in" => "로그인",
"Alternative Logins" => "대체 ",
-"prev" => "이전",
-"next" => "다음",
"Updating ownCloud to version %s, this may take a while." => "ownCloud를 버전 %s(으)로 업데이트합니다. 잠시 기다려 주십시오."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index 1902e450613..a2a0ff22ef6 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -1,5 +1,10 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Settings" => "ده‌ستكاری",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
"Error" => "هه‌ڵه",
"Password" => "وشەی تێپەربو",
"Username" => "ناوی به‌کارهێنه‌ر",
@@ -18,7 +23,6 @@
"Database name" => "ناوی داتابه‌یس",
"Database host" => "هۆستی داتابه‌یس",
"Finish setup" => "كۆتایی هات ده‌ستكاریه‌كان",
-"Log out" => "چوونەدەرەوە",
-"prev" => "پێشتر",
-"next" => "دواتر"
+"Log out" => "چوونەدەرەوە"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 3cf0ef03dad..8a5a28957c4 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "Den/D' %s huet »%s« mat dir gedeelt",
"Category type not provided." => "Typ vun der Kategorie net uginn.",
"No category to add?" => "Keng Kategorie fir bäizesetzen?",
@@ -29,20 +30,17 @@
"December" => "Dezember",
"Settings" => "Astellungen",
"seconds ago" => "Sekonnen hir",
-"1 minute ago" => "1 Minutt hir",
-"{minutes} minutes ago" => "virun {minutes} Minutten",
-"1 hour ago" => "virun 1 Stonn",
-"{hours} hours ago" => "virun {hours} Stonnen",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "haut",
"yesterday" => "gëschter",
-"{days} days ago" => "virun {days} Deeg",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "leschte Mount",
-"{months} months ago" => "virun {months} Méint",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "Méint hir",
"last year" => "Lescht Joer",
"years ago" => "Joren hir",
"Choose" => "Auswielen",
-"Cancel" => "Ofbriechen",
"Error loading file picker template" => "Feeler beim Luede vun der Virlag fir d'Fichiers-Selektioun",
"Yes" => "Jo",
"No" => "Nee",
@@ -85,7 +83,6 @@
"Email sent" => "Email geschéckt",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Den Update war erfollegräich. Du gëss elo bei d'ownCloud ëmgeleet.",
-"ownCloud password reset" => "Passwuert-Zrécksetzung vun der ownCloud",
"Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De Link fir d'Passwuert zréckzesetzen gouf un deng E-Mail-Adress geschéckt.<br>Falls du d'Mail net an den nächste Minutte kriss, kuck w.e.gl. an dengem Spam-Dossier.<br>Wann do och keng Mail ass, fro w.e.gl. däin Adminstrateur.",
"Request failed!<br>Did you make sure your email/username was right?" => "Ufro feelfeschloen!<br>Hues du séchergestallt dass deng Email respektiv däi Benotzernumm korrekt sinn?",
@@ -134,7 +131,6 @@
"Log in" => "Umellen",
"Alternative Logins" => "Alternativ Umeldungen",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>ech wëll just Bescheed soen dass den/d' %s, »%s« mat dir gedeelt huet.<br><a href=\"%s\">Kucken!</a><br><br>E schéine Bonjour!",
-"prev" => "zeréck",
-"next" => "weider",
"Updating ownCloud to version %s, this may take a while." => "ownCloud gëtt op d'Versioun %s aktualiséiert, dat kéint e Moment daueren."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 27744dd7649..00e47488531 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "Kategorija nenurodyta.",
"No category to add?" => "Nepridėsite jokios kategorijos?",
"This category already exists: %s" => "Ši kategorija jau egzistuoja: %s",
@@ -28,20 +29,17 @@
"December" => "Gruodis",
"Settings" => "Nustatymai",
"seconds ago" => "prieš sekundę",
-"1 minute ago" => "Prieš 1 minutę",
-"{minutes} minutes ago" => "Prieš {count} minutes",
-"1 hour ago" => "prieš 1 valandą",
-"{hours} hours ago" => "prieš {hours} valandas",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
"today" => "šiandien",
"yesterday" => "vakar",
-"{days} days ago" => "Prieš {days} dienas",
+"_%n day ago_::_%n days ago_" => array("","",""),
"last month" => "praeitą mėnesį",
-"{months} months ago" => "prieš {months} mėnesių",
+"_%n month ago_::_%n months ago_" => array("","",""),
"months ago" => "prieš mėnesį",
"last year" => "praeitais metais",
"years ago" => "prieš metus",
"Choose" => "Pasirinkite",
-"Cancel" => "Atšaukti",
"Error loading file picker template" => "Klaida pakraunant failų naršyklę",
"Yes" => "Taip",
"No" => "Ne",
@@ -83,7 +81,6 @@
"Email sent" => "Laiškas išsiųstas",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
-"ownCloud password reset" => "ownCloud slaptažodžio atkūrimas",
"Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Nuorodą su jūsų slaptažodžio atkūrimu buvo nusiųsta jums į paštą.<br>Jei jo negausite per atitinkamą laiką, pasižiūrėkite brukalo aplankale.<br> Jei jo ir ten nėra, teiraukitės administratoriaus.",
"Request failed!<br>Did you make sure your email/username was right?" => "Klaida!<br>Ar tikrai jūsų el paštas/vartotojo vardas buvo teisingi?",
@@ -128,7 +125,6 @@
"remember" => "prisiminti",
"Log in" => "Prisijungti",
"Alternative Logins" => "Alternatyvūs prisijungimai",
-"prev" => "atgal",
-"next" => "kitas",
"Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 5520d1ff358..6deb5dfda9f 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s kopīgots »%s« ar jums",
"Category type not provided." => "Kategorijas tips nav norādīts.",
"No category to add?" => "Nav kategoriju, ko pievienot?",
"This category already exists: %s" => "Šāda kategorija jau eksistē — %s",
@@ -28,20 +30,18 @@
"December" => "Decembris",
"Settings" => "Iestatījumi",
"seconds ago" => "sekundes atpakaļ",
-"1 minute ago" => "pirms 1 minūtes",
-"{minutes} minutes ago" => "pirms {minutes} minūtēm",
-"1 hour ago" => "pirms 1 stundas",
-"{hours} hours ago" => "pirms {hours} stundām",
+"_%n minute ago_::_%n minutes ago_" => array("Tagad, %n minūtes","Pirms %n minūtes","Pirms %n minūtēm"),
+"_%n hour ago_::_%n hours ago_" => array("Šodien, %n stundas","Pirms %n stundas","Pirms %n stundām"),
"today" => "šodien",
"yesterday" => "vakar",
-"{days} days ago" => "pirms {days} dienām",
+"_%n day ago_::_%n days ago_" => array("Šodien, %n dienas","Pirms %n dienas","Pirms %n dienām"),
"last month" => "pagājušajā mēnesī",
-"{months} months ago" => "pirms {months} mēnešiem",
+"_%n month ago_::_%n months ago_" => array("Šomēnes, %n mēneši","Pirms %n mēneša","Pirms %n mēnešiem"),
"months ago" => "mēnešus atpakaļ",
"last year" => "gājušajā gadā",
"years ago" => "gadus atpakaļ",
"Choose" => "Izvēlieties",
-"Cancel" => "Atcelt",
+"Error loading file picker template" => "Kļūda ielādējot datņu ņēmēja veidni",
"Yes" => "Jā",
"No" => "Nē",
"Ok" => "Labi",
@@ -60,6 +60,7 @@
"Share with link" => "Dalīties ar saiti",
"Password protect" => "Aizsargāt ar paroli",
"Password" => "Parole",
+"Allow Public Upload" => "Ļaut publisko augšupielādi.",
"Email link to person" => "Sūtīt saiti personai pa e-pastu",
"Send" => "Sūtīt",
"Set expiration date" => "Iestaties termiņa datumu",
@@ -82,10 +83,14 @@
"Email sent" => "Vēstule nosūtīta",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atjaunināšana beidzās nesekmīgi. Lūdzu, ziņojiet par šo problēmu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kopienai</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
-"ownCloud password reset" => "ownCloud paroles maiņa",
+"%s password reset" => "%s paroles maiņa",
"Use the following link to reset your password: {link}" => "Izmantojiet šo saiti, lai mainītu paroli: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Saite uz paroles atjaunošanas vietu ir nosūtīta uz epastu.<br>Ja vēstu nav atnākusi, pārbaudiet epasta mēstuļu mapi.<br>Jā tās tur nav, jautājiet sistēmas administratoram.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Pieprasījums neizdevās!<br>Vai Jūs pārliecinājāties ka epasts/lietotājvārds ir pareizi?",
"You will receive a link to reset your password via Email." => "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
"Username" => "Lietotājvārds",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?",
+"Yes, I really want to reset my password now" => "Jā, Es tiešām vēlos mainīt savu paroli",
"Request reset" => "Pieprasīt paroles maiņu",
"Your password was reset" => "Jūsu parole tika nomainīta",
"To login page" => "Uz ielogošanās lapu",
@@ -98,12 +103,16 @@
"Help" => "Palīdzība",
"Access forbidden" => "Pieeja ir liegta",
"Cloud not found" => "Mākonis netika atrasts",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Sveiks,\nTikai daru tev zināmu ka %s dalās %s ar tevi.\nApskati to: %s\n\nJaukiņi Labiņi!",
"Edit categories" => "Rediģēt kategoriju",
"Add" => "Pievienot",
"Security Warning" => "Brīdinājums par drošību",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsu PHP ir ievainojamība pret NULL Byte uzbrukumiem (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Lūdzu atjauniniet PHP instalāciju lai varētu droši izmantot %s.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nav pieejams drošs nejaušu skaitļu ģenerators. Lūdzu, aktivējiet PHP OpenSSL paplašinājumu.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez droša nejaušu skaitļu ģeneratora uzbrucējs var paredzēt paroļu atjaunošanas marķierus un pārņem jūsu kontu.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
"Create an <strong>admin account</strong>" => "Izveidot <strong>administratora kontu</strong>",
"Advanced" => "Paplašināti",
"Data folder" => "Datu mape",
@@ -115,7 +124,9 @@
"Database tablespace" => "Datubāzes tabulas telpa",
"Database host" => "Datubāzes serveris",
"Finish setup" => "Pabeigt iestatīšanu",
+"%s is available. Get more information on how to update." => "%s ir pieejams. Uzziniet vairāk kā atjaunināt.",
"Log out" => "Izrakstīties",
+"More apps" => "Vairāk programmu",
"Automatic logon rejected!" => "Automātiskā ierakstīšanās ir noraidīta!",
"If you did not change your password recently, your account may be compromised!" => "Ja neesat pēdējā laikā mainījis paroli, iespējams, ka jūsu konts ir kompromitēts.",
"Please change your password to secure your account again." => "Lūdzu, nomainiet savu paroli, lai atkal nodrošinātu savu kontu.",
@@ -123,7 +134,7 @@
"remember" => "atcerēties",
"Log in" => "Ierakstīties",
"Alternative Logins" => "Alternatīvās pieteikšanās",
-"prev" => "iepriekšējā",
-"next" => "nākamā",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Sveiks,<br><br>Tikai daru tev zināmu ka %s dalās %s ar tevi.<br><a href=\"%s\">Apskati to!</a><br><br>Jaukiņi Labiņi!",
"Updating ownCloud to version %s, this may take a while." => "Atjaunina ownCloud uz versiju %s. Tas var aizņemt kādu laiciņu."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index c2b7907aa32..e2416dc052c 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "Не беше доставен тип на категорија.",
"No category to add?" => "Нема категорија да се додаде?",
"Object type not provided." => "Не беше доставен тип на објект.",
@@ -27,20 +28,17 @@
"December" => "Декември",
"Settings" => "Подесувања",
"seconds ago" => "пред секунди",
-"1 minute ago" => "пред 1 минута",
-"{minutes} minutes ago" => "пред {minutes} минути",
-"1 hour ago" => "пред 1 час",
-"{hours} hours ago" => "пред {hours} часови",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "денеска",
"yesterday" => "вчера",
-"{days} days ago" => "пред {days} денови",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "минатиот месец",
-"{months} months ago" => "пред {months} месеци",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "пред месеци",
"last year" => "минатата година",
"years ago" => "пред години",
"Choose" => "Избери",
-"Cancel" => "Откажи",
"Yes" => "Да",
"No" => "Не",
"Ok" => "Во ред",
@@ -78,7 +76,6 @@
"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." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
"Username" => "Корисничко име",
@@ -116,7 +113,6 @@
"Please change your password to secure your account again." => "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно.",
"Lost your password?" => "Ја заборавивте лозинката?",
"remember" => "запамти",
-"Log in" => "Најава",
-"prev" => "претходно",
-"next" => "следно"
+"Log in" => "Најава"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/core/l10n/ml_IN.php b/core/l10n/ml_IN.php
new file mode 100644
index 00000000000..93c8e33f3e2
--- /dev/null
+++ b/core/l10n/ml_IN.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 4227a317582..fc3698d58d1 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"No category to add?" => "Tiada kategori untuk di tambah?",
"No categories selected for deletion." => "Tiada kategori dipilih untuk dibuang.",
"Sunday" => "Ahad",
@@ -21,14 +22,16 @@
"November" => "November",
"December" => "Disember",
"Settings" => "Tetapan",
-"Cancel" => "Batal",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array(""),
"Yes" => "Ya",
"No" => "Tidak",
"Ok" => "Ok",
"Error" => "Ralat",
"Share" => "Kongsi",
"Password" => "Kata laluan",
-"ownCloud password reset" => "Set semula kata lalaun ownCloud",
"Use the following link to reset your password: {link}" => "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
"You will receive a link to reset your password via Email." => "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
"Username" => "Nama pengguna",
@@ -60,7 +63,6 @@
"Log out" => "Log keluar",
"Lost your password?" => "Hilang kata laluan?",
"remember" => "ingat",
-"Log in" => "Log masuk",
-"prev" => "sebelum",
-"next" => "seterus"
+"Log in" => "Log masuk"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index bfdff351849..1016ec5f512 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"No category to add?" => "ထည့်ရန်ခေါင်းစဉ်မရှိဘူးလား",
"No categories selected for deletion." => "ဖျက်ရန်အတွက်ခေါင်းစဉ်မရွေးထားပါ",
"January" => "ဇန်နဝါရီ",
@@ -14,15 +15,16 @@
"November" => "နိုဝင်ဘာ",
"December" => "ဒီဇင်ဘာ",
"seconds ago" => "စက္ကန့်အနည်းငယ်က",
-"1 minute ago" => "၁ မိနစ်အရင်က",
-"1 hour ago" => "၁ နာရီ အရင်က",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "ယနေ့",
"yesterday" => "မနေ့က",
+"_%n day ago_::_%n days ago_" => array(""),
"last month" => "ပြီးခဲ့သောလ",
+"_%n month ago_::_%n months ago_" => array(""),
"last year" => "မနှစ်က",
"years ago" => "နှစ် အရင်က",
"Choose" => "ရွေးချယ်",
-"Cancel" => "ပယ်ဖျက်မည်",
"Yes" => "ဟုတ်",
"No" => "မဟုတ်ဘူး",
"Ok" => "အိုကေ",
@@ -57,7 +59,6 @@
"Finish setup" => "တပ်ဆင်ခြင်းပြီးပါပြီ။",
"Lost your password?" => "သင်၏စကားဝှက်ပျောက်သွားပြီလား။",
"remember" => "မှတ်မိစေသည်",
-"Log in" => "ဝင်ရောက်ရန်",
-"prev" => "ယခင်",
-"next" => "နောက်သို့"
+"Log in" => "ဝင်ရောက်ရန်"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 6780a69a22f..393dc0d7d11 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s delte »%s« med deg",
"No category to add?" => "Ingen kategorier å legge til?",
"This category already exists: %s" => "Denne kategorien finnes allerede: %s",
@@ -24,20 +25,17 @@
"December" => "Desember",
"Settings" => "Innstillinger",
"seconds ago" => "sekunder siden",
-"1 minute ago" => "1 minutt siden",
-"{minutes} minutes ago" => "{minutes} minutter siden",
-"1 hour ago" => "1 time siden",
-"{hours} hours ago" => "{hours} timer siden",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "i dag",
"yesterday" => "i går",
-"{days} days ago" => "{days} dager siden",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "forrige måned",
-"{months} months ago" => "{months} måneder siden",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "måneder siden",
"last year" => "forrige år",
"years ago" => "år siden",
"Choose" => "Velg",
-"Cancel" => "Avbryt",
"Yes" => "Ja",
"No" => "Nei",
"Ok" => "Ok",
@@ -66,7 +64,6 @@
"Error setting expiration date" => "Kan ikke sette utløpsdato",
"Sending ..." => "Sender...",
"Email sent" => "E-post sendt",
-"ownCloud password reset" => "Tilbakestill ownCloud passord",
"Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
"You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
"Username" => "Brukernavn",
@@ -104,7 +101,6 @@
"Lost your password?" => "Mistet passordet ditt?",
"remember" => "husk",
"Log in" => "Logg inn",
-"prev" => "forrige",
-"next" => "neste",
"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til versjon %s, dette kan ta en stund."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ne.php b/core/l10n/ne.php
new file mode 100644
index 00000000000..93c8e33f3e2
--- /dev/null
+++ b/core/l10n/ne.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index c2a8f049dba..46375756de4 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s deelde »%s« met jou",
"Category type not provided." => "Categorie type niet opgegeven.",
"No category to add?" => "Geen categorie om toe te voegen?",
@@ -29,20 +30,17 @@
"December" => "december",
"Settings" => "Instellingen",
"seconds ago" => "seconden geleden",
-"1 minute ago" => "1 minuut geleden",
-"{minutes} minutes ago" => "{minutes} minuten geleden",
-"1 hour ago" => "1 uur geleden",
-"{hours} hours ago" => "{hours} uren geleden",
+"_%n minute ago_::_%n minutes ago_" => array("","%n minuten geleden"),
+"_%n hour ago_::_%n hours ago_" => array("","%n uur geleden"),
"today" => "vandaag",
"yesterday" => "gisteren",
-"{days} days ago" => "{days} dagen geleden",
+"_%n day ago_::_%n days ago_" => array("","%n dagen geleden"),
"last month" => "vorige maand",
-"{months} months ago" => "{months} maanden geleden",
+"_%n month ago_::_%n months ago_" => array("","%n maanden geleden"),
"months ago" => "maanden geleden",
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
"Choose" => "Kies",
-"Cancel" => "Annuleer",
"Error loading file picker template" => "Fout bij laden van bestandsselectie sjabloon",
"Yes" => "Ja",
"No" => "Nee",
@@ -85,7 +83,7 @@
"Email sent" => "E-mail verzonden",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud.",
-"ownCloud password reset" => "ownCloud-wachtwoord herstellen",
+"%s password reset" => "%s wachtwoord reset",
"Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen.",
"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?",
@@ -110,9 +108,11 @@
"Add" => "Toevoegen",
"Security Warning" => "Beveiligingswaarschuwing",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Werk uw PHP installatie bij om %s veilig te kunnen gebruiken.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL-extentie aan.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de resettokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
"Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
"Advanced" => "Geavanceerd",
"Data folder" => "Gegevensmap",
@@ -126,6 +126,7 @@
"Finish setup" => "Installatie afronden",
"%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
"Log out" => "Afmelden",
+"More apps" => "Meer applicaties",
"Automatic logon rejected!" => "Automatische aanmelding geweigerd!",
"If you did not change your password recently, your account may be compromised!" => "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!",
"Please change your password to secure your account again." => "Wijzig je wachtwoord zodat je account weer beveiligd is.",
@@ -134,7 +135,6 @@
"Log in" => "Meld je aan",
"Alternative Logins" => "Alternatieve inlogs",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo daar,<br><br> %s deelde »%s« met jou.<br><a href=\"%s\">Bekijk!</a><br><br>Veel plezier!",
-"prev" => "vorige",
-"next" => "volgende",
"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren..."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index d1a7bb4f9ed..f73cb96076e 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "Ingen kategoritype.",
"No category to add?" => "Ingen kategori å leggja til?",
"This category already exists: %s" => "Denne kategorien finst alt: %s",
@@ -28,20 +29,17 @@
"December" => "Desember",
"Settings" => "Innstillingar",
"seconds ago" => "sekund sidan",
-"1 minute ago" => "1 minutt sidan",
-"{minutes} minutes ago" => "{minutes} minutt sidan",
-"1 hour ago" => "1 time sidan",
-"{hours} hours ago" => "{hours} timar sidan",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "i dag",
"yesterday" => "i går",
-"{days} days ago" => "{days} dagar sidan",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "førre månad",
-"{months} months ago" => "{months} månadar sidan",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "månadar sidan",
"last year" => "i fjor",
"years ago" => "år sidan",
"Choose" => "Vel",
-"Cancel" => "Avbryt",
"Yes" => "Ja",
"No" => "Nei",
"Ok" => "Greitt",
@@ -82,7 +80,6 @@
"Email sent" => "E-post sendt",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
-"ownCloud password reset" => "Nullstilling av ownCloud-passord",
"Use the following link to reset your password: {link}" => "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Lenkja til å nullstilla passordet med er sendt til e-posten din.<br>Sjå i spam-/søppelmappa di viss du ikkje ser e-posten innan rimeleg tid.<br>Spør din lokale administrator viss han ikkje er der heller.",
"Request failed!<br>Did you make sure your email/username was right?" => "Førespurnaden feila!<br>Er du viss på at du skreiv inn rett e-post/brukarnamn?",
@@ -127,7 +124,6 @@
"remember" => "hugs",
"Log in" => "Logg inn",
"Alternative Logins" => "Alternative innloggingar",
-"prev" => "førre",
-"next" => "neste",
"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index ad400aa650a..68bf2f89a2a 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"No category to add?" => "Pas de categoria d'ajustar ?",
"No categories selected for deletion." => "Pas de categorias seleccionadas per escafar.",
"Sunday" => "Dimenge",
@@ -22,15 +23,17 @@
"December" => "Decembre",
"Settings" => "Configuracion",
"seconds ago" => "segonda a",
-"1 minute ago" => "1 minuta a",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "uèi",
"yesterday" => "ièr",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "mes passat",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "meses a",
"last year" => "an passat",
"years ago" => "ans a",
"Choose" => "Causís",
-"Cancel" => "Annula",
"Yes" => "Òc",
"No" => "Non",
"Ok" => "D'accòrdi",
@@ -58,7 +61,6 @@
"Password protected" => "Parat per senhal",
"Error unsetting expiration date" => "Error al metre de la data d'expiracion",
"Error setting expiration date" => "Error setting expiration date",
-"ownCloud password reset" => "senhal d'ownCloud tornat botar",
"Use the following link to reset your password: {link}" => "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
"You will receive a link to reset your password via Email." => "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
"Username" => "Non d'usancièr",
@@ -91,7 +93,6 @@
"Log out" => "Sortida",
"Lost your password?" => "L'as perdut lo senhal ?",
"remember" => "bremba-te",
-"Log in" => "Dintrada",
-"prev" => "dariièr",
-"next" => "venent"
+"Log in" => "Dintrada"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 6e5b4327c48..9be10f535b7 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s Współdzielone »%s« z tobą",
"Category type not provided." => "Nie podano typu kategorii.",
"No category to add?" => "Brak kategorii do dodania?",
@@ -29,20 +30,17 @@
"December" => "Grudzień",
"Settings" => "Ustawienia",
"seconds ago" => "sekund temu",
-"1 minute ago" => "1 minutę temu",
-"{minutes} minutes ago" => "{minutes} minut temu",
-"1 hour ago" => "1 godzinę temu",
-"{hours} hours ago" => "{hours} godzin temu",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
"today" => "dziś",
"yesterday" => "wczoraj",
-"{days} days ago" => "{days} dni temu",
+"_%n day ago_::_%n days ago_" => array("","",""),
"last month" => "w zeszłym miesiącu",
-"{months} months ago" => "{months} miesięcy temu",
+"_%n month ago_::_%n months ago_" => array("","",""),
"months ago" => "miesięcy temu",
"last year" => "w zeszłym roku",
"years ago" => "lat temu",
"Choose" => "Wybierz",
-"Cancel" => "Anuluj",
"Error loading file picker template" => "Błąd podczas ładowania pliku wybranego szablonu",
"Yes" => "Tak",
"No" => "Nie",
@@ -85,7 +83,6 @@
"Email sent" => "E-mail wysłany",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
-"ownCloud password reset" => "restart hasła ownCloud",
"Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Link do zresetowania hasła została wysłana na adres email. <br> Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem. <br> Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a.",
"Request failed!<br>Did you make sure your email/username was right?" => "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?",
@@ -128,6 +125,7 @@
"Finish setup" => "Zakończ konfigurowanie",
"%s is available. Get more information on how to update." => "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
"Log out" => "Wyloguj",
+"More apps" => "Więcej aplikacji",
"Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
"If you did not change your password recently, your account may be compromised!" => "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożone!",
"Please change your password to secure your account again." => "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto.",
@@ -136,7 +134,6 @@
"Log in" => "Zaloguj",
"Alternative Logins" => "Alternatywne loginy",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Cześć,<br><br>Informuję cię że %s udostępnia ci »%s«.\n<br><a href=\"%s\">Zobacz</a><br><br>Pozdrawiam!",
-"prev" => "wstecz",
-"next" => "naprzód",
"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/pl_PL.php b/core/l10n/pl_PL.php
index 77febeea3e5..15c376eb954 100644
--- a/core/l10n/pl_PL.php
+++ b/core/l10n/pl_PL.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Settings" => "Ustawienia",
"Username" => "Nazwa użytkownika"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index f612301a3e8..8446e5270a7 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s compartilhou »%s« com você",
"Category type not provided." => "Tipo de categoria não fornecido.",
"No category to add?" => "Nenhuma categoria a adicionar?",
@@ -29,20 +30,17 @@
"December" => "dezembro",
"Settings" => "Ajustes",
"seconds ago" => "segundos atrás",
-"1 minute ago" => "1 minuto atrás",
-"{minutes} minutes ago" => "{minutes} minutos atrás",
-"1 hour ago" => "1 hora atrás",
-"{hours} hours ago" => "{hours} horas atrás",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "hoje",
"yesterday" => "ontem",
-"{days} days ago" => "{days} dias atrás",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "último mês",
-"{months} months ago" => "{months} meses atrás",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "meses atrás",
"last year" => "último ano",
"years ago" => "anos atrás",
"Choose" => "Escolha",
-"Cancel" => "Cancelar",
"Error loading file picker template" => "Template selecionador Erro ao carregar arquivo",
"Yes" => "Sim",
"No" => "Não",
@@ -85,7 +83,7 @@
"Email sent" => "E-mail enviado",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A atualização falhou. Por favor, relate este problema para a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
-"ownCloud password reset" => "Redefinir senha ownCloud",
+"%s password reset" => "%s redefinir senha",
"Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "O link para redefinir sua senha foi enviada para o seu e-mail. <br> Se você não recebê-lo dentro de um período razoável de tempo, verifique o spam/lixo. <br> Se ele não estiver lá perguntar ao seu administrador local.",
"Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br>Certifique-se que seu e-mail/username estavam corretos?",
@@ -128,6 +126,7 @@
"Finish setup" => "Concluir configuração",
"%s is available. Get more information on how to update." => "%s está disponível. Obtenha mais informações sobre como atualizar.",
"Log out" => "Sair",
+"More apps" => "Mais aplicativos",
"Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!",
"If you did not change your password recently, your account may be compromised!" => "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!",
"Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.",
@@ -136,7 +135,6 @@
"Log in" => "Fazer login",
"Alternative Logins" => "Logins alternativos",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Olá,<br><br>apenas para você saber que %s compartilhou %s com você.<br><a href=\"%s\">Veja: </a><br><br>Abraços!",
-"prev" => "anterior",
-"next" => "próximo",
"Updating ownCloud to version %s, this may take a while." => "Atualizando ownCloud para a versão %s, isto pode levar algum tempo."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index c16e41dce58..25ddaa322d5 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s partilhado »%s« contigo",
"Category type not provided." => "Tipo de categoria não fornecido",
"No category to add?" => "Nenhuma categoria para adicionar?",
@@ -29,20 +30,17 @@
"December" => "Dezembro",
"Settings" => "Configurações",
"seconds ago" => "Minutos atrás",
-"1 minute ago" => "Há 1 minuto",
-"{minutes} minutes ago" => "{minutes} minutos atrás",
-"1 hour ago" => "Há 1 horas",
-"{hours} hours ago" => "Há {hours} horas atrás",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "hoje",
"yesterday" => "ontem",
-"{days} days ago" => "{days} dias atrás",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "ultímo mês",
-"{months} months ago" => "Há {months} meses atrás",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "meses atrás",
"last year" => "ano passado",
"years ago" => "anos atrás",
"Choose" => "Escolha",
-"Cancel" => "Cancelar",
"Error loading file picker template" => "Erro ao carregar arquivo do separador modelo",
"Yes" => "Sim",
"No" => "Não",
@@ -85,7 +83,6 @@
"Email sent" => "E-mail enviado",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualização falhou. Por favor reporte este incidente seguindo este link <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
-"ownCloud password reset" => "Reposição da password ownCloud",
"Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
"Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username correcto?",
@@ -136,7 +133,6 @@
"Log in" => "Entrar",
"Alternative Logins" => "Contas de acesso alternativas",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Olá,<br><br>Apenas para lhe informar que %s partilhou »%s« consigo.<br><a href=\"%s\">Consulte-o aqui!</a><br><br>Cumprimentos!",
-"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."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index ae7528b5f60..7e33003bcce 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s Partajat »%s« cu tine de",
"Category type not provided." => "Tipul de categorie nu a fost specificat.",
"No category to add?" => "Nici o categorie de adăugat?",
@@ -29,20 +30,17 @@
"December" => "Decembrie",
"Settings" => "Setări",
"seconds ago" => "secunde în urmă",
-"1 minute ago" => "1 minut în urmă",
-"{minutes} minutes ago" => "{minutes} minute in urmă",
-"1 hour ago" => "Acum o oră",
-"{hours} hours ago" => "{hours} ore în urmă",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
"today" => "astăzi",
"yesterday" => "ieri",
-"{days} days ago" => "{days} zile in urmă",
+"_%n day ago_::_%n days ago_" => array("","",""),
"last month" => "ultima lună",
-"{months} months ago" => "{months} luni în urmă",
+"_%n month ago_::_%n months ago_" => array("","",""),
"months ago" => "luni în urmă",
"last year" => "ultimul an",
"years ago" => "ani în urmă",
"Choose" => "Alege",
-"Cancel" => "Anulare",
"Error loading file picker template" => "Eroare la încărcarea șablonului selectorului de fișiere",
"Yes" => "Da",
"No" => "Nu",
@@ -85,7 +83,6 @@
"Email sent" => "Mesajul a fost expediat",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Actualizarea a eșuat! Raportați problema către <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunitatea ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Actualizare reușită. Ești redirecționat către ownCloud.",
-"ownCloud password reset" => "Resetarea parolei ownCloud ",
"Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linkul pentru resetarea parolei tale a fost trimis pe email. <br>Daca nu ai primit email-ul intr-un timp rezonabil, verifica folderul spam/junk. <br>Daca nu sunt acolo intreaba administratorul local.",
"Request failed!<br>Did you make sure your email/username was right?" => "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corecte?",
@@ -136,7 +133,6 @@
"Log in" => "Autentificare",
"Alternative Logins" => "Conectări alternative",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Salutare, <br><br>Vă aduc la cunoștință că %s a partajat %s cu tine.<br><a href=\"%s\">Accesează-l!</a><br><br>Numai bine!",
-"prev" => "precedentul",
-"next" => "următorul",
"Updating ownCloud to version %s, this may take a while." => "Actualizăm ownCloud la versiunea %s, aceasta poate dura câteva momente."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index f9c293de9b8..8c29c8d26f6 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s поделился »%s« с вами",
"Category type not provided." => "Тип категории не предоставлен",
"No category to add?" => "Нет категорий для добавления?",
@@ -29,20 +30,17 @@
"December" => "Декабрь",
"Settings" => "Конфигурация",
"seconds ago" => "несколько секунд назад",
-"1 minute ago" => "1 минуту назад",
-"{minutes} minutes ago" => "{minutes} минут назад",
-"1 hour ago" => "час назад",
-"{hours} hours ago" => "{hours} часов назад",
+"_%n minute ago_::_%n minutes ago_" => array("%n минуту назад","%n минуты назад","%n минут назад"),
+"_%n hour ago_::_%n hours ago_" => array("%n час назад","%n часа назад","%n часов назад"),
"today" => "сегодня",
"yesterday" => "вчера",
-"{days} days ago" => "{days} дней назад",
+"_%n day ago_::_%n days ago_" => array("%n день назад","%n дня назад","%n дней назад"),
"last month" => "в прошлом месяце",
-"{months} months ago" => "{months} месяцев назад",
+"_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"),
"months ago" => "несколько месяцев назад",
"last year" => "в прошлом году",
"years ago" => "несколько лет назад",
"Choose" => "Выбрать",
-"Cancel" => "Отменить",
"Error loading file picker template" => "Ошибка при загрузке файла выбора шаблона",
"Yes" => "Да",
"No" => "Нет",
@@ -85,7 +83,7 @@
"Email sent" => "Письмо отправлено",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "При обновлении произошла ошибка. Пожалуйста сообщите об этом в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud сообщество</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
-"ownCloud password reset" => "Сброс пароля ",
+"%s password reset" => "%s сброс пароля",
"Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Ссылка для сброса пароля отправлена вам ​​по электронной почте.<br>Если вы не получите письмо в пределах одной-двух минут, проверьте папку Спам. <br>Если письма там нет, обратитесь к своему администратору.",
"Request failed!<br>Did you make sure your email/username was right?" => "Запрос не удался. Вы уверены, что email или имя пользователя указаны верно?",
@@ -128,6 +126,7 @@
"Finish setup" => "Завершить установку",
"%s is available. Get more information on how to update." => "%s доступно. Получить дополнительную информацию о порядке обновления.",
"Log out" => "Выйти",
+"More apps" => "Ещё приложения",
"Automatic logon rejected!" => "Автоматический вход в систему отключен!",
"If you did not change your password recently, your account may be compromised!" => "Если Вы недавно не меняли свой пароль, то Ваша учетная запись может быть скомпрометирована!",
"Please change your password to secure your account again." => "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись.",
@@ -136,7 +135,6 @@
"Log in" => "Войти",
"Alternative Logins" => "Альтернативные имена пользователя",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Приветствую,<br><br>просто даю знать, что %s поделился »%s« с вами.<br><a href=\"%s\">Посмотреть!</a><br><br>Удачи!",
-"prev" => "пред",
-"next" => "след",
"Updating ownCloud to version %s, this may take a while." => "Идёт обновление ownCloud до версии %s. Это может занять некоторое время."
);
+$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);";
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
deleted file mode 100644
index 580df5961f8..00000000000
--- a/core/l10n/ru_RU.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Settings" => "Настройки",
-"Cancel" => "Отмена",
-"Error" => "Ошибка",
-"Share" => "Сделать общим",
-"Add" => "Добавить"
-);
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index 21038a93e88..475cdf5613a 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"No categories selected for deletion." => "මකා දැමීම සඳහා ප්‍රවර්ගයන් තෝරා නොමැත.",
"Sunday" => "ඉරිදා",
"Monday" => "සඳුදා",
@@ -21,15 +22,17 @@
"December" => "දෙසැම්බර්",
"Settings" => "සිටුවම්",
"seconds ago" => "තත්පරයන්ට පෙර",
-"1 minute ago" => "1 මිනිත්තුවකට පෙර",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "අද",
"yesterday" => "ඊයේ",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "පෙර මාසයේ",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "මාස කීපයකට පෙර",
"last year" => "පෙර අවුරුද්දේ",
"years ago" => "අවුරුදු කීපයකට පෙර",
"Choose" => "තෝරන්න",
-"Cancel" => "එපා",
"Yes" => "ඔව්",
"No" => "එපා",
"Ok" => "හරි",
@@ -52,7 +55,6 @@
"Password protected" => "මුර පදයකින් ආරක්ශාකර ඇත",
"Error unsetting expiration date" => "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්",
"Error setting expiration date" => "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
-"ownCloud password reset" => "ownCloud මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
"You will receive a link to reset your password via Email." => "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
"Username" => "පරිශීලක නම",
"Your password was reset" => "ඔබේ මුරපදය ප්‍රත්‍යාරම්භ කරන ලදී",
@@ -82,7 +84,6 @@
"Log out" => "නික්මීම",
"Lost your password?" => "මුරපදය අමතකද?",
"remember" => "මතක තබාගන්න",
-"Log in" => "ප්‍රවේශවන්න",
-"prev" => "පෙර",
-"next" => "ඊළඟ"
+"Log in" => "ප්‍රවේශවන්න"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sk.php b/core/l10n/sk.php
new file mode 100644
index 00000000000..7285020288b
--- /dev/null
+++ b/core/l10n/sk.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("","","")
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index a05c6912d26..5fff18e7d6f 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s s Vami zdieľa »%s«",
"Category type not provided." => "Neposkytnutý typ kategórie.",
"No category to add?" => "Žiadna kategória pre pridanie?",
@@ -29,20 +30,17 @@
"December" => "December",
"Settings" => "Nastavenia",
"seconds ago" => "pred sekundami",
-"1 minute ago" => "pred minútou",
-"{minutes} minutes ago" => "pred {minutes} minútami",
-"1 hour ago" => "Pred 1 hodinou",
-"{hours} hours ago" => "Pred {hours} hodinami.",
+"_%n minute ago_::_%n minutes ago_" => array("pred %n minútou","pred %n minútami","pred %n minútami"),
+"_%n hour ago_::_%n hours ago_" => array("pred %n hodinou","pred %n hodinami","pred %n hodinami"),
"today" => "dnes",
"yesterday" => "včera",
-"{days} days ago" => "pred {days} dňami",
+"_%n day ago_::_%n days ago_" => array("pred %n dňom","pred %n dňami","pred %n dňami"),
"last month" => "minulý mesiac",
-"{months} months ago" => "Pred {months} mesiacmi.",
+"_%n month ago_::_%n months ago_" => array("pred %n mesiacom","pred %n mesiacmi","pred %n mesiacmi"),
"months ago" => "pred mesiacmi",
"last year" => "minulý rok",
"years ago" => "pred rokmi",
"Choose" => "Výber",
-"Cancel" => "Zrušiť",
"Error loading file picker template" => "Chyba pri načítaní šablóny výberu súborov",
"Yes" => "Áno",
"No" => "Nie",
@@ -85,7 +83,7 @@
"Email sent" => "Email odoslaný",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku.",
-"ownCloud password reset" => "Obnovenie hesla pre ownCloud",
+"%s password reset" => "reset hesla %s",
"Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Odkaz na obnovenie hesla bol odoslaný na Vašu emailovú adresu.<br>Ak ho v krátkej dobe neobdržíte, skontrolujte si Váš kôš a priečinok spam.<br>Ak ho ani tam nenájdete, kontaktujte svojho administrátora.",
"Request failed!<br>Did you make sure your email/username was right?" => "Požiadavka zlyhala.<br>Uistili ste sa, že Vaše používateľské meno a email sú správne?",
@@ -110,9 +108,11 @@
"Add" => "Pridať",
"Security Warning" => "Bezpečnostné varovanie",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Aktualizujte prosím vašu inštanciu PHP pre bezpečné používanie %s.",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nie je dostupný žiadny bezpečný generátor náhodných čísel, prosím, povoľte rozšírenie OpenSSL v PHP.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpečného generátora náhodných čísel môže útočník predpovedať token pre obnovu hesla a prevziať kontrolu nad vaším kontom.",
"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
"Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>",
"Advanced" => "Rozšírené",
"Data folder" => "Priečinok dát",
@@ -126,6 +126,7 @@
"Finish setup" => "Dokončiť inštaláciu",
"%s is available. Get more information on how to update." => "%s je dostupná. Získajte viac informácií k postupu aktualizáce.",
"Log out" => "Odhlásiť",
+"More apps" => "Viac aplikácií",
"Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!",
"If you did not change your password recently, your account may be compromised!" => "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kompromitovaný.",
"Please change your password to secure your account again." => "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu",
@@ -134,7 +135,6 @@
"Log in" => "Prihlásiť sa",
"Alternative Logins" => "Alternatívne prihlasovanie",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ahoj,<br><br>chcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: <br><a href=\"%s\">zde</a>.<br><br>Vďaka",
-"prev" => "späť",
-"next" => "ďalej",
"Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať."
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index e7b88316ec3..0b72f1dc4e4 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s je delil »%s« z vami",
"Category type not provided." => "Vrsta kategorije ni podana.",
"No category to add?" => "Ali ni kategorije za dodajanje?",
@@ -29,20 +30,17 @@
"December" => "december",
"Settings" => "Nastavitve",
"seconds ago" => "pred nekaj sekundami",
-"1 minute ago" => "pred minuto",
-"{minutes} minutes ago" => "pred {minutes} minutami",
-"1 hour ago" => "Pred 1 uro",
-"{hours} hours ago" => "pred {hours} urami",
+"_%n minute ago_::_%n minutes ago_" => array("","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","",""),
"today" => "danes",
"yesterday" => "včeraj",
-"{days} days ago" => "pred {days} dnevi",
+"_%n day ago_::_%n days ago_" => array("","","",""),
"last month" => "zadnji mesec",
-"{months} months ago" => "pred {months} meseci",
+"_%n month ago_::_%n months ago_" => array("","","",""),
"months ago" => "mesecev nazaj",
"last year" => "lansko leto",
"years ago" => "let nazaj",
"Choose" => "Izbor",
-"Cancel" => "Prekliči",
"Error loading file picker template" => "Napaka pri nalaganju predloge za izbor dokumenta",
"Yes" => "Da",
"No" => "Ne",
@@ -85,7 +83,6 @@
"Email sent" => "Elektronska pošta je poslana",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
-"ownCloud password reset" => "Ponastavitev gesla za oblak ownCloud",
"Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Povezava za ponastavitev gesla je bila poslana na elektronski naslov.<br>V kolikor sporočila ne prejmete v doglednem času, preverite tudi mape vsiljene pošte.<br>Če ne bo niti tam, stopite v stik s skrbnikom.",
"Request failed!<br>Did you make sure your email/username was right?" => "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabniško ime navedena pravilno?",
@@ -136,7 +133,6 @@
"Log in" => "Prijava",
"Alternative Logins" => "Druge prijavne možnosti",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Pozdravljen/a,<br><br>sporočam, da je %s delil »%s« s teboj.<br><a href=\"%s\">Poglej vsebine!</a><br><br>Lep pozdrav!",
-"prev" => "nazaj",
-"next" => "naprej",
"Updating ownCloud to version %s, this may take a while." => "Posodabljanje sistema ownCloud na različico %s je lahko dolgotrajno."
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 0daeccc4814..3057ac2c689 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "Mungon tipi i kategorisë.",
"No category to add?" => "Asnjë kategori për të shtuar?",
"This category already exists: %s" => "Kjo kategori tashmë ekziston: %s",
@@ -28,20 +29,17 @@
"December" => "Dhjetor",
"Settings" => "Parametra",
"seconds ago" => "sekonda më parë",
-"1 minute ago" => "1 minutë më parë",
-"{minutes} minutes ago" => "{minutes} minuta më parë",
-"1 hour ago" => "1 orë më parë",
-"{hours} hours ago" => "{hours} orë më parë",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "sot",
"yesterday" => "dje",
-"{days} days ago" => "{days} ditë më parë",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "muajin e shkuar",
-"{months} months ago" => "{months} muaj më parë",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "muaj më parë",
"last year" => "vitin e shkuar",
"years ago" => "vite më parë",
"Choose" => "Zgjidh",
-"Cancel" => "Anulo",
"Error loading file picker template" => "Veprim i gabuar gjatë ngarkimit të modelit të zgjedhësit të skedarëve",
"Yes" => "Po",
"No" => "Jo",
@@ -84,7 +82,6 @@
"Email sent" => "Email-i u dërgua",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitetin ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
-"ownCloud password reset" => "Rivendosja e kodit të ownCloud-it",
"Use the following link to reset your password: {link}" => "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Lidhja për rivendosjen e kodit tuaj u dërgua tek email-i juaj.<br>Nëqoftëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme (spam).<br>Nëqoftëse nuk është as aty, pyesni administratorin tuaj lokal.",
"Request failed!<br>Did you make sure your email/username was right?" => "Kërkesa dështoi!<br>A u siguruat që email-i/përdoruesi juaj ishte i saktë?",
@@ -130,7 +127,6 @@
"remember" => "kujto",
"Log in" => "Hyrje",
"Alternative Logins" => "Hyrje alternative",
-"prev" => "mbrapa",
-"next" => "para",
"Updating ownCloud to version %s, this may take a while." => "Po azhurnoj ownCloud-in me versionin %s. Mund të zgjasi pak."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index d68012c505f..3de06c70883 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "Врста категорије није унет.",
"No category to add?" => "Додати још неку категорију?",
"Object type not provided." => "Врста објекта није унета.",
@@ -27,20 +28,17 @@
"December" => "Децембар",
"Settings" => "Поставке",
"seconds ago" => "пре неколико секунди",
-"1 minute ago" => "пре 1 минут",
-"{minutes} minutes ago" => "пре {minutes} минута",
-"1 hour ago" => "Пре једног сата",
-"{hours} hours ago" => "Пре {hours} сата (сати)",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
"today" => "данас",
"yesterday" => "јуче",
-"{days} days ago" => "пре {days} дана",
+"_%n day ago_::_%n days ago_" => array("","",""),
"last month" => "прошлог месеца",
-"{months} months ago" => "Пре {months} месеца (месеци)",
+"_%n month ago_::_%n months ago_" => array("","",""),
"months ago" => "месеци раније",
"last year" => "прошле године",
"years ago" => "година раније",
"Choose" => "Одабери",
-"Cancel" => "Откажи",
"Yes" => "Да",
"No" => "Не",
"Ok" => "У реду",
@@ -77,7 +75,6 @@
"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." => "Добићете везу за ресетовање лозинке путем е-поште.",
"Username" => "Корисничко име",
@@ -116,7 +113,6 @@
"Lost your password?" => "Изгубили сте лозинку?",
"remember" => "упамти",
"Log in" => "Пријава",
-"prev" => "претходно",
-"next" => "следеће",
"Updating ownCloud to version %s, this may take a while." => "Надоградња ownCloud-а на верзију %s, сачекајте тренутак."
);
+$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);";
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index 238843aa176..62ed061ca06 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Sunday" => "Nedelja",
"Monday" => "Ponedeljak",
"Tuesday" => "Utorak",
@@ -19,7 +20,10 @@
"November" => "Novembar",
"December" => "Decembar",
"Settings" => "Podešavanja",
-"Cancel" => "Otkaži",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("","",""),
"Password" => "Lozinka",
"You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.",
"Username" => "Korisničko ime",
@@ -45,7 +49,6 @@
"Finish setup" => "Završi podešavanje",
"Log out" => "Odjava",
"Lost your password?" => "Izgubili ste lozinku?",
-"remember" => "upamti",
-"prev" => "prethodno",
-"next" => "sledeće"
+"remember" => "upamti"
);
+$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);";
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 091ae9e2fae..cda76a520b4 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s delade »%s« med dig",
"Category type not provided." => "Kategorityp inte angiven.",
"No category to add?" => "Ingen kategori att lägga till?",
@@ -29,20 +30,17 @@
"December" => "December",
"Settings" => "Inställningar",
"seconds ago" => "sekunder sedan",
-"1 minute ago" => "1 minut sedan",
-"{minutes} minutes ago" => "{minutes} minuter sedan",
-"1 hour ago" => "1 timme sedan",
-"{hours} hours ago" => "{hours} timmar sedan",
+"_%n minute ago_::_%n minutes ago_" => array("%n minut sedan","%n minuter sedan"),
+"_%n hour ago_::_%n hours ago_" => array("%n timme sedan","%n timmar sedan"),
"today" => "i dag",
"yesterday" => "i går",
-"{days} days ago" => "{days} dagar sedan",
+"_%n day ago_::_%n days ago_" => array("%n dag sedan","%n dagar sedan"),
"last month" => "förra månaden",
-"{months} months ago" => "{months} månader sedan",
+"_%n month ago_::_%n months ago_" => array("%n månad sedan","%n månader sedan"),
"months ago" => "månader sedan",
"last year" => "förra året",
"years ago" => "år sedan",
"Choose" => "Välj",
-"Cancel" => "Avbryt",
"Error loading file picker template" => "Fel vid inläsning av filväljarens mall",
"Yes" => "Ja",
"No" => "Nej",
@@ -85,7 +83,7 @@
"Email sent" => "E-post skickat",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
-"ownCloud password reset" => "ownCloud lösenordsåterställning",
+"%s password reset" => "%s återställ lösenord",
"Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Länken för att återställa ditt lösenorden har skickats till din e-postadress<br>Om du inte har erhållit meddelandet inom kort, vänligen kontrollera din skräppost-mapp<br>Om den inte finns där, vänligen kontakta din administratör.",
"Request failed!<br>Did you make sure your email/username was right?" => "Begäran misslyckades!<br>Är du helt säker på att din e-postadress/användarnamn är korrekt?",
@@ -128,6 +126,7 @@
"Finish setup" => "Avsluta installation",
"%s is available. Get more information on how to update." => "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.",
"Log out" => "Logga ut",
+"More apps" => "Fler appar",
"Automatic logon rejected!" => "Automatisk inloggning inte tillåten!",
"If you did not change your password recently, your account may be compromised!" => "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara manipulerat!",
"Please change your password to secure your account again." => "Ändra genast lösenord för att säkra ditt konto.",
@@ -136,7 +135,6 @@
"Log in" => "Logga in",
"Alternative Logins" => "Alternativa inloggningar",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hej där,<br><br>ville bara informera dig om att %s delade »%s« med dig.<br><a href=\"%s\">Titta på den!</a><br><br>Hörs!",
-"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."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sw_KE.php b/core/l10n/sw_KE.php
new file mode 100644
index 00000000000..93c8e33f3e2
--- /dev/null
+++ b/core/l10n/sw_KE.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index e593018aaad..3fc461d4284 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "பிரிவு வகைகள் வழங்கப்படவில்லை",
"No category to add?" => "சேர்ப்பதற்கான வகைகள் இல்லையா?",
"Object type not provided." => "பொருள் வகை வழங்கப்படவில்லை",
@@ -27,20 +28,17 @@
"December" => "மார்கழி",
"Settings" => "அமைப்புகள்",
"seconds ago" => "செக்கன்களுக்கு முன்",
-"1 minute ago" => "1 நிமிடத்திற்கு முன் ",
-"{minutes} minutes ago" => "{நிமிடங்கள்} நிமிடங்களுக்கு முன் ",
-"1 hour ago" => "1 மணித்தியாலத்திற்கு முன்",
-"{hours} hours ago" => "{மணித்தியாலங்கள்} மணித்தியாலங்களிற்கு முன்",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "இன்று",
"yesterday" => "நேற்று",
-"{days} days ago" => "{நாட்கள்} நாட்களுக்கு முன்",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "கடந்த மாதம்",
-"{months} months ago" => "{மாதங்கள்} மாதங்களிற்கு முன்",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "மாதங்களுக்கு முன்",
"last year" => "கடந்த வருடம்",
"years ago" => "வருடங்களுக்கு முன்",
"Choose" => "தெரிவுசெய்க ",
-"Cancel" => "இரத்து செய்க",
"Yes" => "ஆம்",
"No" => "இல்லை",
"Ok" => "சரி",
@@ -74,7 +72,6 @@
"Password protected" => "கடவுச்சொல் பாதுகாக்கப்பட்டது",
"Error unsetting expiration date" => "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு",
"Error setting expiration date" => "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு",
-"ownCloud password reset" => "ownCloud இன் கடவுச்சொல் மீளமைப்பு",
"Use the following link to reset your password: {link}" => "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
"You will receive a link to reset your password via Email." => "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
"Username" => "பயனாளர் பெயர்",
@@ -112,7 +109,6 @@
"Please change your password to secure your account again." => "உங்களுடைய கணக்கை மீண்டும் பாதுகாக்க தயவுசெய்து உங்களுடைய கடவுச்சொல்லை மாற்றவும்.",
"Lost your password?" => "உங்கள் கடவுச்சொல்லை தொலைத்துவிட்டீர்களா?",
"remember" => "ஞாபகப்படுத்துக",
-"Log in" => "புகுபதிகை",
-"prev" => "முந்தைய",
-"next" => "அடுத்து"
+"Log in" => "புகுபதிகை"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/te.php b/core/l10n/te.php
index 1469d37296f..2e2bb8f8fe8 100644
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"This category already exists: %s" => "ఈ వర్గం ఇప్పటికే ఉంది: %s",
"Sunday" => "ఆదివారం",
"Monday" => "సోమవారం",
@@ -21,19 +22,16 @@
"December" => "డిసెంబర్",
"Settings" => "అమరికలు",
"seconds ago" => "క్షణాల క్రితం",
-"1 minute ago" => "1 నిమిషం క్రితం",
-"{minutes} minutes ago" => "{minutes} నిమిషాల క్రితం",
-"1 hour ago" => "1 గంట క్రితం",
-"{hours} hours ago" => "{hours} గంటల క్రితం",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "ఈరోజు",
"yesterday" => "నిన్న",
-"{days} days ago" => "{days} రోజుల క్రితం",
+"_%n day ago_::_%n days ago_" => array("",""),
"last month" => "పోయిన నెల",
-"{months} months ago" => "{months} నెలల క్రితం",
+"_%n month ago_::_%n months ago_" => array("",""),
"months ago" => "నెలల క్రితం",
"last year" => "పోయిన సంవత్సరం",
"years ago" => "సంవత్సరాల క్రితం",
-"Cancel" => "రద్దుచేయి",
"Yes" => "అవును",
"No" => "కాదు",
"Ok" => "సరే",
@@ -50,3 +48,4 @@
"Log out" => "నిష్క్రమించు",
"Lost your password?" => "మీ సంకేతపదం పోయిందా?"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 392da561bf8..bb5181fd9e6 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "ยังไม่ได้ระบุชนิดของหมวดหมู่",
"No category to add?" => "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?",
"Object type not provided." => "ชนิดของวัตถุยังไม่ได้ถูกระบุ",
@@ -27,20 +28,17 @@
"December" => "ธันวาคม",
"Settings" => "ตั้งค่า",
"seconds ago" => "วินาที ก่อนหน้านี้",
-"1 minute ago" => "1 นาทีก่อนหน้านี้",
-"{minutes} minutes ago" => "{minutes} นาทีก่อนหน้านี้",
-"1 hour ago" => "1 ชั่วโมงก่อนหน้านี้",
-"{hours} hours ago" => "{hours} ชั่วโมงก่อนหน้านี้",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "วันนี้",
"yesterday" => "เมื่อวานนี้",
-"{days} days ago" => "{day} วันก่อนหน้านี้",
+"_%n day ago_::_%n days ago_" => array(""),
"last month" => "เดือนที่แล้ว",
-"{months} months ago" => "{months} เดือนก่อนหน้านี้",
+"_%n month ago_::_%n months ago_" => array(""),
"months ago" => "เดือน ที่ผ่านมา",
"last year" => "ปีที่แล้ว",
"years ago" => "ปี ที่ผ่านมา",
"Choose" => "เลือก",
-"Cancel" => "ยกเลิก",
"Yes" => "ตกลง",
"No" => "ไม่ตกลง",
"Ok" => "ตกลง",
@@ -81,7 +79,6 @@
"Email sent" => "ส่งอีเมล์แล้ว",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "การอัพเดทไม่เป็นผลสำเร็จ กรุณาแจ้งปัญหาที่เกิดขึ้นไปยัง <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">คอมมูนิตี้ผู้ใช้งาน ownCloud</a>",
"The update was successful. Redirecting you to ownCloud now." => "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
-"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." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
"Username" => "ชื่อผู้ใช้งาน",
@@ -120,7 +117,6 @@
"Lost your password?" => "ลืมรหัสผ่าน?",
"remember" => "จำรหัสผ่าน",
"Log in" => "เข้าสู่ระบบ",
-"prev" => "ก่อนหน้า",
-"next" => "ถัดไป",
"Updating ownCloud to version %s, this may take a while." => "กำลังอัพเดท ownCloud ไปเป็นรุ่น %s, กรุณารอสักครู่"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 063690d0e1f..dde8a1bd97a 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -1,6 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s sizinle »%s« paylaşımında bulundu",
-"Category type not provided." => "Kategori türü desteklenmemektedir.",
+"Category type not provided." => "Kategori türü girilmedi.",
"No category to add?" => "Eklenecek kategori yok?",
"This category already exists: %s" => "Bu kategori zaten mevcut: %s",
"Object type not provided." => "Nesne türü desteklenmemektedir.",
@@ -29,20 +30,17 @@
"December" => "Aralık",
"Settings" => "Ayarlar",
"seconds ago" => "saniye önce",
-"1 minute ago" => "1 dakika önce",
-"{minutes} minutes ago" => "{minutes} dakika önce",
-"1 hour ago" => "1 saat önce",
-"{hours} hours ago" => "{hours} saat önce",
+"_%n minute ago_::_%n minutes ago_" => array("%n dakika önce","%n dakika önce"),
+"_%n hour ago_::_%n hours ago_" => array("%n saat önce","%n saat önce"),
"today" => "bugün",
"yesterday" => "dün",
-"{days} days ago" => "{days} gün önce",
+"_%n day ago_::_%n days ago_" => array("%n gün önce","%n gün önce"),
"last month" => "geçen ay",
-"{months} months ago" => "{months} ay önce",
+"_%n month ago_::_%n months ago_" => array("%n ay önce","%n ay önce"),
"months ago" => "ay önce",
"last year" => "geçen yıl",
"years ago" => "yıl önce",
"Choose" => "seç",
-"Cancel" => "İptal",
"Error loading file picker template" => "Seçici şablon dosya yüklemesinde hata",
"Yes" => "Evet",
"No" => "Hayır",
@@ -85,7 +83,7 @@
"Email sent" => "Eposta gönderildi",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. ownCloud'a yönlendiriliyor.",
-"ownCloud password reset" => "ownCloud parola sıfırlama",
+"%s password reset" => "%s parola sıfırlama",
"Use the following link to reset your password: {link}" => "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>I Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk dizinini kontrol ediniz.<br> Eğer orada da bulamazsanız sistem yöneticinize sorunuz.",
"Request failed!<br>Did you make sure your email/username was right?" => "Isteği başarısız oldu!<br>E-posta / kullanıcı adınızı doğru olduğundan emin misiniz?",
@@ -110,9 +108,11 @@
"Add" => "Ekle",
"Security Warning" => "Güvenlik Uyarisi",
"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "%s güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.",
"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 files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için internet'ten erişime açık.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Server'ınızı nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">dokümantasyon sayfasını</a> ziyaret edin.",
"Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
"Advanced" => "Gelişmiş",
"Data folder" => "Veri klasörü",
@@ -126,6 +126,7 @@
"Finish setup" => "Kurulumu tamamla",
"%s is available. Get more information on how to update." => "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın.",
"Log out" => "Çıkış yap",
+"More apps" => "Daha fazla Uygulama",
"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.",
@@ -134,7 +135,6 @@
"Log in" => "Giriş yap",
"Alternative Logins" => "Alternatif Girişler",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Merhaba, <br><br> %s sizinle »%s« paylaşımında bulundu.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>İyi günler!",
-"prev" => "önceki",
-"next" => "sonraki",
"Updating ownCloud to version %s, this may take a while." => "Owncloud %s versiyonuna güncelleniyor. Biraz zaman alabilir."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index c1bf48e07dd..5cbb90d15f9 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Sunday" => "يەكشەنبە",
"Monday" => "دۈشەنبە",
"Tuesday" => "سەيشەنبە",
@@ -19,11 +20,12 @@
"November" => "ئوغلاق",
"December" => "كۆنەك",
"Settings" => "تەڭشەكلەر",
-"1 minute ago" => "1 مىنۇت ئىلگىرى",
-"1 hour ago" => "1 سائەت ئىلگىرى",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "بۈگۈن",
"yesterday" => "تۈنۈگۈن",
-"Cancel" => "ۋاز كەچ",
+"_%n day ago_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array(""),
"Yes" => "ھەئە",
"No" => "ياق",
"Ok" => "جەزملە",
@@ -41,8 +43,10 @@
"Users" => "ئىشلەتكۈچىلەر",
"Apps" => "ئەپلەر",
"Help" => "ياردەم",
+"Edit categories" => "تۈر تەھرىر",
"Add" => "قوش",
"Advanced" => "ئالىي",
"Finish setup" => "تەڭشەك تامام",
"Log out" => "تىزىمدىن چىق"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 8491590787a..6fcb23d0a32 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "Не вказано тип категорії.",
"No category to add?" => "Відсутні категорії для додавання?",
"This category already exists: %s" => "Ця категорія вже існує: %s",
@@ -28,20 +29,17 @@
"December" => "Грудень",
"Settings" => "Налаштування",
"seconds ago" => "секунди тому",
-"1 minute ago" => "1 хвилину тому",
-"{minutes} minutes ago" => "{minutes} хвилин тому",
-"1 hour ago" => "1 годину тому",
-"{hours} hours ago" => "{hours} години тому",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
"today" => "сьогодні",
"yesterday" => "вчора",
-"{days} days ago" => "{days} днів тому",
+"_%n day ago_::_%n days ago_" => array("","",""),
"last month" => "минулого місяця",
-"{months} months ago" => "{months} місяців тому",
+"_%n month ago_::_%n months ago_" => array("","",""),
"months ago" => "місяці тому",
"last year" => "минулого року",
"years ago" => "роки тому",
"Choose" => "Обрати",
-"Cancel" => "Відмінити",
"Yes" => "Так",
"No" => "Ні",
"Ok" => "Ok",
@@ -82,7 +80,6 @@
"Email sent" => "Ел. пошта надіслана",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Оновлення виконалось неуспішно. Будь ласка, повідомте про цю проблему в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">спільноті ownCloud</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Оновлення виконалось успішно. Перенаправляємо вас на ownCloud.",
-"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." => "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.",
"Username" => "Ім'я користувача",
@@ -124,7 +121,6 @@
"remember" => "запам'ятати",
"Log in" => "Вхід",
"Alternative Logins" => "Альтернативні Логіни",
-"prev" => "попередній",
-"next" => "наступний",
"Updating ownCloud to version %s, this may take a while." => "Оновлення ownCloud до версії %s, це може зайняти деякий час."
);
+$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);";
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index b27033b80e8..96871a54d0b 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"No category to add?" => "شامل کرنے کے لیے کوئی زمرہ نہیں؟",
"No categories selected for deletion." => "ختم کرنے کے لیے کسی زمرہ جات کا انتخاب نہیں کیا گیا۔",
"January" => "جنوری",
@@ -14,8 +15,11 @@
"November" => "نومبر",
"December" => "دسمبر",
"Settings" => "سیٹینگز",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
"Choose" => "منتخب کریں",
-"Cancel" => "منسوخ کریں",
"Yes" => "ہاں",
"No" => "نہیں",
"Ok" => "اوکے",
@@ -39,7 +43,6 @@
"delete" => "ختم کریں",
"share" => "شئیر کریں",
"Password protected" => "پاسورڈ سے محفوظ کیا گیا ہے",
-"ownCloud password reset" => "اون کلاؤڈ پاسورڈ ری سیٹ",
"Use the following link to reset your password: {link}" => "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔ {link}",
"You will receive a link to reset your password via Email." => "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
"Username" => "یوزر نیم",
@@ -71,7 +74,6 @@
"Log out" => "لاگ آؤٹ",
"Lost your password?" => "کیا آپ پاسورڈ بھول گئے ہیں؟",
"remember" => "یاد رکھیں",
-"Log in" => "لاگ ان",
-"prev" => "پچھلا",
-"next" => "اگلا"
+"Log in" => "لاگ ان"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 0ea7dd3a642..305839b4760 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Category type not provided." => "Kiểu hạng mục không được cung cấp.",
"No category to add?" => "Không có danh mục được thêm?",
"This category already exists: %s" => "Danh mục này đã tồn tại: %s",
@@ -28,20 +29,17 @@
"December" => "Tháng 12",
"Settings" => "Cài đặt",
"seconds ago" => "vài giây trước",
-"1 minute ago" => "1 phút trước",
-"{minutes} minutes ago" => "{minutes} phút trước",
-"1 hour ago" => "1 giờ trước",
-"{hours} hours ago" => "{hours} giờ trước",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "hôm nay",
"yesterday" => "hôm qua",
-"{days} days ago" => "{days} ngày trước",
+"_%n day ago_::_%n days ago_" => array(""),
"last month" => "tháng trước",
-"{months} months ago" => "{months} tháng trước",
+"_%n month ago_::_%n months ago_" => array(""),
"months ago" => "tháng trước",
"last year" => "năm trước",
"years ago" => "năm trước",
"Choose" => "Chọn",
-"Cancel" => "Hủy",
"Yes" => "Có",
"No" => "Không",
"Ok" => "Đồng ý",
@@ -82,7 +80,6 @@
"Email sent" => "Email đã được gửi",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Cập nhật không thành công . Vui lòng thông báo đến <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\"> Cộng đồng ownCloud </a>.",
"The update was successful. Redirecting you to ownCloud now." => "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
-"ownCloud password reset" => "Khôi phục mật khẩu Owncloud ",
"Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Liên kết tạo lại mật khẩu đã được gửi tới hộp thư của bạn.<br>Nếu bạn không thấy nó sau một khoảng thời gian, vui lòng kiểm tra trong thư mục Spam/Rác.<br>Nếu vẫn không thấy, vui lòng hỏi người quản trị hệ thống.",
"Request failed!<br>Did you make sure your email/username was right?" => "Yêu cầu thất bại!<br>Bạn có chắc là email/tên đăng nhập của bạn chính xác?",
@@ -127,7 +124,6 @@
"remember" => "ghi nhớ",
"Log in" => "Đăng nhập",
"Alternative Logins" => "Đăng nhập khác",
-"prev" => "Lùi lại",
-"next" => "Kế tiếp",
"Updating ownCloud to version %s, this may take a while." => "Cập nhật ownCloud lên phiên bản %s, có thể sẽ mất thời gian"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index fce45b3c98a..92f1aef8850 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s 与您共享了 »%s« ",
"Category type not provided." => "未选择分类类型。",
"No category to add?" => "没有分类添加了?",
@@ -29,20 +30,17 @@
"December" => "十二月",
"Settings" => "设置",
"seconds ago" => "秒前",
-"1 minute ago" => "1 分钟前",
-"{minutes} minutes ago" => "{minutes} 分钟前",
-"1 hour ago" => "1小时前",
-"{hours} hours ago" => "{hours}小时前",
+"_%n minute ago_::_%n minutes ago_" => array("%n 分钟以前"),
+"_%n hour ago_::_%n hours ago_" => array("%n 小时以前"),
"today" => "今天",
"yesterday" => "昨天",
-"{days} days ago" => "{days} 天前",
+"_%n day ago_::_%n days ago_" => array("%n 天以前"),
"last month" => "上个月",
-"{months} months ago" => "{months}月前",
+"_%n month ago_::_%n months ago_" => array("%n 个月以前"),
"months ago" => "月前",
"last year" => "去年",
"years ago" => "年前",
"Choose" => "选择",
-"Cancel" => "取消",
"Error loading file picker template" => "加载文件选取模板出错",
"Yes" => "是",
"No" => "否",
@@ -85,7 +83,7 @@
"Email sent" => "电子邮件已发送",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "升级失败。请向<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud社区</a>报告此问题。",
"The update was successful. Redirecting you to ownCloud now." => "升级成功。现在为您跳转到ownCloud。",
-"ownCloud password reset" => "私有云密码重置",
+"%s password reset" => "%s 密码重置",
"Use the following link to reset your password: {link}" => "使用下面的链接来重置你的密码:{link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重置密码的连接已经通过邮件到您的邮箱。<br> 如果你没有收到邮件,可能是由于要再等一下,或者检查一下您的垃圾邮件夹。<br> 如果还是没有收到,请联系您的系统管理员。",
"Request failed!<br>Did you make sure your email/username was right?" => "请求失败!<br> 你确定你的邮件地址/用户名是正确的?",
@@ -128,6 +126,7 @@
"Finish setup" => "完成安装",
"%s is available. Get more information on how to update." => "%s 是可用的。获取更多关于升级的信息。",
"Log out" => "注销",
+"More apps" => "更多应用",
"Automatic logon rejected!" => "自动登录被拒绝!",
"If you did not change your password recently, your account may be compromised!" => "如果您最近没有修改您的密码,那您的帐号可能被攻击了!",
"Please change your password to secure your account again." => "请修改您的密码以保护账户。",
@@ -136,7 +135,6 @@
"Log in" => "登陆",
"Alternative Logins" => "备选登录",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "你好!<br><br>温馨提示: %s 与您共享了 %s 。<br><br>\n查看: %s <br><br> 祝顺利!",
-"prev" => "后退",
-"next" => "前进",
"Updating ownCloud to version %s, this may take a while." => "ownCloud正在升级至 %s 版,这可能需要一点时间。"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index ecc97f000b6..a5a63e24858 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s 向您分享了 »%s«",
"Category type not provided." => "未提供分类类型。",
"No category to add?" => "没有可添加分类?",
@@ -29,20 +30,17 @@
"December" => "十二月",
"Settings" => "设置",
"seconds ago" => "秒前",
-"1 minute ago" => "一分钟前",
-"{minutes} minutes ago" => "{minutes} 分钟前",
-"1 hour ago" => "1小时前",
-"{hours} hours ago" => "{hours} 小时前",
+"_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "今天",
"yesterday" => "昨天",
-"{days} days ago" => "{days} 天前",
+"_%n day ago_::_%n days ago_" => array(""),
"last month" => "上月",
-"{months} months ago" => "{months} 月前",
+"_%n month ago_::_%n months ago_" => array(""),
"months ago" => "月前",
"last year" => "去年",
"years ago" => "年前",
"Choose" => "选择(&C)...",
-"Cancel" => "取消",
"Error loading file picker template" => "加载文件选择器模板出错",
"Yes" => "是",
"No" => "否",
@@ -85,7 +83,6 @@
"Email sent" => "邮件已发送",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新不成功。请汇报将此问题汇报给 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社区</a>。",
"The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。",
-"ownCloud password reset" => "重置 ownCloud 密码",
"Use the following link to reset your password: {link}" => "使用以下链接重置您的密码:{link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重置密码的链接已发送到您的邮箱。<br>如果您觉得在合理的时间内还未收到邮件,请查看 spam/junk 目录。<br>如果没有在那里,请询问您的本地管理员。",
"Request failed!<br>Did you make sure your email/username was right?" => "请求失败<br>您确定您的邮箱/用户名是正确的?",
@@ -134,7 +131,6 @@
"Log in" => "登录",
"Alternative Logins" => "其他登录方式",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "您好,<br><br>%s 向您分享了 »%s«。<br><a href=\"%s\">查看</a>",
-"prev" => "上一页",
-"next" => "下一页",
"Updating ownCloud to version %s, this may take a while." => "更新 ownCloud 到版本 %s,这可能需要一些时间。"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index 21418fe2eeb..8bfa1f58616 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Sunday" => "星期日",
"Monday" => "星期一",
"Tuesday" => "星期二",
@@ -19,11 +20,14 @@
"November" => "十一月",
"December" => "十二月",
"Settings" => "設定",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "今日",
"yesterday" => "昨日",
+"_%n day ago_::_%n days ago_" => array(""),
"last month" => "前一月",
+"_%n month ago_::_%n months ago_" => array(""),
"months ago" => "個月之前",
-"Cancel" => "取消",
"Yes" => "Yes",
"No" => "No",
"Ok" => "OK",
@@ -82,7 +86,6 @@
"Lost your password?" => "忘記密碼",
"remember" => "記住",
"Log in" => "登入",
-"prev" => "前一步",
-"next" => "下一步",
"Updating ownCloud to version %s, this may take a while." => "ownCloud (ver. %s)更新中, 請耐心等侯"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index bc381329b76..d2cbb7a8fd3 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"%s shared »%s« with you" => "%s 與您分享了 %s",
"Category type not provided." => "未提供分類類型。",
"No category to add?" => "沒有可增加的分類?",
@@ -29,20 +30,17 @@
"December" => "十二月",
"Settings" => "設定",
"seconds ago" => "幾秒前",
-"1 minute ago" => "1 分鐘前",
-"{minutes} minutes ago" => "{minutes} 分鐘前",
-"1 hour ago" => "1 小時之前",
-"{hours} hours ago" => "{hours} 小時前",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "今天",
"yesterday" => "昨天",
-"{days} days ago" => "{days} 天前",
+"_%n day ago_::_%n days ago_" => array(""),
"last month" => "上個月",
-"{months} months ago" => "{months} 個月前",
+"_%n month ago_::_%n months ago_" => array(""),
"months ago" => "幾個月前",
"last year" => "去年",
"years ago" => "幾年前",
"Choose" => "選擇",
-"Cancel" => "取消",
"Error loading file picker template" => "載入檔案選擇器樣板發生錯誤",
"Yes" => "是",
"No" => "否",
@@ -85,7 +83,6 @@
"Email sent" => "Email 已寄出",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "升級失敗,請將此問題回報 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社群</a>。",
"The update was successful. Redirecting you to ownCloud now." => "升級成功,正將您重新導向至 ownCloud 。",
-"ownCloud password reset" => "ownCloud 密碼重設",
"Use the following link to reset your password: {link}" => "請至以下連結重設您的密碼: {link}",
"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "重設密碼的連結已經寄至您的電子郵件信箱,如果您過了一段時間還是沒有收到它,請檢查看看它是不是被放到垃圾郵件了,如果還是沒有的話,請聯絡您的 ownCloud 系統管理員。",
"Request failed!<br>Did you make sure your email/username was right?" => "請求失敗!<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎?",
@@ -136,7 +133,6 @@
"Log in" => "登入",
"Alternative Logins" => "替代登入方法",
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "嗨,<br><br>通知您,%s 與您分享了 %s ,<br><a href=\"%s\">看一下吧</a>",
-"prev" => "上一頁",
-"next" => "下一頁",
"Updating ownCloud to version %s, this may take a while." => "正在將 Owncloud 升級至版本 %s ,這可能需要一點時間。"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 2f996365219..74a5be2b96f 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -57,7 +57,8 @@ class OC_Core_LostPassword_Controller {
$l = OC_L10N::get('core');
$from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
try {
- OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
+ $defaults = new OC_Defaults();
+ OC_Mail::send($email, $_POST['user'], $l->t('%s password reset', array($defaults->getName())), $msg, $from, $defaults->getName());
} catch (Exception $e) {
OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
}
diff --git a/core/lostpassword/templates/email.php b/core/lostpassword/templates/email.php
index b65049feffe..3dbae4bfc69 100644
--- a/core/lostpassword/templates/email.php
+++ b/core/lostpassword/templates/email.php
@@ -1,2 +1,2 @@
<?php
-echo str_replace('{link}', $_['link'], $l->t('Use the following link to reset your password: {link}')); \ No newline at end of file
+echo str_replace('{link}', $_['link'], $l->t('Use the following link to reset your password: {link}'));
diff --git a/core/routes.php b/core/routes.php
index be19b66bf72..dd8222d4378 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -73,4 +73,4 @@ $this->create('app_script', '/apps/{app}/{file}')
// used for heartbeat
$this->create('heartbeat', '/heartbeat')->action(function(){
// do nothing
-}); \ No newline at end of file
+});
diff --git a/core/templates/error.php b/core/templates/error.php
index ac91357b350..e8b7a49264f 100644
--- a/core/templates/error.php
+++ b/core/templates/error.php
@@ -1,4 +1,4 @@
-<ul>
+<ul class="error-wide">
<?php foreach($_["errors"] as $error):?>
<li class='error'>
<?php p($error['error']) ?><br/>
diff --git a/core/templates/filetemplates/template.html b/core/templates/filetemplates/template.html
new file mode 100644
index 00000000000..f16e80cb7ef
--- /dev/null
+++ b/core/templates/filetemplates/template.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+ <head>
+
+ </head>
+ <body>
+
+ </body>
+</html>
diff --git a/core/templates/filetemplates/template.odp b/core/templates/filetemplates/template.odp
new file mode 100644
index 00000000000..f6371165b82
--- /dev/null
+++ b/core/templates/filetemplates/template.odp
Binary files differ
diff --git a/core/templates/filetemplates/template.ods b/core/templates/filetemplates/template.ods
new file mode 100644
index 00000000000..e5e8b0bed8b
--- /dev/null
+++ b/core/templates/filetemplates/template.ods
Binary files differ
diff --git a/core/templates/filetemplates/template.odt b/core/templates/filetemplates/template.odt
new file mode 100644
index 00000000000..9bdb351b92e
--- /dev/null
+++ b/core/templates/filetemplates/template.odt
Binary files differ
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 77c455304d3..8b087706801 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -62,7 +62,7 @@
</fieldset>
<fieldset id="datadirField">
- <legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret-dark.svg')); ?>" /></a></legend>
+ <legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
<div id="datadirContent">
<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
<input type="text" name="directory" id="directory"
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index b7405ea273b..3c1114492cb 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -89,6 +89,19 @@
</a>
</li>
<?php endforeach; ?>
+
+ <!-- show "More apps" link to app administration directly in app navigation -->
+ <?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
+ <li id="apps-management">
+ <a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title=""
+ <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
+ <img class="icon svg" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/>
+ <span>
+ <?php p($l->t('More apps')); ?>
+ </span>
+ </a>
+ </li>
+ <?php endif; ?>
</ul>
</div></nav>
diff --git a/core/templates/part.pagenavi.php b/core/templates/part.pagenavi.php
deleted file mode 100644
index 2f5c2183765..00000000000
--- a/core/templates/part.pagenavi.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<ol class="pager">
- <?php if($_['page']>0):?>
- <li class="pagerbutton1"><a href="<?php print_unescaped($_['url'].($_['page']-1));?>"><?php p($l->t( 'prev' )); ?></a></li>
- <?php endif; ?>
- <?php if ($_['pagestart']>0):?>
- &hellip;
- <?php endif;?>
- <?php for ($i=$_['pagestart']; $i < $_['pagestop'];$i++):?>
- <?php if ($_['page']!=$i):?>
- <li><a href="<?php print_unescaped($_['url'].$i);?>"><?php p($i+1);?></a></li>
- <?php else:?>
- <li><?php p($i+1);?></li>
- <?php endif?>
- <?php endfor;?>
- <?php if ($_['pagestop']<$_['pagecount']):?>
- &hellip;
- <?php endif;?>
-
- <?php if(($_['page']+1)<$_['pagecount']):?>
- <li class="pagerbutton2"><a href="<?php print_unescaped($_['url'].($_['page']+1));?>"><?php p($l->t( 'next' )); ?></a></li>
- <?php endif; ?>
-</ol>
diff --git a/cron.php b/cron.php
index fbea7f26aed..d39800c8849 100644
--- a/cron.php
+++ b/cron.php
@@ -121,4 +121,4 @@ try {
} catch (Exception $ex) {
\OCP\Util::writeLog('cron', $ex->getMessage(), \OCP\Util::FATAL);
-} \ No newline at end of file
+}
diff --git a/db_structure.xml b/db_structure.xml
index ef5de653033..f926ab44cd4 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -32,7 +32,7 @@
<field>
<name>configvalue</name>
<type>clob</type>
- <notnull>true</notnull>
+ <notnull>false</notnull>
</field>
<index>
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 9172c1dafcd..5673ceabd33 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Instellings"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +197,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -377,8 +373,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr "Teken uit"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "vorige"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "volgende"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index adfb6e8f93d..6ebf523c19f 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_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-07-22 01:54-0400\n"
-"PO-Revision-Date: 2013-07-22 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,11 +120,7 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
-
-#: js/filelist.js:457
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:460 js/filelist.js:518
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -285,45 +281,49 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Deleted files"
msgstr ""
-#: templates/index.php:48
+#: templates/index.php:46
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:54
+#: templates/index.php:52
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:61
+#: templates/index.php:59
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:73
msgid "Download"
msgstr ""
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
msgid "Unshare"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:105
msgid "Upload too large"
msgstr ""
-#: templates/index.php:109
+#: templates/index.php:107
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:114
+#: templates/index.php:112
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:117
+#: templates/index.php:115
msgid "Current scanning"
msgstr ""
diff --git a/l10n/af_ZA/files_encryption.po b/l10n/af_ZA/files_encryption.po
index fef8a84bfe4..6e1898259c6 100644
--- a/l10n/af_ZA/files_encryption.po
+++ b/l10n/af_ZA/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po
index 67021b0b63a..020abe02dd9 100644
--- a/l10n/af_ZA/files_trashbin.po
+++ b/l10n/af_ZA/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,17 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 6d1d757e277..ab198f78cac 100644
--- a/l10n/af_ZA/lib.po
+++ b/l10n/af_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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Gebruikers"
#: app.php:409
-msgid "Apps"
-msgstr "Toepassings"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index 64a38fbef8a..2a6cffc209a 100644
--- a/l10n/af_ZA/settings.po
+++ b/l10n/af_ZA/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 1d1d4695a71..b4f237d6109 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Hulp"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index a045850030e..a89b43a8722 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,75 @@ msgstr "تشرين الثاني"
msgid "December"
msgstr "كانون الاول"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "إعدادات"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "منذ ثواني"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "منذ دقيقة"
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} منذ دقائق"
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "قبل ساعة مضت"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} ساعة مضت"
-
-#: js/js.js:758
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/js.js:815
msgid "today"
msgstr "اليوم"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "يوم أمس"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} يوم سابق"
-
-#: js/js.js:761
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/js.js:818
msgid "last month"
msgstr "الشهر الماضي"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} شهر مضت"
-
-#: js/js.js:763
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/js.js:820
msgid "months ago"
msgstr "شهر مضى"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "السنةالماضية"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "سنة مضت"
@@ -197,23 +213,19 @@ msgstr "سنة مضت"
msgid "Choose"
msgstr "اختيار"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "الغاء"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "نعم"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "لا"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "موافق"
@@ -377,9 +389,10 @@ msgstr "حصل خطأ في عملية التحديث, يرجى ارسال تقر
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud"
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "إعادة تعيين كلمة سر ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +591,10 @@ msgstr ""
msgid "Log out"
msgstr "الخروج"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "تم رفض تسجيل الدخول التلقائي!"
@@ -615,14 +632,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "السابق"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "التالي"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 31b933d9197..e9f43521101 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr "تم إلغاء عملية رفع الملفات ."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "عنوان ال URL لا يجوز أن يكون فارغا."
@@ -107,8 +107,8 @@ msgstr "عنوان ال URL لا يجوز أن يكون فارغا."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "خطأ"
@@ -120,15 +120,11 @@ msgstr "شارك"
msgid "Delete permanently"
msgstr "حذف بشكل دائم"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "إلغاء"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "إعادة تسميه"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "قيد الانتظار"
@@ -156,15 +152,17 @@ msgstr "استبدل {new_name} بـ {old_name}"
msgid "undo"
msgstr "تراجع"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "جاري تنفيذ عملية الحذف"
-
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "جاري رفع 1 ملف"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +188,53 @@ msgstr "مساحتك التخزينية ممتلئة, لا يمكم تحديث
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "مساحتك التخزينية امتلأت تقريبا "
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "إسم مجلد غير صحيح. استخدام مصطلح \"Shared\" محجوز للنظام"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "اسم"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "حجم"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "معدل"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "مجلد عدد 1"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} مجلدات"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "ملف واحد"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} ملفات"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +317,10 @@ msgstr "تحميل"
msgid "Unshare"
msgstr "إلغاء مشاركة"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "إلغاء"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "حجم الترفيع أعلى من المسموح"
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index 874f4ded563..9732c95e1ad 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index d8d3d8214a1..af3920e0949 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index ee55b84b6df..f07045eb588 100644
--- a/l10n/ar/files_trashbin.po
+++ b/l10n/ar/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,25 @@ msgstr "اسم"
msgid "Deleted"
msgstr "تم الحذف"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "مجلد عدد 1"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} مجلدات"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "ملف واحد"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} ملفات"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 145239687f0..2e0845e8125 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "المستخدمين"
#: app.php:409
-msgid "Apps"
-msgstr "التطبيقات"
-
-#: app.php:417
msgid "Admin"
msgstr "المدير"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "تعذّر تحديده"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "التطبيق غير مفعّل"
@@ -210,50 +202,62 @@ msgid "seconds ago"
msgstr "منذ ثواني"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "منذ دقيقة"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d دقيقة مضت"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "قبل ساعة مضت"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d ساعة مضت"
-
-#: template/functions.php:85
msgid "today"
msgstr "اليوم"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "يوم أمس"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d يوم مضى"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "الشهر الماضي"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d شهر مضت"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "السنةالماضية"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "سنة مضت"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 33845793c7d..b0dc71747b1 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -120,7 +120,11 @@ msgstr "حصل خطأ أثناء تحديث التطبيق"
msgid "Updated"
msgstr "تم التحديث بنجاح"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "جاري الحفظ..."
@@ -141,31 +145,31 @@ msgstr "تعذر حذف المستخدم"
msgid "Groups"
msgstr "مجموعات"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "مدير المجموعة"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "إلغاء"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "اضافة مجموعة"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "يجب ادخال اسم مستخدم صحيح"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "حصل خطأ اثناء انشاء مستخدم"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "يجب ادخال كلمة مرور صحيحة"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr "مجدول"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "قم بتنفيذ مهمة واحدة مع كل صفحة تم تحميلها"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "مشاركة"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "السماح بالمشاركة عن طريق الAPI "
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "السماح للتطبيقات بالمشاركة عن طريق الAPI"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "السماح بالعناوين"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط "
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "السماح بإعادة المشاركة "
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "السماح للمستخدمين باعادة مشاركة الملفات التي تم مشاركتها معهم"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "السماح للمستعملين بإعادة المشاركة مع أي أحد "
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "السماح للمستعمينٍ لإعادة المشاركة فقط مع المستعملين في مجموعاتهم"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "حماية"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "فرض HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "سجل"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "مستوى السجل"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "المزيد"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "أقل"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "إصدار"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "التشفير"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "اسم الدخول"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index dea73584f4e..d760e3d0e43 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "المساعدة"
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 888d740721f..a0b09af764b 100644
--- a/l10n/be/core.po
+++ b/l10n/be/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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -137,59 +137,67 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr ""
-#: js/js.js:715
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:716
-msgid "1 minute ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: js/js.js:717
-msgid "{minutes} minutes ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: js/js.js:718
-msgid "1 hour ago"
-msgstr ""
-
-#: js/js.js:719
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:720
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:721
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:722
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: js/js.js:723
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:724
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: js/js.js:725
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:726
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:727
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +205,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -226,7 +230,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:631 js/share.js:643
+#: js/share.js:643 js/share.js:655
msgid "Error"
msgstr ""
@@ -246,7 +250,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:671
+#: js/share.js:131 js/share.js:683
msgid "Error while sharing"
msgstr ""
@@ -346,23 +350,23 @@ msgstr ""
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:618
+#: js/share.js:398 js/share.js:630
msgid "Password protected"
msgstr ""
-#: js/share.js:631
+#: js/share.js:643
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:643
+#: js/share.js:655
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:658
+#: js/share.js:670
msgid "Sending ..."
msgstr ""
-#: js/share.js:669
+#: js/share.js:681
msgid "Email sent"
msgstr ""
@@ -377,8 +381,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -461,7 +466,7 @@ msgstr ""
msgid "Access forbidden"
msgstr ""
-#: templates/404.php:12
+#: templates/404.php:15
msgid "Cloud not found"
msgstr ""
@@ -578,6 +583,10 @@ msgstr ""
msgid "Log out"
msgstr ""
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +624,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "Папярэдняя"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "Далей"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/be/files.po b/l10n/be/files.po
index 3589633cd92..dab1498b5ce 100644
--- a/l10n/be/files.po
+++ b/l10n/be/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-07-22 01:54-0400\n"
-"PO-Revision-Date: 2013-07-22 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,11 +120,7 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
@@ -156,15 +152,15 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
-
-#: js/filelist.js:457
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: js/filelist.js:460 js/filelist.js:518
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +186,49 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: lib/app.php:73
#, php-format
@@ -285,45 +287,49 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Deleted files"
msgstr ""
-#: templates/index.php:48
+#: templates/index.php:46
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:54
+#: templates/index.php:52
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:61
+#: templates/index.php:59
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:73
msgid "Download"
msgstr ""
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
msgid "Unshare"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:105
msgid "Upload too large"
msgstr ""
-#: templates/index.php:109
+#: templates/index.php:107
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:114
+#: templates/index.php:112
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:117
+#: templates/index.php:115
msgid "Current scanning"
msgstr ""
diff --git a/l10n/be/files_encryption.po b/l10n/be/files_encryption.po
index 8d0154992e9..4f5399874b4 100644
--- a/l10n/be/files_encryption.po
+++ b/l10n/be/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/be/files_trashbin.po b/l10n/be/files_trashbin.po
index ae698ecde9e..770cceb542c 100644
--- a/l10n/be/files_trashbin.po
+++ b/l10n/be/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,21 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index 56bb86b0ac2..62d99ec8df1 100644
--- a/l10n/be/lib.po
+++ b/l10n/be/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: 2013-07-24 01:55-0400\n"
-"PO-Revision-Date: 2013-07-24 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -34,19 +34,15 @@ msgid "Users"
msgstr ""
#: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
msgid "Admin"
msgstr ""
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: defaults.php:33
+#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,54 +202,58 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
-#: template.php:296
+#: template.php:297
msgid "Caused by:"
msgstr ""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 6a5d16012be..1f1fe472263 100644
--- a/l10n/be/settings.po
+++ b/l10n/be/settings.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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index 581d1b1dcc0..f2cad633ff3 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/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: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 97e0522b4b1..0a88faaffc1 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,59 @@ msgstr "Ноември"
msgid "December"
msgstr "Декември"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Настройки"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "преди секунди"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "преди 1 минута"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "преди 1 час"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "днес"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "последният месец"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "последната година"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "последните години"
@@ -197,23 +197,19 @@ msgstr "последните години"
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Отказ"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Добре"
@@ -377,8 +373,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr "Изход"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "пред."
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "следващо"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index a3b4194c6fd..9224fb6a328 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr "Качването е спряно."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Грешка"
@@ -120,15 +120,11 @@ msgstr "Споделяне"
msgid "Delete permanently"
msgstr "Изтриване завинаги"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Изтриване"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Преименуване"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Чакащо"
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr "възтановяване"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Име"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Размер"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Променено"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 папка"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} папки"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 файл"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} файла"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr "Изтегляне"
msgid "Unshare"
msgstr ""
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Изтриване"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Файлът който сте избрали за качване е прекалено голям"
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index 211d08a65e6..3149c9a989e 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/l10n/bg_BG/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 9c95c045cdb..ee8f206c9c2 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index b77637b37bc..1b16c5b4097 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -52,21 +52,17 @@ msgstr "Име"
msgid "Deleted"
msgstr "Изтрито"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 папка"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} папки"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 файл"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} файла"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 468be09e1a3..2d4ada2a9b9 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Потребители"
#: app.php:409
-msgid "Apps"
-msgstr "Приложения"
-
-#: app.php:417
msgid "Admin"
msgstr "Админ"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "не може да се определи"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Приложението не е включено."
@@ -211,50 +203,46 @@ msgid "seconds ago"
msgstr "преди секунди"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "преди 1 минута"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "преди %d минути"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "преди 1 час"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "преди %d часа"
-
-#: template/functions.php:85
msgid "today"
msgstr "днес"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "вчера"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "преди %d дни"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "последният месец"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "преди %d месеца"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "последната година"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "последните години"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index c400409cb19..204560a4b91 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr "Обновено"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Записване..."
@@ -141,31 +145,31 @@ msgstr ""
msgid "Groups"
msgstr "Групи"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Изтриване"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "нова група"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr ""
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr "Крон"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Споделяне"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Още"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "По-малко"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Версия"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Криптиране"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Потребител"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index aa39d255b03..00d80cb160e 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Помощ"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 091c063d0c0..b4dcaa3e016 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,59 @@ msgstr "নভেম্বর"
msgid "December"
msgstr "ডিসেম্বর"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "নিয়ামকসমূহ"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "সেকেন্ড পূর্বে"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "১ মিনিট পূর্বে"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} মিনিট পূর্বে"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 ঘন্টা পূর্বে"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} ঘন্টা পূর্বে"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "আজ"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "গতকাল"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} দিন পূর্বে"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "গত মাস"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} মাস পূর্বে"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "মাস পূর্বে"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "গত বছর"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "বছর পূর্বে"
@@ -197,23 +197,19 @@ msgstr "বছর পূর্বে"
msgid "Choose"
msgstr "বেছে নিন"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "বাতির"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "হ্যাঁ"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "না"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "তথাস্তু"
@@ -377,9 +373,10 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud কূটশব্দ পূনঃনির্ধারণ"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr "প্রস্থান"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "পূর্ববর্তী"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "পরবর্তী"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index f86bf7d7af0..dfaafb4e100 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr "যথেষ্ঠ পরিমাণ স্থান নেই"
msgid "Upload cancelled."
msgstr "আপলোড বাতিল করা হয়েছে।"
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।"
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL ফাঁকা রাখা যাবে না।"
@@ -107,8 +107,8 @@ msgstr "URL ফাঁকা রাখা যাবে না।"
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "সমস্যা"
@@ -120,15 +120,11 @@ msgstr "ভাগাভাগি কর"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "মুছে"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "পূনঃনামকরণ"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "মুলতুবি"
@@ -156,15 +152,13 @@ msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপ
msgid "undo"
msgstr "ক্রিয়া প্রত্যাহার"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "১টি ফাইল আপলোড করা হচ্ছে"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud এর জন্য সংরক্ষিত।"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "রাম"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "আকার"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "পরিবর্তিত"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "১টি ফোল্ডার"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} টি ফোল্ডার"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "১টি ফাইল"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} টি ফাইল"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr "ডাউনলোড"
msgid "Unshare"
msgstr "ভাগাভাগি বাতিল "
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "মুছে"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "আপলোডের আকারটি অনেক বড়"
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index 76ebb7103c5..229e29bf4ea 100644
--- a/l10n/bn_BD/files_encryption.po
+++ b/l10n/bn_BD/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index f4120be967e..13ff8fcdf45 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index 7d1d7716e7f..eba36ccfd6b 100644
--- a/l10n/bn_BD/files_trashbin.po
+++ b/l10n/bn_BD/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr "রাম"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "১টি ফোল্ডার"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} টি ফোল্ডার"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "১টি ফাইল"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} টি ফাইল"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index 2dc3f5e31f4..367e8955b06 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "ব্যবহারকারী"
#: app.php:409
-msgid "Apps"
-msgstr "অ্যাপ"
-
-#: app.php:417
msgid "Admin"
msgstr "প্রশাসন"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr "অ্যাপ্লিকেসনটি সক্রিয় নয়"
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr "সেকেন্ড পূর্বে"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "১ মিনিট পূর্বে"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d মিনিট পূর্বে"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 ঘন্টা পূর্বে"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template/functions.php:85
msgid "today"
msgstr "আজ"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "গতকাল"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d দিন পূর্বে"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "গত মাস"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "গত বছর"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "বছর পূর্বে"
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 88489c1aefb..a03ae46160f 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "সংরক্ষণ করা হচ্ছে.."
@@ -141,31 +145,31 @@ msgstr ""
msgid "Groups"
msgstr "গোষ্ঠীসমূহ"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "গোষ্ঠী প্রশাসক"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "মুছে"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr ""
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr ""
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "বেশী"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "কম"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "ভার্সন"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "সংকেতায়ন"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 5fe4d57ad45..3a816ab1ca7 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "ব্যবহারকারির প্রবেশ ছাঁকন
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "প্রবেশের চেষ্টা করার সময় প্রযোজ্য ছাঁকনীটি নির্ধারণ করবে। প্রবেশের সময় ব্যবহারকারী নামটি %%uid দিয়ে প্রতিস্থাপিত হবে।"
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "%%uid স্থানধারক ব্যবহার করুন, উদাহরণঃ \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "ব্যবহারকারী তালিকা ছাঁকনী"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "ব্যবহারকারী উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "কোন স্থানধারক ব্যতীত, যেমনঃ \"objectClass=person\"।"
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "গোষ্ঠী ছাঁকনী"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "গোষ্ঠীসমূহ উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।"
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "কোন স্থান ধারক ব্যতীত, উদাহরণঃ\"objectClass=posixGroup\"।"
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "পোর্ট"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "TLS ব্যবহার কর"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "বর্ণ অসংবেদী LDAP সার্ভার (উইন্ডোজ)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।"
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "অনুমোদিত নয়, শুধুমাত্র পরীক্ষামূলক ব্যবহারের জন্য।"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।"
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "ব্যবহারকারীর প্রদর্শিতব্য নামের ক্ষেত্র"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "ভিত্তি ব্যবহারকারি বৃক্ষাকারে"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "গোষ্ঠীর প্রদর্শিতব্য নামের ক্ষেত্র"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "ভিত্তি গোষ্ঠী বৃক্ষাকারে"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "গোষ্ঠী-সদস্য সংস্থাপন"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "বাইটে"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "ব্যবহারকারী নামের জন্য ফাঁকা রাখুন (পূর্বনির্ধারিত)। অন্যথায়, LDAP/AD বৈশিষ্ট্য নির্ধারণ করুন।"
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "সহায়িকা"
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index 6400ac456e2..aaec19afacd 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/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-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 12:13+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -137,59 +137,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr ""
-#: js/js.js:715
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:716
-msgid "1 minute ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:717
-msgid "{minutes} minutes ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:718
-msgid "1 hour ago"
-msgstr ""
-
-#: js/js.js:719
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:720
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:721
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:722
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:723
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:724
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:725
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:726
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:727
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +201,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -377,8 +377,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -578,6 +579,10 @@ msgstr ""
msgid "Log out"
msgstr ""
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +620,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index 40526578de4..bd25245e3ae 100644
--- a/l10n/bs/files.po
+++ b/l10n/bs/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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:40+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,15 +120,11 @@ msgstr "Podijeli"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr ""
@@ -156,15 +152,14 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +185,47 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Ime"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Veličina"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +308,10 @@ msgstr ""
msgid "Unshare"
msgstr ""
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
#: templates/index.php:105
msgid "Upload too large"
msgstr ""
diff --git a/l10n/bs/files_encryption.po b/l10n/bs/files_encryption.po
index f0ae33236a4..8e55996135c 100644
--- a/l10n/bs/files_encryption.po
+++ b/l10n/bs/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/bs/files_trashbin.po b/l10n/bs/files_trashbin.po
index 9fb0dde49f9..319adc5d239 100644
--- a/l10n/bs/files_trashbin.po
+++ b/l10n/bs/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,19 @@ msgstr "Ime"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po
index 4def658658b..7c773af3f93 100644
--- a/l10n/bs/lib.po
+++ b/l10n/bs/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: 2013-07-24 01:55-0400\n"
-"PO-Revision-Date: 2013-07-24 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -34,19 +34,15 @@ msgid "Users"
msgstr ""
#: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
msgid "Admin"
msgstr ""
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: defaults.php:33
+#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,54 +202,54 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
-#: template.php:296
+#: template.php:297
msgid "Caused by:"
msgstr ""
diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po
index f5e22a8b729..62b49ca53d4 100644
--- a/l10n/bs/settings.po
+++ b/l10n/bs/settings.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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Spašavam..."
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/bs/user_ldap.po b/l10n/bs/user_ldap.po
index 8205b382a53..6e276fcf031 100644
--- a/l10n/bs/user_ldap.po
+++ b/l10n/bs/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: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 9e2ddf53a6f..3d5fb3ae480 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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\n"
+"PO-Revision-Date: 2013-08-21 15:50+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -139,83 +139,79 @@ msgstr "Novembre"
msgid "December"
msgstr "Desembre"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Configuració"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "segons enrere"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "fa 1 minut"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "fa %n minut"
+msgstr[1] "fa %n minuts"
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "fa {minutes} minuts"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "fa %n hora"
+msgstr[1] "fa %n hores"
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "fa 1 hora"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "fa {hours} hores"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "avui"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "ahir"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "fa {days} dies"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "fa %n dies"
+msgstr[1] "fa %n dies"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "el mes passat"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "fa {months} mesos"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "fa %n mes"
+msgstr[1] "fa %n mesos"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "mesos enrere"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "l'any passat"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "anys enrere"
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
msgid "Choose"
msgstr "Escull"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
msgid "Error loading file picker template"
msgstr "Error en carregar la plantilla del seleccionador de fitxers"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:168
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:178
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:195
msgid "Ok"
msgstr "D'acord"
@@ -379,9 +375,10 @@ msgstr "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "L'actualització ha estat correcte. Ara us redirigim a ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "estableix de nou la contrasenya Owncloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "restableix la contrasenya %s"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -580,6 +577,10 @@ msgstr "%s està disponible. Obtingueu més informació de com actualitzar."
msgid "Log out"
msgstr "Surt"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Més aplicacions"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "L'ha rebutjat l'acceditació automàtica!"
@@ -617,14 +618,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Ei,<br><br>només fer-te saber que %s ha compartit %s amb tu.<br><a href=\"%s\">Mira-ho:</a><br><br>Salut!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "anterior"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "següent"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 885d3a66407..6912e2cea9d 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-22 10:35-0400\n"
+"PO-Revision-Date: 2013-08-21 16:01+0000\n"
+"Last-Translator: rogerc\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"
@@ -96,21 +96,21 @@ msgstr "No hi ha prou espai disponible"
msgid "Upload cancelled."
msgstr "La pujada s'ha cancel·lat."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:234 js/files.js:353
msgid "URL cannot be empty."
msgstr "La URL no pot ser buida"
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:239 lib/app.php:53
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/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Error"
@@ -122,15 +122,11 @@ msgstr "Comparteix"
msgid "Delete permanently"
msgstr "Esborra permanentment"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Esborra"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Reanomena"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Pendent"
@@ -158,15 +154,13 @@ msgstr "s'ha substituït {old_name} per {new_name}"
msgid "undo"
msgstr "desfés"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "executa d'operació d'esborrar"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "Pujant %n fitxer"
+msgstr[1] "Pujant %n fitxers"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 fitxer pujant"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "fitxers pujant"
@@ -192,43 +186,45 @@ msgstr "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden ac
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers."
+
+#: js/files.js:245
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:344
+#: js/files.js:358
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:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nom"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Mida"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 carpeta"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n carpeta"
+msgstr[1] "%n carpetes"
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} carpetes"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 fitxer"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} fitxers"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fitxer"
+msgstr[1] "%n fitxers"
#: lib/app.php:73
#, php-format
@@ -311,6 +307,10 @@ msgstr "Baixa"
msgid "Unshare"
msgstr "Deixa de compartir"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Esborra"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "La pujada és massa gran"
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index 89a390134fc..695090cfef6 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
+"Last-Translator: rogerc\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"
@@ -64,20 +64,20 @@ msgid ""
"files."
msgstr "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora del sistema ownCloud (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Manca de requisits."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Assegureu-vos que teniu instal·lada la versió de PHP 5.3.3 o posterior, i que teniu l'extensió OpenSSL PHP activada i configurada correctament. Per ara, l'aplicació de xifrat esta desactivada."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat."
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Els usuaris següents no estan configurats per a l'encriptació:"
#: js/settings-admin.js:11
msgid "Saving..."
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 90e87e11497..04c76283088 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index 0acc94e33cc..6e08a5ad522 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/files_trashbin.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-08-01 01:55-0400\n"
-"PO-Revision-Date: 2013-07-31 07:38+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\n"
+"PO-Revision-Date: 2013-08-21 16:01+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"
@@ -52,21 +52,17 @@ msgstr "Nom"
msgid "Deleted"
msgstr "Eliminat"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 carpeta"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} carpetes"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 fitxer"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} fitxers"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] "%n carpetes"
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] "%n fitxers"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 375cbe8cb50..b2bb669e052 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\n"
+"PO-Revision-Date: 2013-08-21 15:50+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Usuaris"
#: app.php:409
-msgid "Apps"
-msgstr "Aplicacions"
-
-#: app.php:417
msgid "Admin"
msgstr "Administració"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Ha fallat l'actualització \"%s\"."
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr "Baixeu els fitxers en trossos petits, de forma separada, o pregunteu a l'administrador."
-#: helper.php:235
-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"
@@ -211,50 +203,46 @@ msgid "seconds ago"
msgstr "segons enrere"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "fa 1 minut"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "fa %n minut"
+msgstr[1] "fa %n minuts"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "fa %d minuts"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "fa %n hora"
+msgstr[1] "fa %n hores"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "fa 1 hora"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "fa %d hores"
-
-#: template/functions.php:85
msgid "today"
msgstr "avui"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "ahir"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "fa %d dies"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] "fa %n dia"
+msgstr[1] "fa %n dies"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "el mes passat"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "fa %d mesos"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "fa %n mes"
+msgstr[1] "fa %n mesos"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "l'any passat"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "anys enrere"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 7c7dd8f5c20..c80ac76c2dd 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\n"
+"PO-Revision-Date: 2013-08-21 15:40+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -122,7 +122,11 @@ msgstr "Error en actualitzar l'aplicació"
msgid "Updated"
msgstr "Actualitzada"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Desencriptant fitxers... Espereu, això pot trigar una estona."
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Desant..."
@@ -143,31 +147,31 @@ msgstr "No s'ha pogut eliminar l'usuari"
msgid "Groups"
msgstr "Grups"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Grup Admin"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Esborra"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "afegeix grup"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Heu de facilitar un nom d'usuari vàlid"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Error en crear l'usuari"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Heu de facilitar una contrasenya vàlida"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Català"
@@ -238,106 +242,106 @@ msgstr "Aquest servidor no té cap connexió a internet que funcioni. Això sign
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Executa una tasca per cada paquet carregat"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php està registrat en un servei webcron que fa una crida cada minut a la pàgina cron.php a través de http."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "Utilitzeu el sistema de servei cron per cridar el fitxer cron.php cada minut."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Compartir"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Habilita l'API de compartir"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Permet que les aplicacions utilitzin l'API de compartir"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Permet enllaços"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Permet als usuaris compartir elements amb el públic amb enllaços"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Permet pujada pública"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Permet als usuaris habilitar pujades de tercers en les seves carpetes compartides al públic"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Permet compartir de nou"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Permet als usuaris compartir de nou elements ja compartits amb ells"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Permet compartir amb qualsevol"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Permet als usuaris compartir només amb els usuaris del seu grup"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Seguretat"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Força HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Força la connexió dels clients a %s a través d'una connexió encriptada."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Connecteu a %s a través de HTTPS per habilitar o inhabilitar l'accés SSL."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Registre"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Nivell de registre"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Més"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Menys"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versió"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Useu aquesta adreça per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedir als fitxers via WebDAV</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Xifrat"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers."
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr "Contrasenya d'accés"
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr "Desencripta tots els fitxers"
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Nom d'accés"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 3e800ac6559..8c6b13494d9 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -155,198 +155,185 @@ msgstr "Filtre d'inici de sessió d'usuari"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Llista de filtres d'usuari"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Defineix el filtre a aplicar quan es mostren usuaris"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=persona\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Filtre de grup"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Defineix el filtre a aplicar quan es mostren grups."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Arranjaments de connexió"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Configuració activa"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Si està desmarcat, aquesta configuració s'ometrà."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Màquina de còpia de serguretat (rèplica)"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Afegiu una màquina de còpia de seguretat opcional. Ha de ser una rèplica del servidor LDAP/AD principal."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Port de la còpia de seguretat (rèplica)"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Desactiva el servidor principal"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr "Connecta només al servidor rèplica."
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Usa TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "No ho useu adicionalment per a conexions LDAPS, fallarà."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Desactiva la validació de certificat SSL."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor %s."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "No recomanat, ús només per proves."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Memòria de cau Time-To-Live"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "en segons. Un canvi buidarà la memòria de cau."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Arranjaments de carpetes"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Camp per mostrar el nom d'usuari"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr "Atribut LDAP a usar per generar el nom a mostrar de l'usuari."
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Arbre base d'usuaris"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Una DN Base d'Usuari per línia"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Atributs de cerca d'usuari"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Opcional; Un atribut per línia"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Camp per mostrar el nom del grup"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr "Atribut LDAP a usar per generar el nom a mostrar del grup."
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Arbre base de grups"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Una DN Base de Grup per línia"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Atributs de cerca de grup"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Associació membres-grup"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Atributs especials"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Camp de quota"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Quota per defecte"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Camp de correu electrònic"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Norma per anomenar la carpeta arrel d'usuari"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Nom d'usuari intern"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Per defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els caràcters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els caràcters: [ a-zA-Z0-9_.@- ]. Els altres caràcters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home d'usuari. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits)."
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Atribut nom d'usuari intern:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Sobrescriu la detecció UUID"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran als usuaris i grups LDAP mapats de nou (afegits)."
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "Atribut UUID:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Mapatge d'usuari Nom d'usuari-LDAP"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
"experimental stage."
msgstr "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria de cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental."
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Elimina el mapatge d'usuari Nom d'usuari-LDAP"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Elimina el mapatge de grup Nom de grup-LDAP"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Comprovació de la configuració"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index c93521744cd..37ee596b324 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# janinko <janinko.g@gmail.com>, 2013
# Honza K. <honza889@gmail.com>, 2013
# Martin <fireball@atlas.cz>, 2013
# pstast <petr@stastny.eu>, 2013
@@ -11,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Martin <fireball@atlas.cz>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -141,59 +142,63 @@ msgstr "Listopad"
msgid "December"
msgstr "Prosinec"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Nastavení"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "před pár vteřinami"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "před minutou"
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "před {minutes} minutami"
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "před hodinou"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "před {hours} hodinami"
-
-#: js/js.js:758
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "před %n minutou"
+msgstr[1] "před %n minutami"
+msgstr[2] "před %n minutami"
+
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "před %n hodinou"
+msgstr[1] "před %n hodinami"
+msgstr[2] "před %n hodinami"
+
+#: js/js.js:815
msgid "today"
msgstr "dnes"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "včera"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "před {days} dny"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "před %n dnem"
+msgstr[1] "před %n dny"
+msgstr[2] "před %n dny"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "minulý měsíc"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "před {months} měsíci"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "před %n měsícem"
+msgstr[1] "před %n měsíci"
+msgstr[2] "před %n měsíci"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "před měsíci"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "před lety"
@@ -201,23 +206,19 @@ msgstr "před lety"
msgid "Choose"
msgstr "Vybrat"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Chyba při načítání šablony výběru souborů"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Ano"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ok"
@@ -381,9 +382,10 @@ msgstr "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a hre
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizace byla úspěšná. Přesměrovávám na ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Obnovení hesla pro ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "reset hesla %s"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -582,6 +584,10 @@ msgstr "%s je dostupná. Získejte více informací k postupu aktualizace."
msgid "Log out"
msgstr "Odhlásit se"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Více aplikací"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatické přihlášení odmítnuto!"
@@ -619,14 +625,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Ahoj,<br><br>jenom vám chci oznámit, že %s s vámi sdílí %s.\nPodívat se můžete <br><a href=\"%s\">zde</a>.<br><br>Díky"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "předchozí"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "následující"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 884be157805..a83237e41fc 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -4,15 +4,16 @@
#
# Translators:
# Honza K. <honza889@gmail.com>, 2013
+# cvanca <mrs.jenkins.oh.yeah@gmail.com>, 2013
# pstast <petr@stastny.eu>, 2013
# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-20 15:51+0000\n"
+"Last-Translator: cvanca <mrs.jenkins.oh.yeah@gmail.com>\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"
@@ -97,21 +98,21 @@ msgstr "Nedostatek volného místa"
msgid "Upload cancelled."
msgstr "Odesílání zrušeno."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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 způsobí zrušení nahrávání."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:234 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL nemůže být prázdná."
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:239 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Chyba"
@@ -123,15 +124,11 @@ msgstr "Sdílet"
msgid "Delete permanently"
msgstr "Trvale odstranit"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Smazat"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Přejmenovat"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Nevyřízené"
@@ -159,15 +156,14 @@ msgstr "nahrazeno {new_name} s {old_name}"
msgid "undo"
msgstr "vrátit zpět"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "provést smazání"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "Nahrávám %n soubor"
+msgstr[1] "Nahrávám %n soubory"
+msgstr[2] "Nahrávám %n souborů"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "odesílá se 1 soubor"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "soubory se odesílají"
@@ -193,43 +189,47 @@ msgstr "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubo
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Vaše úložiště je téměř plné ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr "Šifrování bylo zrušeno, soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde si složky odšifrujete."
+
+#: js/files.js:245
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:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Neplatný název složky. Pojmenování 'Shared' je rezervováno pro vnitřní potřeby ownCloud"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Název"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Velikost"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Upraveno"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 složka"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n složka"
+msgstr[1] "%n složky"
+msgstr[2] "%n složek"
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} složek"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 soubor"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} souborů"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n soubor"
+msgstr[1] "%n soubory"
+msgstr[2] "%n souborů"
#: lib/app.php:73
#, php-format
@@ -312,6 +312,10 @@ msgstr "Stáhnout"
msgid "Unshare"
msgstr "Zrušit sdílení"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Smazat"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Odesílaný soubor je příliš velký"
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 7503bf0db72..ffbcfd39418 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# janinko <janinko.g@gmail.com>, 2013
# Honza K. <honza889@gmail.com>, 2013
# Martin <fireball@atlas.cz>, 2013
# pstast <petr@stastny.eu>, 2013
@@ -11,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-05 18:40+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
"Last-Translator: pstast <petr@stastny.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -65,18 +66,18 @@ msgid ""
"files."
msgstr "Váš soukromý klíč není platný! Pravděpodobně bylo heslo změněno vně systému ownCloud (např. ve vašem firemním adresáři). Heslo vašeho soukromého klíče můžete změnit ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Nesplněné závislosti."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Ujistěte se prosím, že máte nainstalované PHP verze PHP 5.3.3 či novější s nainstalovaným a správně nastaveným rozšířením OpenSSL. Prozatím byla šifrovací aplikace zablokována."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr "Ujistěte se prosím, že máte nainstalované PHP 5.3.3 nebo novější a že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Prozatím byla aplikace pro šifrování vypnuta."
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr "Následující uživatelé nemají nastavené šifrování:"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index a6be32abb2f..58fe5480946 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: pstast <petr@stastny.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index 54d822655f8..9294025f67d 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/files_trashbin.po
@@ -4,13 +4,14 @@
#
# Translators:
# Honza K. <honza889@gmail.com>, 2013
+# pstast <petr@stastny.eu>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-02 01:56-0400\n"
-"PO-Revision-Date: 2013-08-01 18:20+0000\n"
-"Last-Translator: Honza K. <honza889@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-16 09:20+0000\n"
+"Last-Translator: pstast <petr@stastny.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"
@@ -52,21 +53,19 @@ msgstr "Název"
msgid "Deleted"
msgstr "Smazáno"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 složka"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} složky"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 soubor"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} soubory"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n adresář"
+msgstr[1] "%n adresáře"
+msgstr[2] "%n adresářů"
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n soubor"
+msgstr[1] "%n soubory"
+msgstr[2] "%n souborů"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index b1ed4bcc88f..bff662e4570 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.po
@@ -4,13 +4,14 @@
#
# Translators:
# Honza K. <honza889@gmail.com>, 2013
+# pstast <petr@stastny.eu>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-29 18:50+0000\n"
-"Last-Translator: Honza K. <honza889@gmail.com>\n"
+"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"PO-Revision-Date: 2013-08-15 18:50+0000\n"
+"Last-Translator: pstast <petr@stastny.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"
@@ -21,7 +22,7 @@ msgstr ""
#: ajax/rollbackVersion.php:13
#, php-format
msgid "Could not revert: %s"
-msgstr "Nelze navrátit: %s"
+msgstr "Nelze vrátit: %s"
#: js/versions.js:7
msgid "Versions"
@@ -29,7 +30,7 @@ msgstr "Verze"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr "Selhalo navrácení souboru {file} na verzi {timestamp}."
+msgstr "Selhalo vrácení souboru {file} na verzi {timestamp}."
#: js/versions.js:79
msgid "More versions..."
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index f6b76bfe8e0..8c710f73a51 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/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: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-05 18:00+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -37,14 +37,10 @@ msgid "Users"
msgstr "Uživatelé"
#: app.php:409
-msgid "Apps"
-msgstr "Aplikace"
-
-#: app.php:417
msgid "Admin"
msgstr "Administrace"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Selhala aktualizace verze \"%s\"."
@@ -80,10 +76,6 @@ msgid ""
"administrator."
msgstr "Stáhněte soubory po menších částech, samostatně, nebo se obraťte na správce."
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "nelze zjistit"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Aplikace není povolena"
@@ -213,50 +205,50 @@ msgid "seconds ago"
msgstr "před pár sekundami"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "před minutou"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "před %n minutou"
+msgstr[1] "před %n minutami"
+msgstr[2] "před %n minutami"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "před %d minutami"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "před %n hodinou"
+msgstr[1] "před %n hodinami"
+msgstr[2] "před %n hodinami"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "před hodinou"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "před %d hodinami"
-
-#: template/functions.php:85
msgid "today"
msgstr "dnes"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "včera"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "před %d dny"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] "před %n dnem"
+msgstr[1] "před %n dny"
+msgstr[2] "před %n dny"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "minulý měsíc"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "před %d měsíci"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "před %n měsícem"
+msgstr[1] "před %n měsíci"
+msgstr[2] "před %n měsíci"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "minulý rok"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "před lety"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 8280e1eea43..a514ea68075 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -4,15 +4,16 @@
#
# Translators:
# Honza K. <honza889@gmail.com>, 2013
+# cvanca <mrs.jenkins.oh.yeah@gmail.com>, 2013
# pstast <petr@stastny.eu>, 2013
# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-06 18:03+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\n"
+"PO-Revision-Date: 2013-08-22 14:00+0000\n"
+"Last-Translator: cvanca <mrs.jenkins.oh.yeah@gmail.com>\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"
@@ -123,7 +124,11 @@ msgstr "Chyba při aktualizaci aplikace"
msgid "Updated"
msgstr "Aktualizováno"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Probíhá odšifrování souborů... Prosíme počkejte, tato operace může trvat několik minut."
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Ukládám..."
@@ -144,31 +149,31 @@ msgstr "Nelze odebrat uživatele"
msgid "Groups"
msgstr "Skupiny"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Správa skupiny"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Smazat"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "přidat skupinu"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Musíte zadat platné uživatelské jméno"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Chyba při vytváření užiatele"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Musíte zadat platné heslo"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Česky"
@@ -239,106 +244,106 @@ msgstr "Server nemá funkční připojení k internetu. Některé moduly jako na
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Spustit jednu úlohu s každým načtením stránky"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php je registrován u služby webcron pro zavolání stránky cron.php jednou za minutu přes HTTP."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "Použít systémovou službu cron pro spouštění souboru cron.php jednou za minutu."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Sdílení"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Povolit API sdílení"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Povolit aplikacím používat API sdílení"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Povolit odkazy"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Povolit uživatelům sdílet položky veřejně pomocí odkazů"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Povolit veřejné nahrávání souborů"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Povolit uživatelům, aby mohli ostatním umožnit nahrávat do jejich veřejně sdílené složky"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Povolit znovu-sdílení"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Povolit uživatelům znovu sdílet položky, které jsou pro ně sdíleny"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Povolit uživatelům sdílet s kýmkoliv"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Povolit uživatelům sdílet pouze s uživateli v jejich skupinách"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Zabezpečení"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Vynutit HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Vynutí připojování klientů k %s šifrovaným spojením."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Připojte se k %s skrze HTTPS pro povolení nebo zakázání vynucování SSL."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Záznam"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Úroveň zaznamenávání"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Více"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Méně"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Verze"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -468,6 +473,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Použijte <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Šifrování"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr "Šifrovací aplikace již není spuštěna, odšifrujte všechny své soubory"
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr "Heslo"
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr "Odšifrovat všechny soubory"
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Přihlašovací jméno"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 4d59267bf10..6245bd4e833 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -4,14 +4,16 @@
#
# Translators:
# Honza K. <honza889@gmail.com>, 2013
+# cvanca <mrs.jenkins.oh.yeah@gmail.com>, 2013
+# pstast <petr@stastny.eu>, 2013
# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: Honza K. <honza889@gmail.com>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 17:00+0000\n"
+"Last-Translator: cvanca <mrs.jenkins.oh.yeah@gmail.com>\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"
@@ -41,15 +43,15 @@ msgstr "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím,
msgid ""
"The configuration is invalid. Please look in the ownCloud log for further "
"details."
-msgstr "Nastavení je neplatné. Zkontrolujte, prosím, záznam ownCloud pro další podrobnosti."
+msgstr "Nastavení je neplatné. Zkontrolujte, prosím, záznamy ownCloud pro další podrobnosti."
#: js/settings.js:66
msgid "Deletion failed"
-msgstr "Mazání selhalo."
+msgstr "Mazání selhalo"
#: js/settings.js:82
msgid "Take over settings from recent server configuration?"
-msgstr "Převzít nastavení z nedávného nastavení serveru?"
+msgstr "Převzít nastavení z nedávné konfigurace serveru?"
#: js/settings.js:83
msgid "Keep settings?"
@@ -98,7 +100,7 @@ msgstr "<b>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně
msgid ""
"<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."
+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:16
msgid "Server configuration"
@@ -138,7 +140,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 "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é."
+msgstr "DN klientského uživatele, ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte DN a heslo prázdné."
#: templates/settings.php:47
msgid "Password"
@@ -146,7 +148,7 @@ msgstr "Heslo"
#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
-msgstr "Pro anonymní přístup, ponechte údaje DN and heslo prázdné."
+msgstr "Pro anonymní přístup ponechte údaje DN and heslo prázdné."
#: templates/settings.php:51
msgid "User Login Filter"
@@ -156,198 +158,185 @@ msgstr "Filtr přihlášení uživatelů"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad \"uid=%%uid\""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "použijte zástupný vzor %%uid, např. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
-msgstr "Filtr uživatelských seznamů"
+msgstr "Filtr seznamu uživatelů"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Určuje použitý filtr, pro získávaní uživatelů."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "bez zástupných znaků, např. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr "Určuje použitý filtr pro získávaní uživatelů (bez zástupných znaků). Příklad: \"objectClass=person\""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Filtr skupin"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Určuje použitý filtr, pro získávaní skupin."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "bez zástupných znaků, např. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr "Určuje použitý filtr, pro získávaní skupin (bez zástupných znaků). Příklad: \"objectClass=posixGroup\""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Nastavení spojení"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Nastavení aktivní"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
-msgstr "Pokud není zaškrtnuto, bude nastavení přeskočeno."
+msgstr "Pokud není zaškrtnuto, bude toto nastavení přeskočeno."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Záložní (kopie) hostitel"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Zadejte volitelného záložního hostitele. Musí to být kopie hlavního serveru LDAP/AD."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Záložní (kopie) port"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
-msgstr "Zakázat hlavní serveru"
+msgstr "Zakázat hlavní server"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
-msgstr "Připojit jen k replikujícímu serveru."
+msgstr "Připojit jen k záložnímu serveru."
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Použít TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr "Nepoužívejte pro spojení LDAP, selže."
+msgstr "Nepoužívejte v kombinaci s LDAPS spojením, nebude to fungovat."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server nerozlišující velikost znaků (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Vypnout ověřování SSL certifikátu."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Pokud spojení funguje jen s touto volbou, importujte SSL certifikát vašeho LDAP serveru na server %s."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Není doporučeno, pouze pro testovací účely."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr "Nedoporučuje se, určeno pouze k testovacímu použití. Pokud spojení funguje jen s touto volbou, importujte SSL certifikát vašeho LDAP serveru na server %s."
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "TTL vyrovnávací paměti"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
-msgstr "ve vteřinách. Změna vyprázdní vyrovnávací paměť."
+msgstr "v sekundách. Změna vyprázdní vyrovnávací paměť."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Nastavení adresáře"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Pole zobrazovaného jména uživatele"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr "LDAP atribut použitý k vytvoření zobrazovaného jména uživatele."
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Základní uživatelský strom"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Jedna uživatelská základní DN na řádku"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Atributy vyhledávání uživatelů"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
-msgstr "Volitelné, atribut na řádku"
+msgstr "Volitelné, jeden atribut na řádku"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Pole zobrazovaného jména skupiny"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr "LDAP atribut použitý k vytvoření zobrazovaného jména skupiny."
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Základní skupinový strom"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Jedna skupinová základní DN na řádku"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Atributy vyhledávání skupin"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Asociace člena skupiny"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Speciální atributy"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Pole pro kvótu"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Výchozí kvóta"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "v bajtech"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Pole e-mailu"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Pravidlo pojmenování domovské složky uživatele"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Interní uživatelské jméno"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,17 +350,17 @@ msgid ""
"behavior as before ownCloud 5 enter the user display name attribute in the "
"following field. Leave it empty for default behavior. Changes will have "
"effect only on newly mapped (added) LDAP users."
-msgstr "Ve výchozím nastavení bude uživatelské jméno vytvořeno z UUID atributu. To zajistí unikátnost uživatelského jména bez potřeby konverze znaků. Interní uživatelské jméno je omezena na znaky: [ a-zA-Z0-9_.@- ]. Ostatní znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduše vynechány. V případě kolize uživatelských jmen bude přidáno/navýšeno číslo. Interní uživatelské jméno je používáno k interní identifikaci uživatele. Je také výchozím názvem uživatelského domovského adresáře. Je také součástí URL pro vzdálený přístup, například všech *DAV služeb. S tímto nastavením bude výchozí chování přepsáno. Pro dosažení podobného chování jako před ownCloudem 5 uveďte atribut zobrazovaného jména do pole níže. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele z LDAP."
+msgstr "Ve výchozím nastavení bude uživatelské jméno vytvořeno z UUID atributu. To zajistí unikátnost uživatelského jména a není potřeba provádět konverzi znaků. Interní uživatelské jméno je omezeno na znaky: [ a-zA-Z0-9_.@- ]. Ostatní znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduše vynechány. V případě kolize uživatelských jmen bude přidáno/navýšeno číslo. Interní uživatelské jméno je používáno k interní identifikaci uživatele. Je také výchozím názvem uživatelského domovského adresáře. Je také součástí URL pro vzdálený přístup, například všech *DAV služeb. S tímto nastavením může být výchozí chování změněno. Pro dosažení podobného chování jako před ownCloudem 5 uveďte atribut zobrazovaného jména do pole níže. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele z LDAP."
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Atribut interního uživatelského jména:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Nastavit ručně UUID atribut"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,17 +369,17 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behavior. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut který sami zvolíte. Musíte se ale ujistit že atribut který vyberete bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP."
+msgstr "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut, který sami zvolíte. Musíte se ale ujistit, že atribut, který vyberete, bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP."
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "Atribut UUID:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Mapování uživatelských jmen z LDAPu"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,20 +391,20 @@ msgid ""
" is not configuration sensitive, it affects all LDAP configurations! Never "
"clear the mappings in a production environment, only in a testing or "
"experimental stage."
-msgstr "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To je nezbytné pro mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro reprodukci interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi."
+msgstr "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To vyžaduje mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro zmenšení interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Interní uživatelské jméno se používá celé. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi."
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Zrušit mapování uživatelských jmen LDAPu"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Zrušit mapování názvů skupin LDAPu"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Vyzkoušet nastavení"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Nápověda"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index b75d8da4b7a..f9b74a7649e 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -138,59 +138,67 @@ msgstr "Tachwedd"
msgid "December"
msgstr "Rhagfyr"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Gosodiadau"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "eiliad yn ôl"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 munud yn ôl"
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} munud yn ôl"
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 awr yn ôl"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} awr yn ôl"
-
-#: js/js.js:758
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/js.js:815
msgid "today"
msgstr "heddiw"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "ddoe"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} diwrnod yn ôl"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "mis diwethaf"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} mis yn ôl"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "misoedd yn ôl"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "y llynedd"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "blwyddyn yn ôl"
@@ -198,23 +206,19 @@ msgstr "blwyddyn yn ôl"
msgid "Choose"
msgstr "Dewisiwch"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Diddymu"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Ie"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Na"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Iawn"
@@ -378,9 +382,10 @@ msgstr "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ailosod cyfrinair ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -579,6 +584,10 @@ msgstr "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru."
msgid "Log out"
msgstr "Allgofnodi"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Gwrthodwyd mewngofnodi awtomatig!"
@@ -616,14 +625,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "blaenorol"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "nesaf"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 82a3b9b7382..a5c216a5355 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr "Dim digon o le ar gael"
msgid "Upload cancelled."
msgstr "Diddymwyd llwytho i fyny."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "Does dim hawl cael URL gwag."
@@ -107,8 +107,8 @@ msgstr "Does dim hawl cael URL gwag."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Gwall"
@@ -120,15 +120,11 @@ msgstr "Rhannu"
msgid "Delete permanently"
msgstr "Dileu'n barhaol"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Dileu"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Ailenwi"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "I ddod"
@@ -156,15 +152,15 @@ msgstr "newidiwyd {new_name} yn lle {old_name}"
msgid "undo"
msgstr "dadwneud"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "cyflawni gweithred dileu"
-
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 ffeil yn llwytho i fyny"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "ffeiliau'n llwytho i fyny"
@@ -190,43 +186,49 @@ msgstr "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Enw plygell annilys. Mae'r defnydd o 'Shared' yn cael ei gadw gan Owncloud"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Enw"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Maint"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Addaswyd"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 blygell"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} plygell"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 ffeil"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} ffeil"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +311,10 @@ msgstr "Llwytho i lawr"
msgid "Unshare"
msgstr "Dad-rannu"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Dileu"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Maint llwytho i fyny'n rhy fawr"
diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po
index 1883952f1c0..9a63fede82d 100644
--- a/l10n/cy_GB/files_encryption.po
+++ b/l10n/cy_GB/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -62,18 +62,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index 6c8d5f69531..40a26ec13c0 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index c28b0ab60ff..b9b366cf636 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,21 @@ msgstr "Enw"
msgid "Deleted"
msgstr "Wedi dileu"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 blygell"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} plygell"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 ffeil"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} ffeil"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index 3a0c1d26921..e0aa60f01d3 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Defnyddwyr"
#: app.php:409
-msgid "Apps"
-msgstr "Pecynnau"
-
-#: app.php:417
msgid "Admin"
msgstr "Gweinyddu"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "methwyd pennu"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Nid yw'r pecyn wedi'i alluogi"
@@ -210,50 +202,54 @@ msgid "seconds ago"
msgstr "eiliad yn ôl"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 munud yn ôl"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d munud yn ôl"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 awr yn ôl"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d awr yn ôl"
-
-#: template/functions.php:85
msgid "today"
msgstr "heddiw"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "ddoe"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d diwrnod yn ôl"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "mis diwethaf"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d mis yn ôl"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "y llynedd"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "blwyddyn yn ôl"
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index 51945aaba68..ed67da103cf 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Yn cadw..."
@@ -141,31 +145,31 @@ msgstr ""
msgid "Groups"
msgstr "Grwpiau"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Dileu"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr ""
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr ""
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Amgryptiad"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 1ba76b9843b..a42f865fb36 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Cymorth"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index d75738c26d3..4f224cbacac 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -4,15 +4,16 @@
#
# Translators:
# Sappe, 2013
+# claus_chr <claus_chr@webspeed.dk>, 2013
# Ole Holm Frandsen <froksen@gmail.com>, 2013
# Peter Jespersen <flywheeldk@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -140,59 +141,59 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Indstillinger"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 minut siden"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n minut siden"
+msgstr[1] "%n minutter siden"
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minutter siden"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n time siden"
+msgstr[1] "%n timer siden"
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 time siden"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} timer siden"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "i dag"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "i går"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} dage siden"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "%n dag siden"
+msgstr[1] "%n dage siden"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "sidste måned"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} måneder siden"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n måned siden"
+msgstr[1] "%n måneder siden"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "måneder siden"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "sidste år"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "år siden"
@@ -200,23 +201,19 @@ msgstr "år siden"
msgid "Choose"
msgstr "Vælg"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Annuller"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Fejl ved indlæsning af filvælger skabelon"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nej"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "OK"
@@ -380,9 +377,10 @@ msgstr "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Nulstil ownCloud kodeord"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "%s adgangskode nulstillet"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -414,7 +412,7 @@ msgid ""
"will be no way to get your data back after your password is reset. If you "
"are not sure what to do, please contact your administrator before you "
"continue. Do you really want to continue?"
-msgstr ""
+msgstr "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?"
#: lostpassword/templates/lostpassword.php:24
msgid "Yes, I really want to reset my password now"
@@ -477,7 +475,7 @@ msgid ""
"View it: %s\n"
"\n"
"Cheers!"
-msgstr ""
+msgstr "Hallo\n\ndette blot for at lade dig vide, at %s har delt %s med dig.\nSe det: %s\n\nHej"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
@@ -524,7 +522,7 @@ msgstr "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -581,6 +579,10 @@ msgstr "%s er tilgængelig. Få mere information om, hvordan du opdaterer."
msgid "Log out"
msgstr "Log ud"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Flere programmer"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatisk login afvist!"
@@ -616,15 +618,7 @@ msgstr "Alternative logins"
msgid ""
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
"href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
-
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "forrige"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "næste"
+msgstr "Hallo,<br><br>dette blot for at lade dig vide, at %s har delt \"%s\" med dig.<br><a href=\"%s\">Se det!</a><br><br>Hej"
#: templates/update.php:3
#, php-format
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 50449474ba0..e043bee154c 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -4,13 +4,14 @@
#
# Translators:
# Sappe, 2013
+# claus_chr <claus_chr@webspeed.dk>, 2013
# Ole Holm Frandsen <froksen@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-20 19:40+0000\n"
"Last-Translator: Sappe\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -96,21 +97,21 @@ msgstr "ikke nok tilgængelig ledig plads "
msgid "Upload cancelled."
msgstr "Upload afbrudt."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:234 js/files.js:353
msgid "URL cannot be empty."
msgstr "URLen kan ikke være tom."
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:239 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Fejl"
@@ -122,15 +123,11 @@ msgstr "Del"
msgid "Delete permanently"
msgstr "Slet permanent"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Slet"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Omdøb"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Afventer"
@@ -158,15 +155,13 @@ msgstr "erstattede {new_name} med {old_name}"
msgid "undo"
msgstr "fortryd"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "udfør slet operation"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "Uploader %n fil"
+msgstr[1] "Uploader %n filer"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 fil uploades"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "uploader filer"
@@ -192,43 +187,45 @@ msgstr "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkron
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. "
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Navn"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Størrelse"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Ændret"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 mappe"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n mappe"
+msgstr[1] "%n mapper"
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} mapper"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
#: lib/app.php:73
#, php-format
@@ -311,6 +308,10 @@ msgstr "Download"
msgid "Unshare"
msgstr "Fjern deling"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Slet"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Upload er for stor"
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index f9c1880e0e0..aef21e07adb 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -4,13 +4,14 @@
#
# Translators:
# Sappe, 2013
+# claus_chr <claus_chr@webspeed.dk>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
+"Last-Translator: claus_chr <claus_chr@webspeed.dk>\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"
@@ -62,20 +63,20 @@ msgid ""
"files."
msgstr "Din private nøgle er gyldig! Sandsynligvis blev dit kodeord ændre uden for ownCloud systemet (f.eks. dit firmas register). Du kan opdatere dit private nøgle kodeord under personlige indstillinger, for at generhverve adgang til dine krypterede filer."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Manglende betingelser."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Sikker dig venligst at PHP 5.3.3 eller nyere er installeret og at OpenSSL PHP udvidelsen er aktiveret og konfigureret korrekt. Indtil videre er krypterings app'en deaktiveret. "
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret."
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Følgende brugere er ikke sat op til kryptering:"
#: js/settings-admin.js:11
msgid "Saving..."
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 6ce42eb608a..a6dc9237e08 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: Sappe\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 1306af5b495..3f0098ca862 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -4,13 +4,14 @@
#
# Translators:
# Sappe, 2013
+# claus_chr <claus_chr@webspeed.dk>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-01 01:55-0400\n"
-"PO-Revision-Date: 2013-07-31 10:51+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"PO-Revision-Date: 2013-08-16 05:00+0000\n"
+"Last-Translator: claus_chr <claus_chr@webspeed.dk>\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"
@@ -52,21 +53,17 @@ msgstr "Navn"
msgid "Deleted"
msgstr "Slettet"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 mappe"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} mapper"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n mappe"
+msgstr[1] "%n mapper"
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 2f0661d9448..95d0d373d80 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -4,14 +4,15 @@
#
# Translators:
# Sappe, 2013
+# claus_chr <claus_chr@webspeed.dk>, 2013
# Ole Holm Frandsen <froksen@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -36,14 +37,10 @@ msgid "Users"
msgstr "Brugere"
#: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Upgradering af \"%s\" fejlede"
@@ -79,10 +76,6 @@ msgid ""
"administrator."
msgstr "Download filerne i små bider, seperat, eller kontakt venligst din administrator."
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "kunne ikke fastslås"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Programmet er ikke aktiveret"
@@ -212,50 +205,46 @@ msgid "seconds ago"
msgstr "sekunder siden"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 minut siden"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n minut siden"
+msgstr[1] "%n minutter siden"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minutter siden"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n time siden"
+msgstr[1] "%n timer siden"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 time siden"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d timer siden"
-
-#: template/functions.php:85
msgid "today"
msgstr "i dag"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "i går"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d dage siden"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] "%n dag siden"
+msgstr[1] "%n dage siden"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "sidste måned"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d måneder siden"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n måned siden"
+msgstr[1] "%n måneder siden"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "sidste år"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "år siden"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index c56fa461d3b..b43c939dde1 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 19:40+0000\n"
"Last-Translator: Sappe\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -123,7 +123,11 @@ msgstr "Der opstod en fejl under app opgraderingen"
msgid "Updated"
msgstr "Opdateret"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Dekryptere filer... Vent venligst, dette kan tage lang tid. "
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Gemmer..."
@@ -144,31 +148,31 @@ msgstr "Kan ikke fjerne bruger"
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Gruppe Administrator"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Slet"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "Tilføj gruppe"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Et gyldigt brugernavn skal angives"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Fejl ved oprettelse af bruger"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "En gyldig adgangskode skal angives"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Dansk"
@@ -239,106 +243,106 @@ msgstr "Denne ownCloud-server har ikke en fungerende forbindelse til internettet
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Udføre en opgave med hver side indlæst"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php er registeret hos en webcron-tjeneste til at kalde cron.php en gang i minuttet over http."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "Brug systemets cron service til at kalde cron.php filen en gang i minuttet"
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Deling"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Aktiver Share API"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Tillad apps til at bruge Share API"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Tillad links"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Tillad brugere at dele elementer til offentligheden med links"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Tillad offentlig upload"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Tillad brugere at give andre mulighed for at uploade i deres offentligt delte mapper"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Tillad videredeling"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Tillad brugere at dele elementer delt med dem igen"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Tillad brugere at dele med alle"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Tillad brugere at kun dele med brugerne i deres grupper"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Sikkerhed"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Gennemtving HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Tving klienten til at forbinde til %s via en kryptetet forbindelse."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Log"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Log niveau"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Mere"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Version"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -468,6 +472,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Anvend denne adresse til at <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tilgå dine filer via WebDAV</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr "Krypterings app'en er ikke længere aktiv. Dekrypter alle dine filer. "
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr "Log-in kodeord"
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr "Dekrypter alle Filer "
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Loginnavn"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index e9b0f6b6c09..0882b5d0a80 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -155,198 +155,185 @@ msgstr "Bruger Login Filter"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Brugerliste Filter"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definere filteret der bruges ved indlæsning af brugere."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Uden stedfortræder, f.eks. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Gruppe Filter"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definere filteret der bruges når der indlæses grupper."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "Uden stedfortræder, f.eks. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Forbindelsesindstillinger "
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Konfiguration Aktiv"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Backup (Replika) Vært"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Backup (Replika) Port"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Deaktiver Hovedserver"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr "Forbind kun til replika serveren."
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Brug TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Benyt ikke flere LDAPS forbindelser, det vil mislykkeds. "
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Deaktiver SSL certifikat validering"
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Anbefales ikke, brug kun for at teste."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "User Display Name Field"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Base Bruger Træ"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Base Group Tree"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Group-Member association"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Email Felt"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Internt Brugernavn"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Test Konfiguration"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Hjælp"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index aeff36e75a7..707d01e384e 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -4,6 +4,7 @@
#
# Translators:
# arkascha <foss@christian-reiner.info>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2013
# Marcel Kühlhorn <susefan93@gmx.de>, 2013
# Mario Siegmann <mario_siegmann@web.de>, 2013
# JamFX <niko@nik-o-mat.de>, 2013
@@ -14,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -144,59 +145,59 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "vor einer Minute"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "Vor %n Minute"
+msgstr[1] "Vor %n Minuten"
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "Vor {minutes} Minuten"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "Vor %n Stunde"
+msgstr[1] "Vor %n Stunden"
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "Vor einer Stunde"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "Vor {hours} Stunden"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "Heute"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "Vor {days} Tag(en)"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "Vor %n Tag"
+msgstr[1] "Vor %n Tagen"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "Vor {months} Monaten"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "Vor %n Monat"
+msgstr[1] "Vor %n Monaten"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "Vor Jahren"
@@ -204,23 +205,19 @@ msgstr "Vor Jahren"
msgid "Choose"
msgstr "Auswählen"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Dateiauswahltemplate konnte nicht geladen werden"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "OK"
@@ -384,9 +381,10 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud-Passwort zurücksetzen"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "%s-Passwort zurücksetzen"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -585,6 +583,10 @@ msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen e
msgid "Log out"
msgstr "Abmelden"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Mehr Apps"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatischer Login zurückgewiesen!"
@@ -622,14 +624,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Hallo,<br/><br/>wollte dich nur kurz informieren, dass %s gerade %s mit dir geteilt hat.<br/><a href=\"%s\">Schau es dir an.</a><br/><br/>Gruß!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "Zurück"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "Weiter"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/de/files.po b/l10n/de/files.po
index c1f8c4726d4..d1a6526c482 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -3,7 +3,9 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# I Robot <owncloud-bot@tmit.eu>, 2013
# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
# ninov <ninovdl@ymail.com>, 2013
# Pwnicorn <pwnicorndev@gmail.com>, 2013
# kabum <uu.kabum@gmail.com>, 2013
@@ -11,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-20 12:40+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -98,21 +100,21 @@ msgstr "Nicht genug Speicherplatz verfügbar"
msgid "Upload cancelled."
msgstr "Upload abgebrochen."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:234 js/files.js:353
msgid "URL cannot be empty."
msgstr "Die URL darf nicht leer sein."
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:239 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Fehler"
@@ -124,15 +126,11 @@ msgstr "Teilen"
msgid "Delete permanently"
msgstr "Endgültig löschen"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Löschen"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Umbenennen"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Ausstehend"
@@ -160,15 +158,13 @@ msgstr "{old_name} ersetzt durch {new_name}"
msgid "undo"
msgstr "rückgängig machen"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "Löschvorgang ausführen"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "%n Datei wird hochgeladen"
+msgstr[1] "%n Dateien werden hochgeladen"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 Datei wird hochgeladen"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "Dateien werden hoch geladen"
@@ -194,43 +190,45 @@ msgstr "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert od
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Dein Speicher ist fast voll ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind deine Dateien nach wie vor verschlüsselt. Bitte gehe zu deinen persönlichen Einstellungen, um deine Dateien zu entschlüsseln."
+
+#: js/files.js:245
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:344
+#: js/files.js:358
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:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Name"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Größe"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Geändert"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 Ordner"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n Ordner"
+msgstr[1] "%n Ordner"
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} Ordner"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 Datei"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} Dateien"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n Datei"
+msgstr[1] "%n Dateien"
#: lib/app.php:73
#, php-format
@@ -313,6 +311,10 @@ msgstr "Herunterladen"
msgid "Unshare"
msgstr "Freigabe aufheben"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Löschen"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Der Upload ist zu groß"
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index 2162f985814..fbe536c708a 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -5,6 +5,7 @@
# Translators:
# iLennart21 <a12s34d56f78@live.com>, 2013
# Stephan Köninger <mail@stekoe.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
# ninov <ninovdl@ymail.com>, 2013
# Pwnicorn <pwnicorndev@gmail.com>, 2013
# thillux, 2013
@@ -13,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-04 18:40+0000\n"
-"Last-Translator: thillux\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -67,18 +68,18 @@ msgid ""
"files."
msgstr "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Dein Passwort geändert (z.B. in deinem gemeinsamen Verzeichnis). Du kannst das Passwort deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an deine Dateien zu gelangen."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Fehlende Vorraussetzungen"
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert ist und die OpenSSL-PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung wurde vorerst deaktiviert."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert."
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index a8263e4c718..656a195b2f7 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index e18f6c8e8c8..4d78f4aabd3 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.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-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 16:42+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"PO-Revision-Date: 2013-08-15 09:10+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -52,21 +52,17 @@ msgstr "Name"
msgid "Deleted"
msgstr "gelöscht"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 Ordner"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} Ordner"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 Datei"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} Dateien"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] "%n Ordner"
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] "%n Dateien"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 109207a62fc..e1661944825 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -37,14 +37,10 @@ msgid "Users"
msgstr "Benutzer"
#: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
msgid "Admin"
msgstr "Administration"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Konnte \"%s\" nicht aktualisieren."
@@ -80,10 +76,6 @@ msgid ""
"administrator."
msgstr "Lade die Dateien in kleineren, separaten, Stücken herunter oder bitte deinen Administrator."
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "konnte nicht festgestellt werden"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Die Anwendung ist nicht aktiviert"
@@ -213,50 +205,46 @@ msgid "seconds ago"
msgstr "Gerade eben"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "vor einer Minute"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] "Vor %n Minuten"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "Vor %d Minuten"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] "Vor %n Stunden"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "Vor einer Stunde"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "Vor %d Stunden"
-
-#: template/functions.php:85
msgid "today"
msgstr "Heute"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "Gestern"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "Vor %d Tag(en)"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] "Vor %n Tagen"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "Letzten Monat"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "Vor %d Monaten"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] "Vor %n Monaten"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "Letztes Jahr"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "Vor Jahren"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 73764b744ad..2398da2d95f 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 12:50+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -125,7 +125,11 @@ msgstr "Fehler beim Aktualisieren der App"
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen."
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Speichern..."
@@ -146,31 +150,31 @@ msgstr "Benutzer konnte nicht entfernt werden."
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Gruppenadministrator"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Löschen"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "Gruppe hinzufügen"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Es muss ein gültiger Benutzername angegeben werden"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Deutsch (Persönlich)"
@@ -241,106 +245,106 @@ msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeute
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Führe eine Aufgabe mit jeder geladenen Seite aus"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php ist als Webcron-Dienst registriert, der die cron.php minütlich per HTTP aufruft."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "Benutze den System-Crondienst um die cron.php minütlich aufzurufen."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Teilen"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Aktiviere Sharing-API"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Erlaubt Apps die Nutzung der Share-API"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Erlaubt Links"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Öffentliches Hochladen erlauben"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Erlaubt erneutes Teilen"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Erlaubt Benutzern, mit jedem zu teilen"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Sicherheit"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Erzwinge HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Log"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Loglevel"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Mehr"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Version"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -470,6 +474,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt."
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr "Login-Passwort"
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr "Alle Dateien entschlüsseln"
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Loginname"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index a845eb3066f..36a8e317413 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 12:50+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -158,198 +158,185 @@ msgstr "Benutzer-Login-Filter"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Benutzer-Filter-Liste"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definiert den Filter für die Anfrage der Benutzer."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr "Definiert den Filter für die Wiederherstellung eines Benutzers (kein Platzhalter). Beispiel: \"objectClass=person\""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Gruppen-Filter"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definiert den Filter für die Anfrage der Gruppen."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr "Definiert den Filter für die Wiederherstellung einer Gruppe (kein Platzhalter). Beispiel: \"objectClass=posixGroup\""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Verbindungseinstellungen"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Konfiguration aktiv"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Konfiguration wird übersprungen wenn deaktiviert"
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Backup Host (Kopie)"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Backup Port"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Hauptserver deaktivieren"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr "Nur zum Replikat-Server verbinden."
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Nutze TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Schalte die SSL-Zertifikatsprüfung aus."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nicht empfohlen, nur zu Testzwecken."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server."
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Speichere Time-To-Live zwischen"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "in Sekunden. Eine Änderung leert den Cache."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Ordnereinstellungen"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Feld für den Anzeigenamen des Benutzers"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers."
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Basis-Benutzerbaum"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Ein Benutzer Basis-DN pro Zeile"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Benutzersucheigenschaften"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Optional; ein Attribut pro Zeile"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Feld für den Anzeigenamen der Gruppe"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen."
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Basis-Gruppenbaum"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Ein Gruppen Basis-DN pro Zeile"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Gruppensucheigenschaften"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Assoziation zwischen Gruppe und Benutzer"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Spezielle Eigenschaften"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Kontingent Feld"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Standard Kontingent"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "in Bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "E-Mail Feld"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Interner Benutzername"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -365,15 +352,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Attribut für interne Benutzernamen:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "UUID-Erkennung überschreiben"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -384,15 +371,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Standardmäßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Du musst allerdings sicherstellen, dass deine gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lasse es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "UUID-Attribut:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "LDAP-Benutzernamenzuordnung"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -406,18 +393,18 @@ msgid ""
"experimental stage."
msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung."
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Lösche LDAP-Benutzernamenzuordnung"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Lösche LDAP-Gruppennamenzuordnung"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Testkonfiguration"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Hilfe"
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index 26a530d9eeb..d26af5c3d7b 100644
--- a/l10n/de_AT/core.po
+++ b/l10n/de_AT/core.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# I Robot <owncloud-bot@tmit.eu>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -137,59 +138,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr ""
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +198,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -377,8 +374,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -578,6 +576,10 @@ msgstr ""
msgid "Log out"
msgstr ""
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Mehr Apps"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +617,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po
index 8b21b5f1692..5f0e9fd18a3 100644
--- a/l10n/de_AT/files.po
+++ b/l10n/de_AT/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,15 +120,11 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr ""
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr ""
msgid "Unshare"
msgstr ""
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
#: templates/index.php:105
msgid "Upload too large"
msgstr ""
diff --git a/l10n/de_AT/files_encryption.po b/l10n/de_AT/files_encryption.po
index 1da0538316b..59daa54beab 100644
--- a/l10n/de_AT/files_encryption.po
+++ b/l10n/de_AT/files_encryption.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/de_AT/files_trashbin.po b/l10n/de_AT/files_trashbin.po
index 12c2585e9cb..a05dc1411b2 100644
--- a/l10n/de_AT/files_trashbin.po
+++ b/l10n/de_AT/files_trashbin.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,17 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/de_AT/lib.po b/l10n/de_AT/lib.po
index 39a75daeadf..f4911a0682a 100644
--- a/l10n/de_AT/lib.po
+++ b/l10n/de_AT/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: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr ""
#: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
msgid "Admin"
msgstr ""
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po
index 97a2d199c8e..d21b2d2b2b1 100644
--- a/l10n/de_AT/settings.po
+++ b/l10n/de_AT/settings.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/de_AT/user_ldap.po b/l10n/de_AT/user_ldap.po
index 2affcc0727d..affcff22fbe 100644
--- a/l10n/de_AT/user_ldap.po
+++ b/l10n/de_AT/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: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr ""
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index 4553d2f9585..deacb1c3c4c 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -3,12 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# arkascha <foss@christian-reiner.info>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# Mirodin <blobbyjj@ymail.com>, 2013
+# SteinQuadrat, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -20,207 +28,203 @@ msgstr ""
#: ajax/share.php:97
#, php-format
msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s teilt »%s« mit Ihnen"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
-msgstr ""
+msgstr "Kategorie nicht angegeben."
#: ajax/vcategories/add.php:30
msgid "No category to add?"
-msgstr ""
+msgstr "Keine Kategorie hinzuzufügen?"
#: ajax/vcategories/add.php:37
#, php-format
msgid "This category already exists: %s"
-msgstr ""
+msgstr "Die nachfolgende Kategorie existiert bereits: %s"
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
#: ajax/vcategories/removeFromFavorites.php:26
msgid "Object type not provided."
-msgstr ""
+msgstr "Objekttyp nicht angegeben."
#: ajax/vcategories/addToFavorites.php:30
#: ajax/vcategories/removeFromFavorites.php:30
#, php-format
msgid "%s ID not provided."
-msgstr ""
+msgstr "%s ID nicht angegeben."
#: ajax/vcategories/addToFavorites.php:35
#, php-format
msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Fehler beim Hinzufügen von %s zu den Favoriten."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Es wurden keine Kategorien zum Löschen ausgewählt."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Fehler beim Entfernen von %s von den Favoriten."
#: js/config.php:32
msgid "Sunday"
-msgstr ""
+msgstr "Sonntag"
#: js/config.php:33
msgid "Monday"
-msgstr ""
+msgstr "Montag"
#: js/config.php:34
msgid "Tuesday"
-msgstr ""
+msgstr "Dienstag"
#: js/config.php:35
msgid "Wednesday"
-msgstr ""
+msgstr "Mittwoch"
#: js/config.php:36
msgid "Thursday"
-msgstr ""
+msgstr "Donnerstag"
#: js/config.php:37
msgid "Friday"
-msgstr ""
+msgstr "Freitag"
#: js/config.php:38
msgid "Saturday"
-msgstr ""
+msgstr "Samstag"
#: js/config.php:43
msgid "January"
-msgstr ""
+msgstr "Januar"
#: js/config.php:44
msgid "February"
-msgstr ""
+msgstr "Februar"
#: js/config.php:45
msgid "March"
-msgstr ""
+msgstr "März"
#: js/config.php:46
msgid "April"
-msgstr ""
+msgstr "April"
#: js/config.php:47
msgid "May"
-msgstr ""
+msgstr "Mai"
#: js/config.php:48
msgid "June"
-msgstr ""
+msgstr "Juni"
#: js/config.php:49
msgid "July"
-msgstr ""
+msgstr "Juli"
#: js/config.php:50
msgid "August"
-msgstr ""
+msgstr "August"
#: js/config.php:51
msgid "September"
-msgstr ""
+msgstr "September"
#: js/config.php:52
msgid "October"
-msgstr ""
+msgstr "Oktober"
#: js/config.php:53
msgid "November"
-msgstr ""
+msgstr "November"
#: js/config.php:54
msgid "December"
-msgstr ""
+msgstr "Dezember"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
-msgstr ""
+msgstr "Einstellungen"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
-msgstr ""
+msgstr "Gerade eben"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
-msgstr ""
+msgstr "Heute"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
-msgstr ""
+msgstr "Gestern"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
-msgstr ""
+msgstr "Letzten Monat"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
-msgstr ""
+msgstr "Vor Monaten"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
-msgstr ""
+msgstr "Letztes Jahr"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
-msgstr ""
+msgstr "Vor Jahren"
#: js/oc-dialogs.js:117
msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
+msgstr "Auswählen"
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
-msgstr ""
+msgstr "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten."
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
-msgstr ""
+msgstr "Ja"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
-msgstr ""
+msgstr "Nein"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
-msgstr ""
+msgstr "OK"
#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
msgid "The object type is not specified."
-msgstr ""
+msgstr "Der Objekttyp ist nicht angegeben."
#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
@@ -228,182 +232,183 @@ msgstr ""
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
#: js/share.js:643 js/share.js:655
msgid "Error"
-msgstr ""
+msgstr "Fehler"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
-msgstr ""
+msgstr "Der App-Name ist nicht angegeben."
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "Die benötigte Datei {file} ist nicht installiert!"
#: js/share.js:30 js/share.js:45 js/share.js:87
msgid "Shared"
-msgstr ""
+msgstr "Geteilt"
#: js/share.js:90
msgid "Share"
-msgstr ""
+msgstr "Teilen"
#: js/share.js:131 js/share.js:683
msgid "Error while sharing"
-msgstr ""
+msgstr "Fehler beim Teilen"
#: js/share.js:142
msgid "Error while unsharing"
-msgstr ""
+msgstr "Fehler beim Aufheben der Freigabe"
#: js/share.js:149
msgid "Error while changing permissions"
-msgstr ""
+msgstr "Fehler bei der Änderung der Rechte"
#: js/share.js:158
msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
#: js/share.js:160
msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Von {owner} mit Ihnen geteilt."
#: js/share.js:183
msgid "Share with"
-msgstr ""
+msgstr "Teilen mit"
#: js/share.js:188
msgid "Share with link"
-msgstr ""
+msgstr "Über einen Link teilen"
#: js/share.js:191
msgid "Password protect"
-msgstr ""
+msgstr "Passwortschutz"
#: js/share.js:193 templates/installation.php:57 templates/login.php:26
msgid "Password"
-msgstr ""
+msgstr "Passwort"
#: js/share.js:198
msgid "Allow Public Upload"
-msgstr ""
+msgstr "Öffentliches Hochladen erlauben"
#: js/share.js:202
msgid "Email link to person"
-msgstr ""
+msgstr "Link per E-Mail verschicken"
#: js/share.js:203
msgid "Send"
-msgstr ""
+msgstr "Senden"
#: js/share.js:208
msgid "Set expiration date"
-msgstr ""
+msgstr "Ein Ablaufdatum setzen"
#: js/share.js:209
msgid "Expiration date"
-msgstr ""
+msgstr "Ablaufdatum"
#: js/share.js:241
msgid "Share via email:"
-msgstr ""
+msgstr "Mittels einer E-Mail teilen:"
#: js/share.js:243
msgid "No people found"
-msgstr ""
+msgstr "Niemand gefunden"
#: js/share.js:281
msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Das Weiterverteilen ist nicht erlaubt"
#: js/share.js:317
msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Freigegeben in {item} von {user}"
#: js/share.js:338
msgid "Unshare"
-msgstr ""
+msgstr "Freigabe aufheben"
#: js/share.js:350
msgid "can edit"
-msgstr ""
+msgstr "kann bearbeiten"
#: js/share.js:352
msgid "access control"
-msgstr ""
+msgstr "Zugriffskontrolle"
#: js/share.js:355
msgid "create"
-msgstr ""
+msgstr "erstellen"
#: js/share.js:358
msgid "update"
-msgstr ""
+msgstr "aktualisieren"
#: js/share.js:361
msgid "delete"
-msgstr ""
+msgstr "löschen"
#: js/share.js:364
msgid "share"
-msgstr ""
+msgstr "teilen"
#: js/share.js:398 js/share.js:630
msgid "Password protected"
-msgstr ""
+msgstr "Passwortgeschützt"
#: js/share.js:643
msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Fehler beim Entfernen des Ablaufdatums"
#: js/share.js:655
msgid "Error setting expiration date"
-msgstr ""
+msgstr "Fehler beim Setzen des Ablaufdatums"
#: js/share.js:670
msgid "Sending ..."
-msgstr ""
+msgstr "Sende ..."
#: js/share.js:681
msgid "Email sent"
-msgstr ""
+msgstr "Email gesendet"
#: js/update.js:17
msgid ""
"The update was unsuccessful. Please report this issue to the <a "
"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
"community</a>."
-msgstr ""
+msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
#: js/update.js:21
msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}"
#: lostpassword/templates/lostpassword.php:4
msgid ""
"The link to reset your password has been sent to your email.<br>If you do "
"not receive it within a reasonable amount of time, check your spam/junk "
"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen Zeitspanne erhalten, prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator."
#: lostpassword/templates/lostpassword.php:12
msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?"
#: lostpassword/templates/lostpassword.php:15
msgid "You will receive a link to reset your password via Email."
-msgstr ""
+msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen."
#: lostpassword/templates/lostpassword.php:18 templates/installation.php:51
#: templates/login.php:19
msgid "Username"
-msgstr ""
+msgstr "Benutzername"
#: lostpassword/templates/lostpassword.php:22
msgid ""
@@ -411,59 +416,59 @@ msgid ""
"will be no way to get your data back after your password is reset. If you "
"are not sure what to do, please contact your administrator before you "
"continue. Do you really want to continue?"
-msgstr ""
+msgstr "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?"
#: lostpassword/templates/lostpassword.php:24
msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen."
#: lostpassword/templates/lostpassword.php:27
msgid "Request reset"
-msgstr ""
+msgstr "Zurücksetzung anfordern"
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
-msgstr ""
+msgstr "Ihr Passwort wurde zurückgesetzt."
#: lostpassword/templates/resetpassword.php:5
msgid "To login page"
-msgstr ""
+msgstr "Zur Login-Seite"
#: lostpassword/templates/resetpassword.php:8
msgid "New password"
-msgstr ""
+msgstr "Neues Passwort"
#: lostpassword/templates/resetpassword.php:11
msgid "Reset password"
-msgstr ""
+msgstr "Passwort zurücksetzen"
#: strings.php:5
msgid "Personal"
-msgstr ""
+msgstr "Persönlich"
#: strings.php:6
msgid "Users"
-msgstr ""
+msgstr "Benutzer"
#: strings.php:7
msgid "Apps"
-msgstr ""
+msgstr "Apps"
#: strings.php:8
msgid "Admin"
-msgstr ""
+msgstr "Administrator"
#: strings.php:9
msgid "Help"
-msgstr ""
+msgstr "Hilfe"
#: templates/403.php:12
msgid "Access forbidden"
-msgstr ""
+msgstr "Zugriff verboten"
#: templates/404.php:15
msgid "Cloud not found"
-msgstr ""
+msgstr "Cloud wurde nicht gefunden"
#: templates/altmail.php:2
#, php-format
@@ -474,156 +479,152 @@ msgid ""
"View it: %s\n"
"\n"
"Cheers!"
-msgstr ""
+msgstr "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\nViele Grüsse!"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr ""
+msgstr "Kategorien ändern"
#: templates/edit_categories_dialog.php:16
msgid "Add"
-msgstr ""
+msgstr "Hinzufügen"
#: templates/installation.php:24 templates/installation.php:31
#: templates/installation.php:38
msgid "Security Warning"
-msgstr ""
+msgstr "Sicherheitshinweis"
#: templates/installation.php:25
msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar"
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können."
#: templates/installation.php:32
msgid ""
"No secure random number generator is available, please enable the PHP "
"OpenSSL extension."
-msgstr ""
+msgstr "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL."
#: templates/installation.php:33
msgid ""
"Without a secure random number generator an attacker may be able to predict "
"password reset tokens and take over your account."
-msgstr ""
+msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Ihr Konto zu übernehmen."
#: templates/installation.php:39
msgid ""
"Your data directory and files are probably accessible from the internet "
"because the .htaccess file does not work."
-msgstr ""
+msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
#: templates/installation.php:41
#, php-format
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "<strong>Administrator-Konto</strong> anlegen"
#: templates/installation.php:65
msgid "Advanced"
-msgstr ""
+msgstr "Fortgeschritten"
#: templates/installation.php:67
msgid "Data folder"
-msgstr ""
+msgstr "Datenverzeichnis"
#: templates/installation.php:77
msgid "Configure the database"
-msgstr ""
+msgstr "Datenbank einrichten"
#: templates/installation.php:82 templates/installation.php:94
#: templates/installation.php:105 templates/installation.php:116
#: templates/installation.php:128
msgid "will be used"
-msgstr ""
+msgstr "wird verwendet"
#: templates/installation.php:140
msgid "Database user"
-msgstr ""
+msgstr "Datenbank-Benutzer"
#: templates/installation.php:147
msgid "Database password"
-msgstr ""
+msgstr "Datenbank-Passwort"
#: templates/installation.php:152
msgid "Database name"
-msgstr ""
+msgstr "Datenbank-Name"
#: templates/installation.php:160
msgid "Database tablespace"
-msgstr ""
+msgstr "Datenbank-Tablespace"
#: templates/installation.php:167
msgid "Database host"
-msgstr ""
+msgstr "Datenbank-Host"
#: templates/installation.php:175
msgid "Finish setup"
-msgstr ""
+msgstr "Installation abschliessen"
#: templates/layout.user.php:41
#, php-format
msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
#: templates/layout.user.php:66
msgid "Log out"
-msgstr ""
+msgstr "Abmelden"
+
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Mehr Apps"
#: templates/login.php:9
msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Automatische Anmeldung verweigert!"
#: templates/login.php:10
msgid ""
"If you did not change your password recently, your account may be "
"compromised!"
-msgstr ""
+msgstr "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!"
#: templates/login.php:12
msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern."
#: templates/login.php:34
msgid "Lost your password?"
-msgstr ""
+msgstr "Passwort vergessen?"
#: templates/login.php:39
msgid "remember"
-msgstr ""
+msgstr "merken"
#: templates/login.php:41
msgid "Log in"
-msgstr ""
+msgstr "Einloggen"
#: templates/login.php:47
msgid "Alternative Logins"
-msgstr ""
+msgstr "Alternative Logins"
#: templates/mail.php:15
#, php-format
msgid ""
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
"href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
-
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
+msgstr "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüsse!"
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index 5025406758b..8befee513b7 100644
--- a/l10n/de_CH/files.po
+++ b/l10n/de_CH/files.po
@@ -3,12 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# a.tangemann <a.tangemann@web.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2013
+# kabum <uu.kabum@gmail.com>, 2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# Mirodin <blobbyjj@ymail.com>, 2013
+# SteinQuadrat, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -20,329 +28,329 @@ msgstr ""
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits."
#: ajax/move.php:27 ajax/move.php:30
#, php-format
msgid "Could not move %s"
-msgstr ""
+msgstr "Konnte %s nicht verschieben"
#: ajax/upload.php:16 ajax/upload.php:45
msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Das Upload-Verzeichnis konnte nicht gesetzt werden."
#: ajax/upload.php:22
msgid "Invalid Token"
-msgstr ""
+msgstr "Ungültiges Merkmal"
#: ajax/upload.php:59
msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
#: ajax/upload.php:66
msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
#: ajax/upload.php:67
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini"
#: ajax/upload.php:69
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr ""
+msgstr "Die Datei ist grösser, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist"
#: ajax/upload.php:70
msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Die Datei konnte nur teilweise übertragen werden"
#: ajax/upload.php:71
msgid "No file was uploaded"
-msgstr ""
+msgstr "Keine Datei konnte übertragen werden."
#: ajax/upload.php:72
msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Kein temporärer Ordner vorhanden"
#: ajax/upload.php:73
msgid "Failed to write to disk"
-msgstr ""
+msgstr "Fehler beim Schreiben auf die Festplatte"
#: ajax/upload.php:91
msgid "Not enough storage available"
-msgstr ""
+msgstr "Nicht genug Speicher vorhanden."
#: ajax/upload.php:123
msgid "Invalid directory."
-msgstr ""
+msgstr "Ungültiges Verzeichnis."
#: appinfo/app.php:12
msgid "Files"
-msgstr ""
+msgstr "Dateien"
#: js/file-upload.js:11
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes gross ist."
#: js/file-upload.js:24
msgid "Not enough space available"
-msgstr ""
+msgstr "Nicht genügend Speicherplatz verfügbar"
#: js/file-upload.js:64
msgid "Upload cancelled."
-msgstr ""
+msgstr "Upload abgebrochen."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
-msgstr ""
+msgstr "Die URL darf nicht leer sein."
#: js/file-upload.js:238 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Ungültiger Ordnername. Die Verwendung von «Shared» ist ownCloud vorbehalten."
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
-msgstr ""
+msgstr "Fehler"
#: js/fileactions.js:116
msgid "Share"
-msgstr ""
+msgstr "Teilen"
#: js/fileactions.js:126
msgid "Delete permanently"
-msgstr ""
-
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr ""
+msgstr "Endgültig löschen"
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
-msgstr ""
+msgstr "Umbenennen"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
-msgstr ""
+msgstr "Ausstehend"
#: js/filelist.js:303 js/filelist.js:305
msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} existiert bereits"
#: js/filelist.js:303 js/filelist.js:305
msgid "replace"
-msgstr ""
+msgstr "ersetzen"
#: js/filelist.js:303
msgid "suggest name"
-msgstr ""
+msgstr "Namen vorschlagen"
#: js/filelist.js:303 js/filelist.js:305
msgid "cancel"
-msgstr ""
+msgstr "abbrechen"
#: js/filelist.js:350
msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "{old_name} wurde ersetzt durch {new_name}"
#: js/filelist.js:350
msgid "undo"
-msgstr ""
-
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+msgstr "rückgängig machen"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
-msgstr ""
+msgstr "Dateien werden hoch geladen"
#: js/files.js:52
msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' ist kein gültiger Dateiname."
#: js/files.js:56
msgid "File name cannot be empty."
-msgstr ""
+msgstr "Der Dateiname darf nicht leer sein."
#: js/files.js:64
msgid ""
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
"allowed."
-msgstr ""
+msgstr "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig."
#: js/files.js:78
msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
#: js/files.js:82
msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
+
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
msgstr ""
-#: js/files.js:231
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
-msgstr ""
+msgstr "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Ungültiger Verzeichnisname. Die Nutzung von «Shared» ist ownCloud vorbehalten"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
-msgstr ""
+msgstr "Name"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
-msgstr ""
+msgstr "Grösse"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
-msgstr ""
+msgstr "Geändert"
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s konnte nicht umbenannt werden"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
-msgstr ""
+msgstr "Hochladen"
#: templates/admin.php:5
msgid "File handling"
-msgstr ""
+msgstr "Dateibehandlung"
#: templates/admin.php:7
msgid "Maximum upload size"
-msgstr ""
+msgstr "Maximale Upload-Grösse"
#: templates/admin.php:10
msgid "max. possible: "
-msgstr ""
+msgstr "maximal möglich:"
#: templates/admin.php:15
msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Für Mehrfachdatei- und Ordnerdownloads benötigt:"
#: templates/admin.php:17
msgid "Enable ZIP-download"
-msgstr ""
+msgstr "ZIP-Download aktivieren"
#: templates/admin.php:20
msgid "0 is unlimited"
-msgstr ""
+msgstr "0 bedeutet unbegrenzt"
#: templates/admin.php:22
msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Maximale Grösse für ZIP-Dateien"
#: templates/admin.php:26
msgid "Save"
-msgstr ""
+msgstr "Speichern"
#: templates/index.php:7
msgid "New"
-msgstr ""
+msgstr "Neu"
#: templates/index.php:10
msgid "Text file"
-msgstr ""
+msgstr "Textdatei"
#: templates/index.php:12
msgid "Folder"
-msgstr ""
+msgstr "Ordner"
#: templates/index.php:14
msgid "From link"
-msgstr ""
+msgstr "Von einem Link"
#: templates/index.php:41
msgid "Deleted files"
-msgstr ""
+msgstr "Gelöschte Dateien"
#: templates/index.php:46
msgid "Cancel upload"
-msgstr ""
+msgstr "Upload abbrechen"
#: templates/index.php:52
msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Sie haben hier keine Schreib-Berechtigungen."
#: templates/index.php:59
msgid "Nothing in here. Upload something!"
-msgstr ""
+msgstr "Alles leer. Laden Sie etwas hoch!"
#: templates/index.php:73
msgid "Download"
-msgstr ""
+msgstr "Herunterladen"
#: templates/index.php:85 templates/index.php:86
msgid "Unshare"
-msgstr ""
+msgstr "Freigabe aufheben"
+
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Löschen"
#: templates/index.php:105
msgid "Upload too large"
-msgstr ""
+msgstr "Der Upload ist zu gross"
#: templates/index.php:107
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
-msgstr ""
+msgstr "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server."
#: templates/index.php:112
msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Dateien werden gescannt, bitte warten."
#: templates/index.php:115
msgid "Current scanning"
-msgstr ""
+msgstr "Scanne"
#: templates/part.list.php:74
msgid "directory"
-msgstr ""
+msgstr "Verzeichnis"
#: templates/part.list.php:76
msgid "directories"
-msgstr ""
+msgstr "Verzeichnisse"
#: templates/part.list.php:85
msgid "file"
-msgstr ""
+msgstr "Datei"
#: templates/part.list.php:87
msgid "files"
-msgstr ""
+msgstr "Dateien"
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de_CH/files_encryption.po b/l10n/de_CH/files_encryption.po
index b4d122cb00a..ccf349afd9f 100644
--- a/l10n/de_CH/files_encryption.po
+++ b/l10n/de_CH/files_encryption.po
@@ -3,12 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# ako84 <a0306265@unet.univie.ac.at>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
+# JamFX <niko@nik-o-mat.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -19,39 +24,39 @@ msgstr ""
#: ajax/adminrecovery.php:29
msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert."
#: ajax/adminrecovery.php:34
msgid ""
"Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!"
#: ajax/adminrecovery.php:48
msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert."
#: ajax/adminrecovery.php:53
msgid ""
"Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!"
#: ajax/changeRecoveryPassword.php:49
msgid "Password successfully changed."
-msgstr ""
+msgstr "Das Passwort wurde erfolgreich geändert."
#: ajax/changeRecoveryPassword.php:51
msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
+msgstr "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig."
#: ajax/updatePrivateKeyPassword.php:51
msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert."
#: ajax/updatePrivateKeyPassword.php:53
msgid ""
"Could not update the private key password. Maybe the old password was not "
"correct."
-msgstr ""
+msgstr "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig."
#: files/error.php:7
msgid ""
@@ -59,118 +64,118 @@ msgid ""
"ownCloud system (e.g. your corporate directory). You can update your private"
" key password in your personal settings to recover access to your encrypted "
"files."
-msgstr ""
+msgstr "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von ausserhalb Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
-msgstr ""
+msgstr "Fehlende Voraussetzungen"
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
#: js/settings-admin.js:11
msgid "Saving..."
-msgstr ""
+msgstr "Speichern..."
#: templates/invalid_private_key.php:5
msgid ""
"Your private key is not valid! Maybe the your password was changed from "
"outside."
-msgstr ""
+msgstr "Ihr privater Schlüssel ist ungültig! Vielleicht wurde Ihr Passwort von ausserhalb geändert."
#: templates/invalid_private_key.php:7
msgid "You can unlock your private key in your "
-msgstr ""
+msgstr "Sie können den privaten Schlüssel ändern und zwar in Ihrem"
#: templates/invalid_private_key.php:7
msgid "personal settings"
-msgstr ""
+msgstr "Persönliche Einstellungen"
#: templates/settings-admin.php:5 templates/settings-personal.php:4
msgid "Encryption"
-msgstr ""
+msgstr "Verschlüsselung"
#: templates/settings-admin.php:10
msgid ""
"Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht)."
#: templates/settings-admin.php:14
msgid "Recovery key password"
-msgstr ""
+msgstr "Wiederherstellungschlüsselpasswort"
#: templates/settings-admin.php:21 templates/settings-personal.php:54
msgid "Enabled"
-msgstr ""
+msgstr "Aktiviert"
#: templates/settings-admin.php:29 templates/settings-personal.php:62
msgid "Disabled"
-msgstr ""
+msgstr "Deaktiviert"
#: templates/settings-admin.php:34
msgid "Change recovery key password:"
-msgstr ""
+msgstr "Wiederherstellungsschlüsselpasswort ändern"
#: templates/settings-admin.php:41
msgid "Old Recovery key password"
-msgstr ""
+msgstr "Altes Wiederherstellungsschlüsselpasswort"
#: templates/settings-admin.php:48
msgid "New Recovery key password"
-msgstr ""
+msgstr "Neues Wiederherstellungsschlüsselpasswort "
#: templates/settings-admin.php:53
msgid "Change Password"
-msgstr ""
+msgstr "Passwort ändern"
#: templates/settings-personal.php:11
msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen."
#: templates/settings-personal.php:14
msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Setzen Sie Ihr altes Privatschlüsselpasswort auf Ihr aktuelles LogIn-Passwort."
#: templates/settings-personal.php:16
msgid ""
" If you don't remember your old password you can ask your administrator to "
"recover your files."
-msgstr ""
+msgstr "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen."
#: templates/settings-personal.php:24
msgid "Old log-in password"
-msgstr ""
+msgstr "Altes Login-Passwort"
#: templates/settings-personal.php:30
msgid "Current log-in password"
-msgstr ""
+msgstr "Momentanes Login-Passwort"
#: templates/settings-personal.php:35
msgid "Update Private Key Password"
-msgstr ""
+msgstr "Das Passwort des privaten Schlüssels aktualisieren"
#: templates/settings-personal.php:45
msgid "Enable password recovery:"
-msgstr ""
+msgstr "Die Passwort-Wiederherstellung aktivieren:"
#: templates/settings-personal.php:47
msgid ""
"Enabling this option will allow you to reobtain access to your encrypted "
"files in case of password loss"
-msgstr ""
+msgstr "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
#: templates/settings-personal.php:63
msgid "File recovery settings updated"
-msgstr ""
+msgstr "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert."
#: templates/settings-personal.php:64
msgid "Could not update file recovery"
-msgstr ""
+msgstr "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
diff --git a/l10n/de_CH/files_external.po b/l10n/de_CH/files_external.po
index 2b551874ba5..8d124a52de5 100644
--- a/l10n/de_CH/files_external.po
+++ b/l10n/de_CH/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# FlorianScholz <work@bgstyle.de>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-07 14:02+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,105 +20,105 @@ msgstr ""
#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
msgid "Access granted"
-msgstr ""
+msgstr "Zugriff gestattet"
#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
msgid "Error configuring Dropbox storage"
-msgstr ""
+msgstr "Fehler beim Einrichten von Dropbox"
#: js/dropbox.js:65 js/google.js:86
msgid "Grant access"
-msgstr ""
+msgstr "Zugriff gestatten"
#: js/dropbox.js:101
msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein."
#: js/google.js:42 js/google.js:121
msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Fehler beim Einrichten von Google Drive"
#: lib/config.php:448
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>Warnung:</b> «smbclient» ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren."
#: lib/config.php:451
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>Warnung::</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator."
#: lib/config.php:454
msgid ""
"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
"your system administrator to install it."
-msgstr ""
+msgstr "<b>Achtung:</b> Die Curl-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Laden von ownCloud / WebDAV oder GoogleDrive Freigaben ist nicht möglich. Bitte Sie Ihren Systemadministrator, das Modul zu installieren."
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Externer Speicher"
#: templates/settings.php:9 templates/settings.php:28
msgid "Folder name"
-msgstr ""
+msgstr "Ordnername"
#: templates/settings.php:10
msgid "External storage"
-msgstr ""
+msgstr "Externer Speicher"
#: templates/settings.php:11
msgid "Configuration"
-msgstr ""
+msgstr "Konfiguration"
#: templates/settings.php:12
msgid "Options"
-msgstr ""
+msgstr "Optionen"
#: templates/settings.php:13
msgid "Applicable"
-msgstr ""
+msgstr "Zutreffend"
#: templates/settings.php:33
msgid "Add storage"
-msgstr ""
+msgstr "Speicher hinzufügen"
#: templates/settings.php:90
msgid "None set"
-msgstr ""
+msgstr "Nicht definiert"
#: templates/settings.php:91
msgid "All Users"
-msgstr ""
+msgstr "Alle Benutzer"
#: templates/settings.php:92
msgid "Groups"
-msgstr ""
+msgstr "Gruppen"
#: templates/settings.php:100
msgid "Users"
-msgstr ""
+msgstr "Benutzer"
#: templates/settings.php:113 templates/settings.php:114
#: templates/settings.php:149 templates/settings.php:150
msgid "Delete"
-msgstr ""
+msgstr "Löschen"
#: templates/settings.php:129
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Externen Speicher für Benutzer aktivieren"
#: templates/settings.php:130
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Erlaubt Benutzern, ihre eigenen externen Speicher einzubinden"
#: templates/settings.php:141
msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL-Root-Zertifikate"
#: templates/settings.php:159
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de_CH/files_sharing.po b/l10n/de_CH/files_sharing.po
index e2c77260498..95b2c5d60fc 100644
--- a/l10n/de_CH/files_sharing.po
+++ b/l10n/de_CH/files_sharing.po
@@ -3,13 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# FlorianScholz <work@bgstyle.de>, 2013
+# JamFX <niko@nik-o-mat.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,62 +22,62 @@ msgstr ""
#: templates/authenticate.php:4
msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Das Passwort ist falsch. Bitte versuchen Sie es erneut."
#: templates/authenticate.php:7
msgid "Password"
-msgstr ""
+msgstr "Passwort"
#: templates/authenticate.php:9
msgid "Submit"
-msgstr ""
+msgstr "Bestätigen"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Gründe könnten sein:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "Das Element wurde entfernt"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "Der Link ist abgelaufen"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "Teilen ist deaktiviert"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat."
#: templates/public.php:15
#, php-format
msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s hat den Ordner %s mit Ihnen geteilt"
#: templates/public.php:18
#, php-format
msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s hat die Datei %s mit Ihnen geteilt"
#: templates/public.php:26 templates/public.php:88
msgid "Download"
-msgstr ""
+msgstr "Herunterladen"
#: templates/public.php:43 templates/public.php:46
msgid "Upload"
-msgstr ""
+msgstr "Hochladen"
#: templates/public.php:56
msgid "Cancel upload"
-msgstr ""
+msgstr "Upload abbrechen"
#: templates/public.php:85
msgid "No preview available for"
-msgstr ""
+msgstr "Es ist keine Vorschau verfügbar für"
diff --git a/l10n/de_CH/files_trashbin.po b/l10n/de_CH/files_trashbin.po
index ebd2ca003f3..1d80e2f4371 100644
--- a/l10n/de_CH/files_trashbin.po
+++ b/l10n/de_CH/files_trashbin.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# FlorianScholz <work@bgstyle.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -20,69 +22,65 @@ msgstr ""
#: ajax/delete.php:42
#, php-format
msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "Konnte %s nicht dauerhaft löschen"
#: ajax/undelete.php:42
#, php-format
msgid "Couldn't restore %s"
-msgstr ""
+msgstr "Konnte %s nicht wiederherstellen"
#: js/trash.js:7 js/trash.js:100
msgid "perform restore operation"
-msgstr ""
+msgstr "Wiederherstellung ausführen"
#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
msgid "Error"
-msgstr ""
+msgstr "Fehler"
#: js/trash.js:36
msgid "delete file permanently"
-msgstr ""
+msgstr "Datei dauerhaft löschen"
#: js/trash.js:127
msgid "Delete permanently"
-msgstr ""
+msgstr "Endgültig löschen"
#: js/trash.js:182 templates/index.php:17
msgid "Name"
-msgstr ""
+msgstr "Name"
#: js/trash.js:183 templates/index.php:27
msgid "Deleted"
-msgstr ""
+msgstr "Gelöscht"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
-msgstr ""
+msgstr "Wiederhergestellt"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
-msgstr ""
+msgstr "Wiederherstellen"
#: templates/index.php:30 templates/index.php:31
msgid "Delete"
-msgstr ""
+msgstr "Löschen"
#: templates/part.breadcrumb.php:9
msgid "Deleted Files"
-msgstr ""
+msgstr "Gelöschte Dateien"
diff --git a/l10n/de_CH/files_versions.po b/l10n/de_CH/files_versions.po
index 468ea3be06a..d055e276f7a 100644
--- a/l10n/de_CH/files_versions.po
+++ b/l10n/de_CH/files_versions.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# FlorianScholz <work@bgstyle.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-07 14:02+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,24 +22,24 @@ msgstr ""
#: ajax/rollbackVersion.php:13
#, php-format
msgid "Could not revert: %s"
-msgstr ""
+msgstr "Konnte %s nicht zurücksetzen"
#: js/versions.js:7
msgid "Versions"
-msgstr ""
+msgstr "Versionen"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "Konnte {file} der Revision {timestamp} nicht rückgänging machen."
#: js/versions.js:79
msgid "More versions..."
-msgstr ""
+msgstr "Mehrere Versionen..."
#: js/versions.js:116
msgid "No other versions available"
-msgstr ""
+msgstr "Keine anderen Versionen verfügbar"
#: js/versions.js:149
msgid "Restore"
-msgstr ""
+msgstr "Wiederherstellen"
diff --git a/l10n/de_CH/lib.po b/l10n/de_CH/lib.po
index 1d2f5677fb4..f196e68f997 100644
--- a/l10n/de_CH/lib.po
+++ b/l10n/de_CH/lib.po
@@ -3,12 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# FlorianScholz <work@bgstyle.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -19,120 +22,112 @@ msgstr ""
#: app.php:360
msgid "Help"
-msgstr ""
+msgstr "Hilfe"
#: app.php:373
msgid "Personal"
-msgstr ""
+msgstr "Persönlich"
#: app.php:384
msgid "Settings"
-msgstr ""
+msgstr "Einstellungen"
#: app.php:396
msgid "Users"
-msgstr ""
+msgstr "Benutzer"
#: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
msgid "Admin"
-msgstr ""
+msgstr "Administrator"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "Konnte \"%s\" nicht aktualisieren."
#: defaults.php:35
msgid "web services under your control"
-msgstr ""
+msgstr "Web-Services unter Ihrer Kontrolle"
#: files.php:66 files.php:98
#, php-format
msgid "cannot open \"%s\""
-msgstr ""
+msgstr "Öffnen von \"%s\" fehlgeschlagen"
#: files.php:226
msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Der ZIP-Download ist deaktiviert."
#: files.php:227
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Die Dateien müssen einzeln heruntergeladen werden."
#: files.php:228 files.php:256
msgid "Back to Files"
-msgstr ""
+msgstr "Zurück zu \"Dateien\""
#: files.php:253
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Die gewählten Dateien sind zu gross, um eine ZIP-Datei zu erstellen."
#: files.php:254
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
-msgstr ""
-
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
+msgstr "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bitten Sie Ihren Administrator."
#: json.php:28
msgid "Application is not enabled"
-msgstr ""
+msgstr "Die Anwendung ist nicht aktiviert"
#: json.php:39 json.php:62 json.php:73
msgid "Authentication error"
-msgstr ""
+msgstr "Authentifizierungs-Fehler"
#: json.php:51
msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Token abgelaufen. Bitte laden Sie die Seite neu."
#: 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"
-msgstr ""
+msgstr "Text"
#: search/provider/file.php:29
msgid "Images"
-msgstr ""
+msgstr "Bilder"
#: setup/abstractdatabase.php:22
#, php-format
msgid "%s enter the database username."
-msgstr ""
+msgstr "%s geben Sie den Datenbank-Benutzernamen an."
#: setup/abstractdatabase.php:25
#, php-format
msgid "%s enter the database name."
-msgstr ""
+msgstr "%s geben Sie den Datenbank-Namen an."
#: setup/abstractdatabase.php:28
#, php-format
msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
#: setup/mssql.php:20
#, php-format
msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL Benutzername und/oder Passwort ungültig: %s"
#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
#: setup/postgresql.php:24 setup/postgresql.php:70
msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
#: setup/mysql.php:12
msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "MySQL Benutzername und/oder Passwort ungültig"
#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
@@ -141,7 +136,7 @@ msgstr ""
#: setup/postgresql.php:125 setup/postgresql.php:134
#, php-format
msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "DB Fehler: \"%s\""
#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
@@ -149,119 +144,115 @@ msgstr ""
#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
#, php-format
msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Fehlerhafter Befehl war: \"%s\""
#: setup/mysql.php:85
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
#: setup/mysql.php:86
msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Lösche diesen Benutzer aus MySQL"
#: setup/mysql.php:91
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
#: setup/mysql.php:92
msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Lösche diesen Benutzer aus MySQL."
#: setup/oci.php:34
msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Die Oracle-Verbindung konnte nicht aufgebaut werden."
#: setup/oci.php:41 setup/oci.php:113
msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Oracle Benutzername und/oder Passwort ungültig"
#: setup/oci.php:173 setup/oci.php:205
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
#: setup/postgresql.php:23 setup/postgresql.php:69
msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
#: setup.php:28
msgid "Set an admin username."
-msgstr ""
+msgstr "Setze Administrator Benutzername."
#: setup.php:31
msgid "Set an admin password."
-msgstr ""
+msgstr "Setze Administrator Passwort"
#: setup.php:184
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
#: setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
#: template/functions.php:80
msgid "seconds ago"
-msgstr ""
+msgstr "Gerade eben"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr ""
+msgid "today"
+msgstr "Heute"
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr ""
+msgid "yesterday"
+msgstr "Gestern"
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:86
-msgid "yesterday"
-msgstr ""
+msgid "last month"
+msgstr "Letzten Monat"
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
-msgstr ""
+msgstr "Letztes Jahr"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
-msgstr ""
+msgstr "Vor Jahren"
#: template.php:297
msgid "Caused by:"
-msgstr ""
+msgstr "Verursacht durch:"
#: vcategories.php:188 vcategories.php:249
#, php-format
msgid "Could not find category \"%s\""
-msgstr ""
+msgstr "Die Kategorie «%s» konnte nicht gefunden werden."
diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po
index 635f9ddd5dd..6193f9b28eb 100644
--- a/l10n/de_CH/settings.po
+++ b/l10n/de_CH/settings.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# arkascha <foss@christian-reiner.info>, 2013
+# a.tangemann <a.tangemann@web.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
+# kabum <uu.kabum@gmail.com>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# Mirodin <blobbyjj@ymail.com>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -19,159 +26,163 @@ msgstr ""
#: ajax/apps/ocs.php:20
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
#: ajax/togglegroups.php:20
msgid "Authentication error"
-msgstr ""
+msgstr "Authentifizierungs-Fehler"
#: ajax/changedisplayname.php:31
msgid "Your display name has been changed."
-msgstr ""
+msgstr "Dein Anzeigename ist geändert worden."
#: ajax/changedisplayname.php:34
msgid "Unable to change display name"
-msgstr ""
+msgstr "Das Ändern des Anzeigenamens ist nicht möglich"
#: ajax/creategroup.php:10
msgid "Group already exists"
-msgstr ""
+msgstr "Die Gruppe existiert bereits"
#: ajax/creategroup.php:19
msgid "Unable to add group"
-msgstr ""
+msgstr "Die Gruppe konnte nicht angelegt werden"
#: ajax/enableapp.php:11
msgid "Could not enable app. "
-msgstr ""
+msgstr "Die Anwendung konnte nicht aktiviert werden."
#: ajax/lostpassword.php:12
msgid "Email saved"
-msgstr ""
+msgstr "E-Mail-Adresse gespeichert"
#: ajax/lostpassword.php:14
msgid "Invalid email"
-msgstr ""
+msgstr "Ungültige E-Mail-Adresse"
#: ajax/removegroup.php:13
msgid "Unable to delete group"
-msgstr ""
+msgstr "Die Gruppe konnte nicht gelöscht werden"
#: ajax/removeuser.php:25
msgid "Unable to delete user"
-msgstr ""
+msgstr "Der Benutzer konnte nicht gelöscht werden"
#: ajax/setlanguage.php:15
msgid "Language changed"
-msgstr ""
+msgstr "Sprache geändert"
#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
msgid "Invalid request"
-msgstr ""
+msgstr "Ungültige Anforderung"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Administratoren können sich nicht selbst aus der admin-Gruppe löschen"
#: ajax/togglegroups.php:30
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden"
#: ajax/togglegroups.php:36
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
#: ajax/updateapp.php:14
msgid "Couldn't update app."
-msgstr ""
+msgstr "Die App konnte nicht aktualisiert werden."
#: js/apps.js:35
msgid "Update to {appversion}"
-msgstr ""
+msgstr "Update zu {appversion}"
#: js/apps.js:41 js/apps.js:81
msgid "Disable"
-msgstr ""
+msgstr "Deaktivieren"
#: js/apps.js:41 js/apps.js:69 js/apps.js:88
msgid "Enable"
-msgstr ""
+msgstr "Aktivieren"
#: js/apps.js:60
msgid "Please wait...."
-msgstr ""
+msgstr "Bitte warten...."
#: js/apps.js:64 js/apps.js:76 js/apps.js:85 js/apps.js:98
msgid "Error"
-msgstr ""
+msgstr "Fehler"
#: js/apps.js:95
msgid "Updating...."
-msgstr ""
+msgstr "Update..."
#: js/apps.js:98
msgid "Error while updating app"
-msgstr ""
+msgstr "Es ist ein Fehler während des Updates aufgetreten"
#: js/apps.js:101
msgid "Updated"
+msgstr "Aktualisiert"
+
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:172
msgid "Saving..."
-msgstr ""
+msgstr "Speichern..."
#: js/users.js:47
msgid "deleted"
-msgstr ""
+msgstr "gelöscht"
#: js/users.js:47
msgid "undo"
-msgstr ""
+msgstr "rückgängig machen"
#: js/users.js:79
msgid "Unable to remove user"
-msgstr ""
+msgstr "Der Benutzer konnte nicht entfernt werden."
#: js/users.js:92 templates/users.php:26 templates/users.php:87
#: templates/users.php:112
msgid "Groups"
-msgstr ""
+msgstr "Gruppen"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
-msgstr ""
+msgstr "Gruppenadministrator"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
-msgstr ""
+msgstr "Löschen"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
-msgstr ""
+msgstr "Gruppe hinzufügen"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
-msgstr ""
+msgstr "Es muss ein gültiger Benutzername angegeben werden"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
-msgstr ""
+msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
-msgstr ""
+msgstr "Es muss ein gültiges Passwort angegeben werden"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
-msgstr ""
+msgstr "Deutsch (Förmlich: Sie)"
#: templates/admin.php:15
msgid "Security Warning"
-msgstr ""
+msgstr "Sicherheitshinweis"
#: templates/admin.php:18
msgid ""
@@ -180,36 +191,36 @@ msgid ""
"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 "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers."
#: templates/admin.php:29
msgid "Setup Warning"
-msgstr ""
+msgstr "Einrichtungswarnung"
#: templates/admin.php:32
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Bitte überprüfen Sie die <a href=\"%s\">Instalationsanleitungen</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Das Modul 'fileinfo' fehlt"
#: templates/admin.php:47
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
-msgstr ""
+msgstr "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen."
#: templates/admin.php:58
msgid "Locale not working"
-msgstr ""
+msgstr "Die Lokalisierung funktioniert nicht"
#: templates/admin.php:63
#, php-format
@@ -217,11 +228,11 @@ msgid ""
"System locale can't be set to %s. 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 %s."
-msgstr ""
+msgstr "Die System-Ländereinstellung kann nicht auf %s geändert werden. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen, die für %s benötigten Pakete auf ihrem System zu installieren."
#: templates/admin.php:75
msgid "Internet connection not working"
-msgstr ""
+msgstr "Keine Internetverbindung"
#: templates/admin.php:78
msgid ""
@@ -230,112 +241,112 @@ msgid ""
"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."
-msgstr ""
+msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen."
#: templates/admin.php:92
msgid "Cron"
-msgstr ""
+msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Eine Aufgabe bei jedem Laden der Seite ausführen"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "cron.php ist als Webcron-Dienst registriert, der die cron.php minütlich per HTTP aufruft."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "Benutzen Sie den System-Crondienst um die cron.php minütlich aufzurufen."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
-msgstr ""
+msgstr "Teilen"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
-msgstr ""
+msgstr "Share-API aktivieren"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Anwendungen erlauben, die Share-API zu benutzen"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
-msgstr ""
+msgstr "Links erlauben"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
-msgstr ""
+msgstr "Erlaube öffentliches hochladen"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
-msgstr ""
+msgstr "Erlaube Weiterverteilen"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Erlaubt Benutzern, mit jedem zu teilen"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
-msgstr ""
+msgstr "Sicherheit"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
-msgstr ""
+msgstr "HTTPS erzwingen"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
-msgstr ""
+msgstr "Log"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
-msgstr ""
+msgstr "Log-Level"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
-msgstr ""
+msgstr "Mehr"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
-msgstr ""
+msgstr "Weniger"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
-msgstr ""
+msgstr "Version"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -343,174 +354,190 @@ 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 ""
+msgstr "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert."
#: templates/apps.php:13
msgid "Add your App"
-msgstr ""
+msgstr "Fügen Sie Ihre Anwendung hinzu"
#: templates/apps.php:28
msgid "More Apps"
-msgstr ""
+msgstr "Weitere Anwendungen"
#: templates/apps.php:33
msgid "Select an App"
-msgstr ""
+msgstr "Wählen Sie eine Anwendung aus"
#: templates/apps.php:39
msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Weitere Anwendungen finden Sie auf apps.owncloud.com"
#: templates/apps.php:41
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
#: templates/apps.php:43
msgid "Update"
-msgstr ""
+msgstr "Update durchführen"
#: templates/help.php:4
msgid "User Documentation"
-msgstr ""
+msgstr "Dokumentation für Benutzer"
#: templates/help.php:6
msgid "Administrator Documentation"
-msgstr ""
+msgstr "Dokumentation für Administratoren"
#: templates/help.php:9
msgid "Online Documentation"
-msgstr ""
+msgstr "Online-Dokumentation"
#: templates/help.php:11
msgid "Forum"
-msgstr ""
+msgstr "Forum"
#: templates/help.php:14
msgid "Bugtracker"
-msgstr ""
+msgstr "Bugtracker"
#: templates/help.php:17
msgid "Commercial Support"
-msgstr ""
+msgstr "Kommerzieller Support"
#: templates/personal.php:8
msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren"
#: templates/personal.php:19
msgid "Show First Run Wizard again"
-msgstr ""
+msgstr "Den Einrichtungsassistenten erneut anzeigen"
#: templates/personal.php:27
#, php-format
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>"
#: templates/personal.php:39 templates/users.php:23 templates/users.php:86
msgid "Password"
-msgstr ""
+msgstr "Passwort"
#: templates/personal.php:40
msgid "Your password was changed"
-msgstr ""
+msgstr "Ihr Passwort wurde geändert."
#: templates/personal.php:41
msgid "Unable to change your password"
-msgstr ""
+msgstr "Das Passwort konnte nicht geändert werden"
#: templates/personal.php:42
msgid "Current password"
-msgstr ""
+msgstr "Aktuelles Passwort"
#: templates/personal.php:44
msgid "New password"
-msgstr ""
+msgstr "Neues Passwort"
#: templates/personal.php:46
msgid "Change password"
-msgstr ""
+msgstr "Passwort ändern"
#: templates/personal.php:58 templates/users.php:85
msgid "Display Name"
-msgstr ""
+msgstr "Anzeigename"
#: templates/personal.php:73
msgid "Email"
-msgstr ""
+msgstr "E-Mail"
#: templates/personal.php:75
msgid "Your email address"
-msgstr ""
+msgstr "Ihre E-Mail-Adresse"
#: templates/personal.php:76
msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
#: templates/personal.php:85 templates/personal.php:86
msgid "Language"
-msgstr ""
+msgstr "Sprache"
#: templates/personal.php:98
msgid "Help translate"
-msgstr ""
+msgstr "Helfen Sie bei der Übersetzung"
#: templates/personal.php:104
msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
#: templates/personal.php:106
#, php-format
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>."
+
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
msgstr ""
#: templates/users.php:21
msgid "Login Name"
-msgstr ""
+msgstr "Loginname"
#: templates/users.php:30
msgid "Create"
-msgstr ""
+msgstr "Erstellen"
#: templates/users.php:36
msgid "Admin Recovery Password"
-msgstr ""
+msgstr "Admin-Passwort-Wiederherstellung"
#: templates/users.php:37 templates/users.php:38
msgid ""
"Enter the recovery password in order to recover the users files during "
"password change"
-msgstr ""
+msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen"
#: templates/users.php:42
msgid "Default Storage"
-msgstr ""
+msgstr "Standard-Speicher"
#: templates/users.php:48 templates/users.php:142
msgid "Unlimited"
-msgstr ""
+msgstr "Unbegrenzt"
#: templates/users.php:66 templates/users.php:157
msgid "Other"
-msgstr ""
+msgstr "Andere"
#: templates/users.php:84
msgid "Username"
-msgstr ""
+msgstr "Benutzername"
#: templates/users.php:91
msgid "Storage"
-msgstr ""
+msgstr "Speicher"
#: templates/users.php:102
msgid "change display name"
-msgstr ""
+msgstr "Anzeigenamen ändern"
#: templates/users.php:106
msgid "set new password"
-msgstr ""
+msgstr "Neues Passwort setzen"
#: templates/users.php:137
msgid "Default"
-msgstr ""
+msgstr "Standard"
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
index fbc8386846e..9081b095a9c 100644
--- a/l10n/de_CH/user_ldap.po
+++ b/l10n/de_CH/user_ldap.po
@@ -3,12 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# a.tangemann <a.tangemann@web.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
+# JamFX <niko@nik-o-mat.de>, 2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# multimill <multimill@gmail.com>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -19,333 +26,320 @@ msgstr ""
#: ajax/clearMappings.php:34
msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Löschen der Zuordnung fehlgeschlagen."
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Löschen der Serverkonfiguration fehlgeschlagen"
#: ajax/testConfiguration.php:36
msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!"
#: ajax/testConfiguration.php:39
msgid ""
"The configuration is valid, but the Bind failed. Please check the server "
"settings and credentials."
-msgstr ""
+msgstr "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen."
#: ajax/testConfiguration.php:43
msgid ""
"The configuration is invalid. Please look in the ownCloud log for further "
"details."
-msgstr ""
+msgstr "Die Konfiguration ist ungültig, sehen Sie für weitere Details bitte im ownCloud Log nach"
#: js/settings.js:66
msgid "Deletion failed"
-msgstr ""
+msgstr "Löschen fehlgeschlagen"
#: js/settings.js:82
msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Einstellungen von letzter Konfiguration übernehmen?"
#: js/settings.js:83
msgid "Keep settings?"
-msgstr ""
+msgstr "Einstellungen beibehalten?"
#: js/settings.js:97
msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
#: js/settings.js:111
msgid "mappings cleared"
-msgstr ""
+msgstr "Zuordnungen gelöscht"
#: js/settings.js:112
msgid "Success"
-msgstr ""
+msgstr "Erfolg"
#: js/settings.js:117
msgid "Error"
-msgstr ""
+msgstr "Fehler"
#: js/settings.js:141
msgid "Connection test succeeded"
-msgstr ""
+msgstr "Verbindungstest erfolgreich"
#: js/settings.js:146
msgid "Connection test failed"
-msgstr ""
+msgstr "Verbindungstest fehlgeschlagen"
#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?"
#: js/settings.js:157
msgid "Confirm Deletion"
-msgstr ""
+msgstr "Löschung bestätigen"
#: templates/settings.php:9
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behavior. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "<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."
#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
-msgstr ""
+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:16
msgid "Server configuration"
-msgstr ""
+msgstr "Serverkonfiguration"
#: templates/settings.php:32
msgid "Add Server Configuration"
-msgstr ""
+msgstr "Serverkonfiguration hinzufügen"
#: templates/settings.php:37
msgid "Host"
-msgstr ""
+msgstr "Host"
#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Sie können das Protokoll auslassen, ausser wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://"
#: templates/settings.php:40
msgid "Base DN"
-msgstr ""
+msgstr "Basis-DN"
#: templates/settings.php:41
msgid "One Base DN per line"
-msgstr ""
+msgstr "Ein Basis-DN pro Zeile"
#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Sie können Basis-DN für Benutzer und Gruppen in dem «Erweitert»-Reiter konfigurieren"
#: templates/settings.php:44
msgid "User DN"
-msgstr ""
+msgstr "Benutzer-DN"
#: templates/settings.php:46
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 "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer."
#: templates/settings.php:47
msgid "Password"
-msgstr ""
+msgstr "Passwort"
#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer."
#: templates/settings.php:51
msgid "User Login Filter"
-msgstr ""
+msgstr "Benutzer-Login-Filter"
#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
-msgstr ""
-
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Benutzer-Filter-Liste"
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
-msgstr ""
+msgstr "Gruppen-Filter"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
-msgstr ""
+msgstr "Verbindungseinstellungen"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
-msgstr ""
+msgstr "Konfiguration aktiv"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Wenn nicht angehakt, wird diese Konfiguration übersprungen."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
-msgstr ""
+msgstr "Port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Backup Host (Kopie)"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
-msgstr ""
+msgstr "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Backup Port"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
-msgstr ""
+msgstr "Hauptserver deaktivieren"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Nur zum Replikat-Server verbinden."
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
-msgstr ""
+msgstr "Nutze TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "LDAP-Server (Windows: Gross- und Kleinschreibung bleibt unbeachtet)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "Speichere Time-To-Live zwischen"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "in Sekunden. Eine Änderung leert den Cache."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
-msgstr ""
+msgstr "Ordnereinstellungen"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
-msgstr ""
+msgstr "Feld für den Anzeigenamen des Benutzers"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers."
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
-msgstr ""
+msgstr "Basis-Benutzerbaum"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
-msgstr ""
+msgstr "Ein Benutzer Basis-DN pro Zeile"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
-msgstr ""
+msgstr "Benutzersucheigenschaften"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Optional; ein Attribut pro Zeile"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
-msgstr ""
+msgstr "Feld für den Anzeigenamen der Gruppe"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen."
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
-msgstr ""
+msgstr "Basis-Gruppenbaum"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
-msgstr ""
+msgstr "Ein Gruppen Basis-DN pro Zeile"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
-msgstr ""
+msgstr "Gruppensucheigenschaften"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
-msgstr ""
+msgstr "Assoziation zwischen Gruppe und Benutzer"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
-msgstr ""
+msgstr "Spezielle Eigenschaften"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
-msgstr ""
+msgstr "Kontingent-Feld"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
-msgstr ""
+msgstr "Standard-Kontingent"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
-msgstr ""
+msgstr "in Bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
-msgstr ""
+msgstr "E-Mail-Feld"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
-msgstr ""
+msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
-msgstr ""
+msgstr "Interner Benutzername"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -359,17 +353,17 @@ msgid ""
"behavior as before ownCloud 5 enter the user display name attribute in the "
"following field. Leave it empty for default behavior. Changes will have "
"effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Standardmässig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmässig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Interne Eigenschaften des Benutzers:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
-msgstr ""
+msgstr "UUID-Erkennung überschreiben"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -378,17 +372,17 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behavior. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
-msgstr ""
+msgstr "UUID-Attribut:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "LDAP-Benutzernamenzuordnung"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -400,20 +394,20 @@ msgid ""
" is not configuration sensitive, it affects all LDAP configurations! Never "
"clear the mappings in a production environment, only in a testing or "
"experimental stage."
-msgstr ""
+msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung."
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Lösche LDAP-Benutzernamenzuordnung"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Lösche LDAP-Gruppennamenzuordnung"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
-msgstr ""
+msgstr "Testkonfiguration"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
-msgstr ""
+msgstr "Hilfe"
diff --git a/l10n/de_CH/user_webdavauth.po b/l10n/de_CH/user_webdavauth.po
index b7acf171034..ef0fb2e26ca 100644
--- a/l10n/de_CH/user_webdavauth.po
+++ b/l10n/de_CH/user_webdavauth.po
@@ -3,13 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# a.tangemann <a.tangemann@web.de>, 2013
+# FlorianScholz <work@bgstyle.de>, 2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# multimill <multimill@gmail.com>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-07 13:40+0000\n"
+"Last-Translator: FlorianScholz <work@bgstyle.de>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +25,15 @@ msgstr ""
#: templates/settings.php:3
msgid "WebDAV Authentication"
-msgstr ""
+msgstr "WebDAV-Authentifizierung"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "Adresse:"
#: templates/settings.php:7
msgid ""
"The user credentials will be sent to this address. 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 ""
+msgstr "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 74a9b97b5b7..da78f8613cf 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -5,17 +5,19 @@
# Translators:
# arkascha <foss@christian-reiner.info>, 2013
# SteinQuadrat, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2013
# Marcel Kühlhorn <susefan93@gmx.de>, 2013
# Mario Siegmann <mario_siegmann@web.de>, 2013
# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013
# Mirodin <blobbyjj@ymail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -143,59 +145,59 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "Gerade eben"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "Vor 1 Minute"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "Vor %n Minute"
+msgstr[1] "Vor %n Minuten"
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "Vor {minutes} Minuten"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "Vor %n Stunde"
+msgstr[1] "Vor %n Stunden"
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "Vor einer Stunde"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "Vor {hours} Stunden"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "Heute"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "Gestern"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "Vor {days} Tag(en)"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "Vor %n Tag"
+msgstr[1] "Vor %n Tagen"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "Letzten Monat"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "Vor {months} Monaten"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "Vor %n Monat"
+msgstr[1] "Vor %n Monaten"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "Vor Monaten"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "Letztes Jahr"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "Vor Jahren"
@@ -203,23 +205,19 @@ msgstr "Vor Jahren"
msgid "Choose"
msgstr "Auswählen"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten."
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "OK"
@@ -383,9 +381,10 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud-Passwort zurücksetzen"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "%s-Passwort zurücksetzen"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -584,6 +583,10 @@ msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen e
msgid "Log out"
msgstr "Abmelden"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Mehr Apps"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatische Anmeldung verweigert!"
@@ -621,14 +624,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüße!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "Zurück"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "Weiter"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 91e1c340110..9bab6784cd6 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -8,15 +8,16 @@
# I Robot <owncloud-bot@tmit.eu>, 2013
# Marcel Kühlhorn <susefan93@gmx.de>, 2013
# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013
# Mirodin <blobbyjj@ymail.com>, 2013
# kabum <uu.kabum@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-20 06:50+0000\n"
+"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -101,21 +102,21 @@ msgstr "Nicht genügend Speicherplatz verfügbar"
msgid "Upload cancelled."
msgstr "Upload abgebrochen."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:234 js/files.js:353
msgid "URL cannot be empty."
msgstr "Die URL darf nicht leer sein."
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:239 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten."
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Fehler"
@@ -127,15 +128,11 @@ msgstr "Teilen"
msgid "Delete permanently"
msgstr "Endgültig löschen"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Löschen"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Umbenennen"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Ausstehend"
@@ -163,15 +160,13 @@ msgstr "{old_name} wurde ersetzt durch {new_name}"
msgid "undo"
msgstr "rückgängig machen"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "Löschvorgang ausführen"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "%n Datei wird hoch geladen"
+msgstr[1] "%n Dateien werden hoch geladen"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 Datei wird hochgeladen"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "Dateien werden hoch geladen"
@@ -197,43 +192,45 @@ msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert ode
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln."
+
+#: js/files.js:245
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 etwas dauern."
-#: js/files.js:344
+#: js/files.js:358
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:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Name"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Größe"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Geändert"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 Ordner"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n Ordner"
+msgstr[1] "%n Ordner"
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} Ordner"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 Datei"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} Dateien"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n Datei"
+msgstr[1] "%n Dateien"
#: lib/app.php:73
#, php-format
@@ -316,6 +313,10 @@ msgstr "Herunterladen"
msgid "Unshare"
msgstr "Freigabe aufheben"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Löschen"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Der Upload ist zu groß"
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index 76b2fc9474a..1571956a4cf 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-06 17:00+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -65,18 +65,18 @@ msgid ""
"files."
msgstr "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Fehlende Voraussetzungen"
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und die PHP-Erweiterung OpenSSL aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert."
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index 22a6aa0d50d..51ed893dda7 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index a4e20c81296..1875dbf8bfc 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -4,13 +4,14 @@
#
# Translators:
# Mario Siegmann <mario_siegmann@web.de>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 16:42+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"PO-Revision-Date: 2013-08-15 09:01+0000\n"
+"Last-Translator: noxin <transifex.com@davidmainzer.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -52,21 +53,17 @@ msgstr "Name"
msgid "Deleted"
msgstr "Gelöscht"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 Ordner"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} Ordner"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 Datei"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} Dateien"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n Ordner"
+msgstr[1] "%n Ordner"
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n Dateien"
+msgstr[1] "%n Dateien"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 9e998d3694f..ff98de66e2b 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -5,13 +5,14 @@
# Translators:
# Mario Siegmann <mario_siegmann@web.de>, 2013
# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -36,14 +37,10 @@ msgid "Users"
msgstr "Benutzer"
#: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
msgid "Admin"
msgstr "Administrator"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Konnte \"%s\" nicht aktualisieren."
@@ -79,10 +76,6 @@ msgid ""
"administrator."
msgstr "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bitten Sie Ihren Administrator."
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "konnte nicht ermittelt werden"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Die Anwendung ist nicht aktiviert"
@@ -212,50 +205,46 @@ msgid "seconds ago"
msgstr "Gerade eben"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "Vor 1 Minute"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "Vor %n Minute"
+msgstr[1] "Vor %n Minuten"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "Vor %d Minuten"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "Vor %n Stunde"
+msgstr[1] "Vor %n Stunden"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "Vor einer Stunde"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "Vor %d Stunden"
-
-#: template/functions.php:85
msgid "today"
msgstr "Heute"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "Gestern"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "Vor %d Tag(en)"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] "Vor %n Tag"
+msgstr[1] "Vor %n Tagen"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "Letzten Monat"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "Vor %d Monaten"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "Vor %n Monat"
+msgstr[1] "Vor %n Monaten"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "Letztes Jahr"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "Vor Jahren"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 4d2788b68e1..92428b183d7 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 12:50+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -126,7 +126,11 @@ msgstr "Es ist ein Fehler während des Updates aufgetreten"
msgid "Updated"
msgstr "Aktualisiert"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen."
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Speichern..."
@@ -147,31 +151,31 @@ msgstr "Der Benutzer konnte nicht entfernt werden."
msgid "Groups"
msgstr "Gruppen"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Gruppenadministrator"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Löschen"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "Gruppe hinzufügen"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Es muss ein gültiger Benutzername angegeben werden"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Deutsch (Förmlich: Sie)"
@@ -242,106 +246,106 @@ msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeute
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Eine Aufgabe bei jedem Laden der Seite ausführen"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php ist als Webcron-Dienst registriert, der die cron.php minütlich per HTTP aufruft."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "Benutzen Sie den System-Crondienst um die cron.php minütlich aufzurufen."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Teilen"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Share-API aktivieren"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Anwendungen erlauben, die Share-API zu benutzen"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Links erlauben"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Erlaube öffentliches hochladen"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Erlaube Weiterverteilen"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Erlaubt Benutzern, mit jedem zu teilen"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Sicherheit"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "HTTPS erzwingen"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Log"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Log-Level"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Mehr"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Weniger"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Version"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -471,6 +475,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>."
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt. "
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr "Login-Passwort"
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr "Alle Dateien entschlüsseln"
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Loginname"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 09a76572646..aa03bac5ff2 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -8,13 +8,14 @@
# Mario Siegmann <mario_siegmann@web.de>, 2013
# JamFX <niko@nik-o-mat.de>, 2013
# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+# noxin <transifex.com@davidmainzer.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 07:00+0000\n"
+"Last-Translator: noxin <transifex.com@davidmainzer.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -159,198 +160,185 @@ msgstr "Benutzer-Login-Filter"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Benutzer-Filter-Liste"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definiert den Filter für die Anfrage der Benutzer."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr "Definiert den Filter für die Wiederherstellung eines Benutzers (kein Platzhalter). Beispiel: \"objectClass=person\""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Gruppen-Filter"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definiert den Filter für die Anfrage der Gruppen."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr "Definiert den Filter für die Wiederherstellung einer Gruppe (kein Platzhalter). Beispiel: \"objectClass=posixGroup\""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Verbindungseinstellungen"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Konfiguration aktiv"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Wenn nicht angehakt, wird diese Konfiguration übersprungen."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Backup Host (Kopie)"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Backup Port"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Hauptserver deaktivieren"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr "Nur zum Replikat-Server verbinden."
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Nutze TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nicht empfohlen, nur zu Testzwecken."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server."
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Speichere Time-To-Live zwischen"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "in Sekunden. Eine Änderung leert den Cache."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Ordnereinstellungen"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Feld für den Anzeigenamen des Benutzers"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers."
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Basis-Benutzerbaum"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Ein Benutzer Basis-DN pro Zeile"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Benutzersucheigenschaften"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Optional; ein Attribut pro Zeile"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Feld für den Anzeigenamen der Gruppe"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen."
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Basis-Gruppenbaum"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Ein Gruppen Basis-DN pro Zeile"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Gruppensucheigenschaften"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Assoziation zwischen Gruppe und Benutzer"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Spezielle Eigenschaften"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Kontingent-Feld"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Standard-Kontingent"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "in Bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "E-Mail-Feld"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Interner Benutzername"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -366,15 +354,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Interne Eigenschaften des Benutzers:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "UUID-Erkennung überschreiben"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -385,15 +373,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Standardmäßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "UUID-Attribut:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "LDAP-Benutzernamenzuordnung"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -407,18 +395,18 @@ msgid ""
"experimental stage."
msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung."
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Lösche LDAP-Benutzernamenzuordnung"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Lösche LDAP-Gruppennamenzuordnung"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Testkonfiguration"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Hilfe"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 279c232cc46..f44d1601846 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -144,59 +144,59 @@ msgstr "Νοέμβριος"
msgid "December"
msgstr "Δεκέμβριος"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "δευτερόλεπτα πριν"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 λεπτό πριν"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} λεπτά πριν"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 ώρα πριν"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} ώρες πριν"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "σήμερα"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "χτες"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} ημέρες πριν"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "τελευταίο μήνα"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} μήνες πριν"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "μήνες πριν"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "τελευταίο χρόνο"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "χρόνια πριν"
@@ -204,23 +204,19 @@ msgstr "χρόνια πριν"
msgid "Choose"
msgstr "Επιλέξτε"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Άκυρο"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Σφάλμα φόρτωσης αρχείου επιλογέα προτύπου"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Ναι"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Όχι"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Οκ"
@@ -384,9 +380,10 @@ msgstr "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ σ
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Επαναφορά συνθηματικού ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -585,6 +582,10 @@ msgstr "%s είναι διαθέσιμη. Δείτε περισσότερες π
msgid "Log out"
msgstr "Αποσύνδεση"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Απορρίφθηκε η αυτόματη σύνδεση!"
@@ -622,14 +623,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Γεια σας,<br><br>σας ενημερώνουμε ότι ο %s διαμοιράστηκε μαζί σας το »%s«.<br><a href=\"%s\">Δείτε το!</a><br><br>Γεια χαρά!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "προηγούμενο"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "επόμενο"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 560d737eb2f..33d74694271 100644
--- a/l10n/el/files.po
+++ b/l10n/el/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -96,12 +96,12 @@ msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος"
msgid "Upload cancelled."
msgstr "Η αποστολή ακυρώθηκε."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "Η URL δεν μπορεί να είναι κενή."
@@ -109,8 +109,8 @@ msgstr "Η URL δεν μπορεί να είναι κενή."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Σφάλμα"
@@ -122,15 +122,11 @@ msgstr "Διαμοιρασμός"
msgid "Delete permanently"
msgstr "Μόνιμη διαγραφή"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Διαγραφή"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Μετονομασία"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Εκκρεμεί"
@@ -158,15 +154,13 @@ msgstr "αντικαταστάθηκε το {new_name} με {old_name}"
msgid "undo"
msgstr "αναίρεση"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "εκτέλεση της διαδικασίας διαγραφής"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 αρχείο ανεβαίνει"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "αρχεία ανεβαίνουν"
@@ -192,43 +186,45 @@ msgstr "Ο αποθηκευτικός σας χώρος είναι γεμάτο
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Όνομα"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Μέγεθος"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Τροποποιήθηκε"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 φάκελος"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} φάκελοι"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 αρχείο"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} αρχεία"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -311,6 +307,10 @@ msgstr "Λήψη"
msgid "Unshare"
msgstr "Σταμάτημα διαμοιρασμού"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Διαγραφή"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Πολύ μεγάλο αρχείο προς αποστολή"
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index 48205a8c2e8..8cb29d78640 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -64,18 +64,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 5fe608cdb4b..79341a41193 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index b344736372f..9419e249a1f 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/files_trashbin.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-06 07:40+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -52,21 +52,17 @@ msgstr "Όνομα"
msgid "Deleted"
msgstr "Διαγράφηκε"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 φάκελος"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} φάκελοι"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 αρχείο"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} αρχεία"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index b0250c735a2..3fbac4a7421 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-06 08:00+0000\n"
-"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Χρήστες"
#: app.php:409
-msgid "Apps"
-msgstr "Εφαρμογές"
-
-#: app.php:417
msgid "Admin"
msgstr "Διαχειριστής"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Αποτυχία αναβάθμισης του \"%s\"."
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr "Λήψη των αρχείων σε μικρότερα κομμάτια, χωριστά ή ρωτήστε τον διαχειριστή σας."
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "δεν μπορούσε να προσδιορισθεί"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Δεν ενεργοποιήθηκε η εφαρμογή"
@@ -211,50 +203,46 @@ msgid "seconds ago"
msgstr "δευτερόλεπτα πριν"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 λεπτό πριν"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d λεπτά πριν"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 ώρα πριν"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d ώρες πριν"
-
-#: template/functions.php:85
msgid "today"
msgstr "σήμερα"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "χτες"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d ημέρες πριν"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "τελευταίο μήνα"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d μήνες πριν"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "τελευταίο χρόνο"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "χρόνια πριν"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 0ac7c75c24d..518615afaaa 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -126,7 +126,11 @@ msgstr "Σφάλμα κατά την ενημέρωση της εφαρμογή
msgid "Updated"
msgstr "Ενημερώθηκε"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Γίνεται αποθήκευση..."
@@ -147,31 +151,31 @@ msgstr "Αδυναμία αφαίρεση χρήστη"
msgid "Groups"
msgstr "Ομάδες"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Ομάδα Διαχειριστών"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Διαγραφή"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "προσθήκη ομάδας"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Πρέπει να δοθεί έγκυρο όνομα χρήστη"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Σφάλμα δημιουργίας χρήστη"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__όνομα_γλώσσας__"
@@ -242,106 +246,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Εκτέλεση μιας διεργασίας με κάθε σελίδα που φορτώνεται"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Διαμοιρασμός"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Ενεργοποίηση API Διαμοιρασμού"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν το API Διαμοιρασμού"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Να επιτρέπονται σύνδεσμοι"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν δημόσια με συνδέσμους"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Να επιτρέπεται ο επαναδιαμοιρασμός"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Να επιτρέπεται ο διαμοιρασμός με οποιονδήποτε"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Να επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Ασφάλεια"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Επιβολή χρήσης HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Καταγραφές"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Επίπεδο καταγραφής"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Περισσότερα"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Λιγότερα"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Έκδοση"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -471,6 +475,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Χρήση αυτής της διεύθυνσης για <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">πρόσβαση των αρχείων σας μέσω WebDAV</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Κρυπτογράφηση"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Όνομα Σύνδεσης"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index cfdde9bef57..f01616c71f5 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "User Login Filter"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την προσπάθεια σύνδεσης χρήστη. %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "χρησιμοποιήστε τη μεταβλητή %%uid, π.χ. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "User List Filter"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=άτομο\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Group Filter"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Ρυθμίσεις Σύνδεσης"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Ενεργοποιηση ρυθμισεων"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Όταν δεν είναι επιλεγμένο, αυτή η ρύθμιση θα πρέπει να παραλειφθεί. "
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Θύρα"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Δημιουργία αντιγράφων ασφαλείας (Replica) Host "
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Δώστε μια προαιρετική εφεδρική υποδοχή. Πρέπει να είναι ένα αντίγραφο του κύριου LDAP / AD διακομιστη."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Απενεργοποιηση του κεντρικου διακομιστη"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Χρήση TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Μην το χρησιμοποιήσετε επιπροσθέτως, για LDAPS συνδέσεις , θα αποτύχει."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Δεν προτείνεται, χρήση μόνο για δοκιμές."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Cache Time-To-Live"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Ρυθμίσεις Καταλόγου"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Πεδίο Ονόματος Χρήστη"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Base User Tree"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Ένα DN βάσης χρηστών ανά γραμμή"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Χαρακτηριστικά αναζήτησης των χρηστών "
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Προαιρετικά? Ένα χαρακτηριστικό ανά γραμμή "
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Group Display Name Field"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Base Group Tree"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Μια ομαδικη Βάση DN ανά γραμμή"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Ομάδα Χαρακτηριστικων Αναζήτηση"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Group-Member association"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Ειδικά Χαρακτηριστικά "
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Ποσοσταση πεδιου"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Προκαθισμενο πεδιο"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "σε bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Email τυπος"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Χρήστης Προσωπικόςφάκελος Ονομασία Κανόνας "
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Δοκιμαστικες ρυθμισεις"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Βοήθεια"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index a58c1135ed9..3def6859364 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -138,59 +138,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr ""
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -198,23 +198,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -378,8 +374,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -579,6 +576,10 @@ msgstr ""
msgid "Log out"
msgstr ""
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -616,14 +617,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index e3737d260a1..8d37893029d 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,15 +120,11 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr ""
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr "Download"
msgid "Unshare"
msgstr ""
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
#: templates/index.php:105
msgid "Upload too large"
msgstr ""
diff --git a/l10n/en@pirate/files_encryption.po b/l10n/en@pirate/files_encryption.po
index 90fdf44019a..00358fec52b 100644
--- a/l10n/en@pirate/files_encryption.po
+++ b/l10n/en@pirate/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index 94c722fa9a3..35c76d3b04b 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/files_trashbin.po b/l10n/en@pirate/files_trashbin.po
index 03673aa9390..c64e4f7a6a2 100644
--- a/l10n/en@pirate/files_trashbin.po
+++ b/l10n/en@pirate/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,17 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index fb244e8b564..bd3831f2741 100644
--- a/l10n/en@pirate/lib.po
+++ b/l10n/en@pirate/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: 2013-07-24 01:55-0400\n"
-"PO-Revision-Date: 2013-07-24 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -34,19 +34,15 @@ msgid "Users"
msgstr ""
#: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
msgid "Admin"
msgstr ""
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: defaults.php:33
+#: defaults.php:35
msgid "web services under your control"
msgstr "web services under your control"
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,54 +202,50 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
-#: template.php:296
+#: template.php:297
msgid "Caused by:"
msgstr ""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index 79163dfbd84..9c6e9df5d64 100644
--- a/l10n/en@pirate/settings.po
+++ b/l10n/en@pirate/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index 3f36998584c..9c7f4649db7 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr ""
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index fb07e265774..0ce78d871f5 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -139,59 +139,59 @@ msgstr "Novembro"
msgid "December"
msgstr "Decembro"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Agordo"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "sekundoj antaŭe"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "antaŭ 1 minuto"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "antaŭ {minutes} minutoj"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "antaŭ 1 horo"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "antaŭ {hours} horoj"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "hodiaŭ"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "hieraŭ"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "antaŭ {days} tagoj"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "lastamonate"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "antaŭ {months} monatoj"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "monatoj antaŭe"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "lastajare"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "jaroj antaŭe"
@@ -199,23 +199,19 @@ msgstr "jaroj antaŭe"
msgid "Choose"
msgstr "Elekti"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Nuligi"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Jes"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Akcepti"
@@ -379,9 +375,10 @@ msgstr "La ĝisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "La pasvorto de ownCloud restariĝis."
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -580,6 +577,10 @@ msgstr "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi."
msgid "Log out"
msgstr "Elsaluti"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "La aŭtomata ensaluto malakceptiĝis!"
@@ -617,14 +618,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Saluton:<br /><br />Ni nur sciigas vin, ke %s kunhavigis “%s” kun vi.<br /><a href=\"%s\">Vidu ĝin</a><br /><br />Ĝis!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "maljena"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "jena"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index ac5fb371eb7..418410ebe52 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -95,12 +95,12 @@ msgstr "Ne haveblas sufiĉa spaco"
msgid "Upload cancelled."
msgstr "La alŝuto nuliĝis."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL ne povas esti malplena."
@@ -108,8 +108,8 @@ msgstr "URL ne povas esti malplena."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nevalida dosierujnomo. La uzo de “Shared” estas rezervita de ownCloud."
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Eraro"
@@ -121,15 +121,11 @@ msgstr "Kunhavigi"
msgid "Delete permanently"
msgstr "Forigi por ĉiam"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Forigi"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Alinomigi"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Traktotaj"
@@ -157,15 +153,13 @@ msgstr "anstataŭiĝis {new_name} per {old_name}"
msgid "undo"
msgstr "malfari"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "plenumi forigan operacion"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 dosiero estas alŝutata"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "dosieroj estas alŝutataj"
@@ -191,43 +185,45 @@ msgstr "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!"
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Via memoro preskaŭ plenas ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
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:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud."
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nomo"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Grando"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Modifita"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 dosierujo"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} dosierujoj"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 dosiero"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} dosierujoj"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -310,6 +306,10 @@ msgstr "Elŝuti"
msgid "Unshare"
msgstr "Malkunhavigi"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Forigi"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Alŝuto tro larĝa"
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index ab2a604eb07..10dcc993da7 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -62,18 +62,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 3a0a3dd5525..215f134b838 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index 7713bebeb5e..def217fe084 100644
--- a/l10n/eo/files_trashbin.po
+++ b/l10n/eo/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr "Nomo"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 dosierujo"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} dosierujoj"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 dosiero"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} dosierujoj"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 3fd499750c1..45f14563ca1 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Uzantoj"
#: app.php:409
-msgid "Apps"
-msgstr "Aplikaĵoj"
-
-#: app.php:417
msgid "Admin"
msgstr "Administranto"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr "La aplikaĵo ne estas kapabligita"
@@ -211,50 +203,46 @@ msgid "seconds ago"
msgstr "sekundoj antaŭe"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "antaŭ 1 minuto"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "antaŭ %d minutoj"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "antaŭ 1 horo"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "antaŭ %d horoj"
-
-#: template/functions.php:85
msgid "today"
msgstr "hodiaŭ"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "hieraŭ"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "antaŭ %d tagoj"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "lastamonate"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "antaŭ %d monatoj"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "lastajare"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "jaroj antaŭe"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 693963c2826..48f4bb536a9 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Konservante..."
@@ -141,31 +145,31 @@ msgstr ""
msgid "Groups"
msgstr "Grupoj"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Grupadministranto"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Forigi"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr ""
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr ""
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Esperanto"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Kunhavigo"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Kapabligi API-on por Kunhavigo"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Kapabligi ligilojn"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Kapabligi rekunhavigon"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Kapabligi uzantojn kunhavigi kun ĉiu ajn"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Protokolo"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Registronivelo"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Pli"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Malpli"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Eldono"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Ĉifrado"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 27bae0873ee..40492891983 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "Filtrilo de uzantensaluto"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Ĝi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataŭigas la uzantonomon en la ensaluta ago."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "uzu la referencilon %%uid, ekz.: \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtrilo de uzantolisto"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Filtrilo de grupo"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Pordo"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Uzi TLS-on"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-servilo blinda je litergrandeco (Vindozo)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Ne rekomendata, uzu ĝin nur por testoj."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Kampo de vidignomo de uzanto"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Baza uzantarbo"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Kampo de vidignomo de grupo"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Baza gruparbo"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Asocio de grupo kaj membro"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "duumoke"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Helpo"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 157f80855b7..9baa98366d8 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -5,6 +5,7 @@
# Translators:
# Art O. Pal <artopal@fastmail.fm>, 2013
# ggam <ggam@brainleakage.com>, 2013
+# I Robot <owncloud-bot@tmit.eu>, 2013
# msoko <sokolovitch@yahoo.com>, 2013
# pablomillaquen <pablomillaquen@gmail.com>, 2013
# saskarip <saskarip@gmail.com>, 2013
@@ -15,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: pablomillaquen <pablomillaquen@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -145,59 +146,59 @@ msgstr "Noviembre"
msgid "December"
msgstr "Diciembre"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "hace segundos"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "hace 1 minuto"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "hace {minutes} minutos"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "Hace 1 hora"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "Hace {hours} horas"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "hoy"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "hace {days} días"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "Hace {months} meses"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "hace meses"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "hace años"
@@ -205,23 +206,19 @@ msgstr "hace años"
msgid "Choose"
msgstr "Seleccionar"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Error cargando la plantilla del seleccionador de archivos"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Aceptar"
@@ -379,15 +376,16 @@ msgid ""
"The update was unsuccessful. Please report this issue to the <a "
"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
"community</a>."
-msgstr "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</ a>."
+msgstr "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>."
#: js/update.js:21
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Reseteo contraseña de ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -586,6 +584,10 @@ msgstr "%s esta disponible. Obtener mas información de como actualizar."
msgid "Log out"
msgstr "Salir"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "¡Inicio de sesión automático rechazado!"
@@ -623,14 +625,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Oye,<br><br>sólo te hago saber que %s compartido %s contigo,<br><a href=\"%s\">\nMíralo!</a><br><br>Disfrutalo!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "anterior"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "siguiente"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/es/files.po b/l10n/es/files.po
index ab79aa69706..a05bd94c82b 100644
--- a/l10n/es/files.po
+++ b/l10n/es/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -99,12 +99,12 @@ msgstr "No hay suficiente espacio disponible"
msgid "Upload cancelled."
msgstr "Subida cancelada."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "La subida del archivo está en proceso. Si sale de la página ahora cancelará la subida."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "La URL no puede estar vacía."
@@ -112,8 +112,8 @@ msgstr "La URL no puede estar vacía."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nombre de carpeta invalido. El uso de \"Shared\" está reservado por ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Error"
@@ -125,15 +125,11 @@ msgstr "Compartir"
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Eliminar"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Renombrar"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Pendiente"
@@ -161,15 +157,13 @@ msgstr "reemplazado {new_name} con {old_name}"
msgid "undo"
msgstr "deshacer"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "Realizar operación de borrado"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "subiendo 1 archivo"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "subiendo archivos"
@@ -195,43 +189,45 @@ msgstr "Su almacenamiento está lleno, ¡no se pueden actualizar o sincronizar m
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nombre de carpeta no es válido. El uso de \"Shared\" está reservado por Owncloud"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nombre"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 carpeta"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} carpetas"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 archivo"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} archivos"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -314,6 +310,10 @@ msgstr "Descargar"
msgid "Unshare"
msgstr "Dejar de compartir"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Eliminar"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Subida demasido grande"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index 19f75204698..7d0a9ee0236 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -68,18 +68,18 @@ msgid ""
"files."
msgstr "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Requisitos incompletos."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 302b80c747a..31ba6d42fae 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index e3ed8dcb356..beb34a8115e 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.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-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 18:40+0000\n"
-"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -53,21 +53,17 @@ msgstr "Nombre"
msgid "Deleted"
msgstr "Eliminado"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 carpeta"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} carpetas"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 archivo"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} archivos"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 7306fcc13c8..2c3194d6870 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Rodrigo Rodríguez <roirobo@ubuntu.org.ni>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-13 05:50+0000\n"
+"Last-Translator: Rodrigo Rodríguez <roirobo@ubuntu.org.ni>\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"
@@ -28,15 +29,15 @@ msgstr "Revisiones"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "No se ha podido revertir {archivo} a revisión {timestamp}."
#: js/versions.js:79
msgid "More versions..."
-msgstr ""
+msgstr "Más..."
#: js/versions.js:116
msgid "No other versions available"
-msgstr ""
+msgstr "No hay otras versiones disponibles"
#: js/versions.js:149
msgid "Restore"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 0ac1ec2a976..f66d906b20d 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: pablomillaquen <pablomillaquen@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -36,14 +36,10 @@ msgid "Users"
msgstr "Usuarios"
#: app.php:409
-msgid "Apps"
-msgstr "Aplicaciones"
-
-#: app.php:417
msgid "Admin"
msgstr "Administración"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Falló la actualización \"%s\"."
@@ -79,10 +75,6 @@ msgid ""
"administrator."
msgstr "Descargue los archivos en trozos más pequeños, por separado o solicítelos amablemente su administrador."
-#: helper.php:235
-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"
@@ -212,50 +204,46 @@ msgid "seconds ago"
msgstr "hace segundos"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "hace 1 minuto"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "hace %d minutos"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "Hace 1 hora"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "Hace %d horas"
-
-#: template/functions.php:85
msgid "today"
msgstr "hoy"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "ayer"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "hace %d días"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "mes pasado"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "Hace %d meses"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "año pasado"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "hace años"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 9f8ce5e7e26..6d6a4b41869 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
-"Last-Translator: pablomillaquen <pablomillaquen@gmail.com>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -126,7 +126,11 @@ msgstr "Error mientras se actualizaba la aplicación"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Guardando..."
@@ -147,31 +151,31 @@ msgstr "No se puede eliminar el usuario"
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Grupo administrador"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Eliminar"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "añadir Grupo"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Se debe usar un nombre de usuario válido"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Error al crear usuario"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Se debe usar una contraseña valida"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Castellano"
@@ -242,106 +246,106 @@ msgstr "Este servidor no tiene una conexión a Internet. Esto significa que algu
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Ejecutar una tarea con cada página cargada"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php está registrado en un servicio WebCron para llamar cron.php una vez por minuto a través de HTTP."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "Usar el servicio cron del sistema para llamar al archivo cron.php una vez por minuto."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Compartiendo"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Activar API de Compartición"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Permitir a las aplicaciones utilizar la API de Compartición"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Permitir enlaces"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Permitir a los usuarios compartir elementos al público con enlaces"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Permitir subidas públicas"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Permitir re-compartición"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Permitir a los usuarios compartir elementos ya compartidos con ellos mismos"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Permitir a los usuarios compartir con todo el mundo"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Seguridad"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Forzar HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forzar a los clientes a conectarse a %s por medio de una conexión encriptada."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación SSL."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Registro"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Nivel de registro"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Más"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -471,6 +475,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Cifrado"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Nombre de usuario"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 27fe83e9fa7..a823ac15748 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -5,13 +5,14 @@
# Translators:
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
# ordenet <roberto@ordenet.com>, 2013
+# Rodrigo Rodríguez <roirobo@ubuntu.org.ni>, 2013
# xhiena <xhiena@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -30,7 +31,7 @@ msgstr "No se pudo borrar la configuración del servidor"
#: ajax/testConfiguration.php:36
msgid "The configuration is valid and the connection could be established!"
-msgstr "La configuración es válida y la conexión puede establecerse!"
+msgstr "¡La configuración es válida y la conexión puede establecerse!"
#: ajax/testConfiguration.php:39
msgid ""
@@ -54,7 +55,7 @@ msgstr "¿Asumir los ajustes actuales de la configuración del servidor?"
#: js/settings.js:83
msgid "Keep settings?"
-msgstr "Mantener la configuración?"
+msgstr "¿Mantener la configuración?"
#: js/settings.js:97
msgid "Cannot add server configuration"
@@ -157,198 +158,185 @@ msgstr "Filtro de inicio de sesión de usuario"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "usar %%uid como comodín, ej: \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Lista de filtros de usuario"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Sin comodines, ej: \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Define el filtro a aplicar, cuando se obtienen grupos."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "sin comodines, ej: \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Configuración de conexión"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Configuracion activa"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Cuando deseleccione, esta configuracion sera omitida."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Puerto"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Servidor de copia de seguridad (Replica)"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Puerto para copias de seguridad (Replica)"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Deshabilitar servidor principal"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "No lo use para conexiones LDAPS, Fallará."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Apagar la validación por certificado SSL."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "No recomendado, sólo para pruebas."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Cache TTL"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "en segundos. Un cambio vacía la caché."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Configuracion de directorio"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Campo de nombre de usuario a mostrar"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Árbol base de usuario"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Un DN Base de Usuario por línea"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Atributos de la busqueda de usuario"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Opcional; un atributo por linea"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Campo de nombre de grupo a mostrar"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Árbol base de grupo"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Un DN Base de Grupo por línea"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Atributos de busqueda de grupo"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Asociación Grupo-Miembro"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Atributos especiales"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Cuota"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Cuota por defecto"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "E-mail"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Regla para la carpeta Home de usuario"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Nombre de usuario interno"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -364,15 +352,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Atributo Nombre de usuario Interno:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Sobrescribir la detección UUID"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -383,15 +371,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "Atributo UUID:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Asignación del Nombre de usuario de un usuario LDAP"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -405,18 +393,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Configuración de prueba"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Ayuda"
diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po
index ddd6637a935..b880f91c7a9 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -6,14 +6,15 @@
# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
# Art O. Pal <artopal@fastmail.fm>, 2012
# pggx999 <pggx999@gmail.com>, 2012
+# Rodrigo Rodríguez <roirobo@ubuntu.org.ni>, 2013
# saskarip <saskarip@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-13 05:50+0000\n"
+"Last-Translator: Rodrigo Rodríguez <roirobo@ubuntu.org.ni>\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"
@@ -27,11 +28,11 @@ msgstr "Autenticación de WevDAV"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "Dirección:"
#: templates/settings.php:7
msgid ""
"The user credentials will be sent to this address. 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 ""
+msgstr "onwCloud enviará las credenciales de usuario a esta dirección. 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 06175e56f3b..4bae50605bd 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -138,59 +138,59 @@ msgstr "noviembre"
msgid "December"
msgstr "diciembre"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Configuración"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "hace 1 minuto"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "hace {minutes} minutos"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 hora atrás"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "hace {hours} horas"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "hoy"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "hace {days} días"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} meses atrás"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "años atrás"
@@ -198,23 +198,19 @@ msgstr "años atrás"
msgid "Choose"
msgstr "Elegir"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Error al cargar la plantilla del seleccionador de archivos"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Aceptar"
@@ -378,9 +374,10 @@ msgstr "La actualización no pudo ser completada. Por favor, reportá el inconve
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Restablecer contraseña de ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -579,6 +576,10 @@ msgstr "%s está disponible. Obtené más información sobre cómo actualizar."
msgid "Log out"
msgstr "Cerrar la sesión"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "¡El inicio de sesión automático fue rechazado!"
@@ -616,14 +617,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Hola,<br><br>Simplemente te informo que %s compartió %s con vos.<br><a href=\"%s\">Miralo acá:</a><br><br>¡Chau!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "anterior"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "siguiente"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 8f694afd293..bc891faa03c 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -96,12 +96,12 @@ msgstr "No hay suficiente espacio disponible"
msgid "Upload cancelled."
msgstr "La subida fue cancelada"
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "La URL no puede estar vacía"
@@ -109,8 +109,8 @@ msgstr "La URL no puede estar vacía"
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nombre de directorio inválido. El uso de \"Shared\" está reservado por ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Error"
@@ -122,15 +122,11 @@ msgstr "Compartir"
msgid "Delete permanently"
msgstr "Borrar permanentemente"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Borrar"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Cambiar nombre"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Pendientes"
@@ -158,15 +154,13 @@ msgstr "se reemplazó {new_name} con {old_name}"
msgid "undo"
msgstr "deshacer"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "Llevar a cabo borrado"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "Subiendo 1 archivo"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "Subiendo archivos"
@@ -192,43 +186,45 @@ msgstr "El almacenamiento está lleno, los archivos no se pueden seguir actualiz
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nombre"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 directorio"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} directorios"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 archivo"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} archivos"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -311,6 +307,10 @@ msgstr "Descargar"
msgid "Unshare"
msgstr "Dejar de compartir"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Borrar"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "El tamaño del archivo que querés subir es demasiado grande"
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index b44892489e0..7c6c7ae472c 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -62,18 +62,18 @@ msgid ""
"files."
msgstr "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde fuera del sistema de ownCloud (por ej. desde tu cuenta de sistema). Podés actualizar tu clave privada en la sección de \"configuración personal\", para recuperar el acceso a tus archivos."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Requisitos incompletos."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Por favor, asegurate que PHP 5.3.3 o posterior esté instalado y que la extensión OpenSSL de PHP esté habilitada y configurada correctamente. Por el momento, la aplicación de encriptación está deshabilitada."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index 1af48d91541..b2d33b62c59 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index aa606643312..bdec790f40d 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr "Nombre"
msgid "Deleted"
msgstr "Borrado"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 directorio"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} directorios"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 archivo"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} archivos"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 97230b87fe8..b557cf5ae76 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Usuarios"
#: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
msgid "Admin"
msgstr "Administración"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "No se pudo actualizar \"%s\"."
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr "Descargá los archivos en partes más chicas, de forma separada, o pedíselos al administrador"
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "no se pudo determinar"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "La aplicación no está habilitada"
@@ -211,50 +203,46 @@ msgid "seconds ago"
msgstr "segundos atrás"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "hace 1 minuto"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "hace %d minutos"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "hace 1 hora"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "hace %d horas"
-
-#: template/functions.php:85
msgid "today"
msgstr "hoy"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "ayer"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "hace %d días"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "el mes pasado"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "hace %d meses"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "el año pasado"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "años atrás"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 32f1d08a5a5..9eaa7d4e7ea 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -122,7 +122,11 @@ msgstr "Error al actualizar App"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Guardando..."
@@ -143,31 +147,31 @@ msgstr "Imposible borrar usuario"
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Grupo Administrador"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Borrar"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "agregar grupo"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Debe ingresar un nombre de usuario válido"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Error creando usuario"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Debe ingresar una contraseña válida"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Castellano (Argentina)"
@@ -238,106 +242,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Ejecutá una tarea con cada pagina cargada."
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Compartiendo"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Habilitar Share API"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Permitir a las aplicaciones usar la Share API"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Permitir enlaces"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Permitir a los usuarios compartir enlaces públicos"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Permitir subidas públicas"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Permitir que los usuarios autoricen a otros a subir archivos en sus directorios públicos compartidos"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Permitir Re-Compartir"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Permite a los usuarios volver a compartir items que les fueron compartidos"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Permitir a los usuarios compartir con cualquiera."
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Permitir a los usuarios compartir sólo con los de sus mismos grupos"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Seguridad"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Forzar HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Log"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Nivel de Log"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Más"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Usá esta dirección para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a tus archivos a través de WebDAV</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Encriptación"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Nombre de Usuario"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 2dc80662497..2e1635a672f 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -155,198 +155,185 @@ msgstr "Filtro de inicio de sesión de usuario"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "usar %%uid como plantilla, p. ej.: \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Lista de filtros de usuario"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Sin plantilla, p. ej.: \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Define el filtro a aplicar cuando se obtienen grupos."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Configuración de Conección"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Configuración activa"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Si no está seleccionada, esta configuración será omitida."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Puerto"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Host para copia de seguridad (réplica)"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP/AD."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Puerto para copia de seguridad (réplica)"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Deshabilitar el Servidor Principal"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "No usar adicionalmente para conexiones LDAPS, las mismas fallarán"
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Desactivar la validación por certificado SSL."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "No recomendado, sólo para pruebas."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Tiempo de vida del caché"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "en segundos. Cambiarlo vacía la cache."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Configuración de Directorio"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Campo de nombre de usuario a mostrar"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Árbol base de usuario"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Una DN base de usuario por línea"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Atributos de la búsqueda de usuario"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Opcional; un atributo por linea"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Campo de nombre de grupo a mostrar"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Árbol base de grupo"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Una DN base de grupo por línea"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Atributos de búsqueda de grupo"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Asociación Grupo-Miembro"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Atributos Especiales"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Campo de cuota"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Cuota por defecto"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Campo de e-mail"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Regla de nombre de los directorios de usuario"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Nombre interno de usuario"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Atributo Nombre Interno de usuario:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Sobrescribir la detección UUID"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "Atributo UUID:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Asignación del Nombre de usuario de un usuario LDAP"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Probar configuración"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Ayuda"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 04f1e2fcfb1..57158ce0f0e 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\n"
+"PO-Revision-Date: 2013-08-22 09:40+0000\n"
"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -139,83 +139,79 @@ msgstr "November"
msgid "December"
msgstr "Detsember"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Seaded"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "sekundit tagasi"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 minut tagasi"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n minut tagasi"
+msgstr[1] "%n minutit tagasi"
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minutit tagasi"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n tund tagasi"
+msgstr[1] "%n tundi tagasi"
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 tund tagasi"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} tundi tagasi"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "täna"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "eile"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} päeva tagasi"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "%n päev tagasi"
+msgstr[1] "%n päeva tagasi"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "viimasel kuul"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} kuud tagasi"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n kuu tagasi"
+msgstr[1] "%n kuud tagasi"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "kuu tagasi"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "viimasel aastal"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "aastat tagasi"
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
msgid "Choose"
msgstr "Vali"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Loobu"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
msgid "Error loading file picker template"
msgstr "Viga failivalija malli laadimisel"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:168
msgid "Yes"
msgstr "Jah"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:178
msgid "No"
msgstr "Ei"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:195
msgid "Ok"
msgstr "Ok"
@@ -379,9 +375,10 @@ msgstr "Uuendus ebaõnnestus. Palun teavita probleemidest <a href=\"https://git
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud parooli taastamine"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "%s parooli lähtestus"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -580,6 +577,10 @@ msgstr "%s on saadaval. Vaata lähemalt kuidas uuendada."
msgid "Log out"
msgstr "Logi välja"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Rohkem rakendusi"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automaatne sisselogimine lükati tagasi!"
@@ -617,14 +618,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Hei,<br><br>lihtsalt annan sulle teada, et %s jagas sinuga »%s«.<br><a href=\"%s\">Vaata seda!</a><br><br>Tervitades!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "eelm"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "järgm"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 97ccf238bd6..582197b1dcd 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-22 10:35-0400\n"
+"PO-Revision-Date: 2013-08-22 09:50+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
@@ -96,21 +96,21 @@ msgstr "Pole piisavalt ruumi"
msgid "Upload cancelled."
msgstr "Üleslaadimine tühistati."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:234 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL ei saa olla tühi."
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:239 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Viga"
@@ -122,15 +122,11 @@ msgstr "Jaga"
msgid "Delete permanently"
msgstr "Kustuta jäädavalt"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Kustuta"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Nimeta ümber"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Ootel"
@@ -158,15 +154,13 @@ msgstr "asendas nime {old_name} nimega {new_name}"
msgid "undo"
msgstr "tagasi"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "teosta kustutamine"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "Laadin üles %n faili"
+msgstr[1] "Laadin üles %n faili"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 fail üleslaadimisel"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "faili üleslaadimisel"
@@ -192,43 +186,45 @@ msgstr "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!"
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Su andmemaht on peaaegu täis ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks."
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. "
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nimi"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Suurus"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Muudetud"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 kaust"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n kataloog"
+msgstr[1] "%n kataloogi"
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} kausta"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 fail"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} faili"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fail"
+msgstr[1] "%n faili"
#: lib/app.php:73
#, php-format
@@ -311,6 +307,10 @@ msgstr "Lae alla"
msgid "Unshare"
msgstr "Lõpeta jagamine"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Kustuta"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Üleslaadimine on liiga suur"
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index 048a22c0203..317dc437d51 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/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: 2013-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
@@ -63,20 +63,20 @@ msgid ""
"files."
msgstr "Sinu privaatne võti pole toimiv! Tõenäoliselt on sinu parool muutunud väljaspool ownCloud süsteemi (näiteks ettevõtte keskhaldus). Sa saad uuendada oma privaatse võtme parooli seadete all taastamaks ligipääsu oma krüpteeritud failidele."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Nõutavad on puudu."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Veendu, et kasutusel oleks PHP 5.3.3 või uuem versioon ning kasutusel oleks OpenSSL PHP laiendus ja see on korrektselt seadistatud. Hetkel on krüpteerimise rakenduse kasutamine peatatud."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud."
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Järgmised kasutajad pole seadistatud krüpteeringuks:"
#: js/settings-admin.js:11
msgid "Saving..."
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 0eb4a12a9d8..557d32037ad 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
# Rivo Zängov <eraser@eraser.ee>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
@@ -32,27 +33,27 @@ msgstr "Saada"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Vabandust, see link ei tundu enam toimivat."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Põhjused võivad olla:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "üksus on eemaldatud"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "link on aegunud"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "jagamine on peatatud"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole."
#: templates/public.php:15
#, php-format
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index 577928cf3c8..c40a3012745 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\n"
+"PO-Revision-Date: 2013-08-22 09:50+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
@@ -51,25 +52,21 @@ msgstr "Nimi"
msgid "Deleted"
msgstr "Kustutatud"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 kaust"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] "%n kataloogi"
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} kausta"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 fail"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} faili"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fail"
+msgstr[1] "%n faili"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
-msgstr ""
+msgstr "taastatud"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index b8e03a31424..cfb0bfca4a3 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
# Rivo Zängov <eraser@eraser.ee>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-12 10:40+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
@@ -29,15 +30,15 @@ msgstr "Versioonid"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "Ebaõnnestus faili {file} taastamine revisjonile {timestamp}"
#: js/versions.js:79
msgid "More versions..."
-msgstr ""
+msgstr "Rohkem versioone..."
#: js/versions.js:116
msgid "No other versions available"
-msgstr ""
+msgstr "Muid versioone pole saadaval"
#: js/versions.js:149
msgid "Restore"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index e54afea757d..23ab2c23ea6 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\n"
+"PO-Revision-Date: 2013-08-22 09:40+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"
@@ -36,14 +36,10 @@ msgid "Users"
msgstr "Kasutajad"
#: app.php:409
-msgid "Apps"
-msgstr "Rakendused"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Ebaõnnestunud uuendus \"%s\"."
@@ -79,10 +75,6 @@ msgid ""
"administrator."
msgstr "Laadi failid alla eraldi väiksemate osadena või küsi nõu oma süsteemiadminstraatorilt."
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "ei suudetud tuvastada"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Rakendus pole sisse lülitatud"
@@ -212,50 +204,46 @@ msgid "seconds ago"
msgstr "sekundit tagasi"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 minut tagasi"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] "%n minutit tagasi"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minutit tagasi"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] "%n tundi tagasi"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 tund tagasi"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d tundi tagasi"
-
-#: template/functions.php:85
msgid "today"
msgstr "täna"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "eile"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d päeva tagasi"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] "%n päeva tagasi"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "viimasel kuul"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d kuud tagasi"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] "%n kuud tagasi"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "viimasel aastal"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "aastat tagasi"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 71801ca7408..f2560807175 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\n"
+"PO-Revision-Date: 2013-08-22 09:30+0000\n"
"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -122,7 +122,11 @@ msgstr "Viga rakenduse uuendamisel"
msgid "Updated"
msgstr "Uuendatud"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega."
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Salvestamine..."
@@ -143,31 +147,31 @@ msgstr "Kasutaja eemaldamine ebaõnnestus"
msgid "Groups"
msgstr "Grupid"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Grupi admin"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Kustuta"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "lisa grupp"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Sisesta nõuetele vastav kasutajatunnus"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Viga kasutaja loomisel"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Sisesta nõuetele vastav parool"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Eesti"
@@ -238,106 +242,106 @@ msgstr "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funkt
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Käivita toiming lehe laadimisel"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php on registreeritud webcron teenusena laadimaks cron.php iga minut üle http."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "Kasuta süsteemi cron teenust käivitamaks faili cron.php kord minutis."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Jagamine"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Luba Share API"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Luba rakendustel kasutada Share API-t"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Luba lingid"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Luba kasutajatel jagada kirjeid avalike linkidega"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Luba avalikud üleslaadimised"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Luba kasutajatel üleslaadimine teiste poolt oma avalikult jagatud kataloogidesse "
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Luba edasijagamine"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Luba kasutajatel kõigiga jagada"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Turvalisus"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Sunni peale HTTPS-i kasutamine"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Sunnib kliente %s ühenduma krüpteeritult."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Logi"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Logi tase"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Rohkem"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Vähem"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versioon"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Kasuta seda aadressi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Krüpteerimine"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid"
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr "Sisselogimise parool"
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr "Dekrüpteeri kõik failid"
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Kasutajanimi"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 9a4e6f7aa13..f0267918f4d 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\n"
+"PO-Revision-Date: 2013-08-22 09:40+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
@@ -92,7 +92,7 @@ msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behavior. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "<b>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada."
#: templates/settings.php:12
msgid ""
@@ -156,198 +156,185 @@ msgstr "Kasutajanime filter"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Kasutajate nimekirja filter"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Määrab kasutajaid hankides filtri, mida rakendatakse."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr "Määrab kasutajate leidmiseks kasutatava filtri (ilma muutujateta). Näide: \"objectClass=person\""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Grupi filter"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Määrab gruppe hankides filtri, mida rakendatakse."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr "Määrab gruppide leidmiseks kasutatava filtri (ilma muutujateta). Näide: \"objectClass=posixGroup\""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Ühenduse seaded"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Seadistus aktiivne"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Kui märkimata, siis seadistust ei kasutata"
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Varuserver"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Lisa täiendav LDAP/AD server, mida replikeeritakse peaserveriga."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Varuserveri (replika) port"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Ära kasuta peaserverit"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Ühendu ainult replitseeriva serveriga."
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Kasuta TLS-i"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "LDAPS puhul ära kasuta. Ühendus ei toimi."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Mittetõstutundlik LDAP server (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Lülita SSL sertifikaadi kontrollimine välja."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Pole soovitatav, kasuta ainult testimiseks."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr "Pole soovitatav, kasuta seda ainult testimiseks! Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma %s serverisse."
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Puhvri iga"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "sekundites. Muudatus tühjendab vahemälu."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Kataloogi seaded"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Kasutaja näidatava nime väli"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "LDAP atribuut, mida kasutatakse kasutaja kuvatava nime loomiseks."
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Baaskasutaja puu"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Üks kasutajate baas-DN rea kohta"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Kasutaja otsingu atribuudid"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Valikuline; üks atribuut rea kohta"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Grupi näidatava nime väli"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "LDAP atribuut, mida kasutatakse ownCloudi grupi kuvatava nime loomiseks."
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Baasgrupi puu"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Üks grupi baas-DN rea kohta"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Grupi otsingu atribuudid"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Grupiliikme seotus"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Spetsiifilised atribuudid"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Mahupiirangu atribuut"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Vaikimisi mahupiirang"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "baitides"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Email atribuut"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Kasutaja kodukataloogi nimetamise reegel"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Sisemine kasutajanimi"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,17 +348,17 @@ msgid ""
"behavior as before ownCloud 5 enter the user display name attribute in the "
"following field. Leave it empty for default behavior. Changes will have "
"effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URLi osaks, näiteks kõikidel *DAV teenustel. Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi."
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Sisemise kasutajatunnuse atribuut:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Tühista UUID tuvastus"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,17 +367,17 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behavior. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Vaikimis ownCloud tuvastab automaatselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi."
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "UUID atribuut:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "LDAP-Kasutajatunnus Kasutaja Vastendus"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,20 +389,20 @@ msgid ""
" is not configuration sensitive, it affects all LDAP configurations! Never "
"clear the mappings in a production environment, only in a testing or "
"experimental stage."
-msgstr ""
+msgstr "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, peab iga LDAP kasutaja omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutajanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas."
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Puhasta LDAP-Grupinimi Grupp Vastendus"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Testi seadistust"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Abiinfo"
diff --git a/l10n/et_EE/user_webdavauth.po b/l10n/et_EE/user_webdavauth.po
index 9acee7ab2cc..575c051d6aa 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-13 09:11-0400\n"
+"PO-Revision-Date: 2013-08-12 10:40+0000\n"
+"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
@@ -25,11 +25,11 @@ msgstr "WebDAV autentimine"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "Aadress:"
#: templates/settings.php:7
msgid ""
"The user credentials will be sent to this address. 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 ""
+msgstr "ownCloud saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab HTTP vastuskoodid 401 ja 403 kui vigased, ning kõik teised vastused kui korrektsed kasutajatunnused."
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 6c08ab0fce1..ffc6f231bfc 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -139,59 +139,59 @@ msgstr "Azaroa"
msgid "December"
msgstr "Abendua"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Ezarpenak"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "segundu"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "orain dela minutu 1"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "orain dela {minutes} minutu"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "orain dela ordu bat"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "orain dela {hours} ordu"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "gaur"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "atzo"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "orain dela {days} egun"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "joan den hilabetean"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "orain dela {months} hilabete"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "hilabete"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "joan den urtean"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "urte"
@@ -199,23 +199,19 @@ msgstr "urte"
msgid "Choose"
msgstr "Aukeratu"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Ezeztatu"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Bai"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ez"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ados"
@@ -379,9 +375,10 @@ msgstr "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud-en pasahitza berrezarri"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -580,6 +577,10 @@ msgstr "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu."
msgid "Log out"
msgstr "Saioa bukatu"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Saio hasiera automatikoa ez onartuta!"
@@ -617,14 +618,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.<br><a href=\"%s\">\nIkusi ezazu</a><br><br>Ongi jarraitu!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "aurrekoa"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "hurrengoa"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 3275700171a..ac39bb91058 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -95,12 +95,12 @@ msgstr "Ez dago leku nahikorik."
msgid "Upload cancelled."
msgstr "Igoera ezeztatuta"
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URLa ezin da hutsik egon."
@@ -108,8 +108,8 @@ msgstr "URLa ezin da hutsik egon."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Karpeta izne baliogabea. \"Shared\" karpeta erabilpena OwnCloudentzat erreserbaturik dago."
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Errorea"
@@ -121,15 +121,11 @@ msgstr "Elkarbanatu"
msgid "Delete permanently"
msgstr "Ezabatu betirako"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Ezabatu"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Berrizendatu"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Zain"
@@ -157,15 +153,13 @@ msgstr " {new_name}-k {old_name} ordezkatu du"
msgid "undo"
msgstr "desegin"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "Ezabatu"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "fitxategi 1 igotzen"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "fitxategiak igotzen"
@@ -191,43 +185,45 @@ msgstr "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. "
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Izena"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Tamaina"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Aldatuta"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "karpeta bat"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} karpeta"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "fitxategi bat"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} fitxategi"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -310,6 +306,10 @@ msgstr "Deskargatu"
msgid "Unshare"
msgstr "Ez elkarbanatu"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Ezabatu"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Igoera handiegia da"
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index cde99dedab2..456db338acb 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -64,18 +64,18 @@ msgid ""
"files."
msgstr "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza ownCloud sistematik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Eskakizun batzuk ez dira betetzen."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Ziurtatu PHP 5.3.3 edo berriagoa instalatuta dagoela eta PHPren OpenSSL gehigarria gaituta eta ongi konfiguratuta dagoela. Oraingoz enkriptazio programa ez dago gaituta."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 81b2f6c18a9..e633bd97d7a 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index 6a38e375fa3..ee2efd48c1b 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr "Izena"
msgid "Deleted"
msgstr "Ezabatuta"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "karpeta bat"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} karpeta"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "fitxategi bat"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} fitxategi"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index 3cfce3b6f4b..2aa6a48b61e 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -36,14 +36,10 @@ msgid "Users"
msgstr "Erabiltzaileak"
#: app.php:409
-msgid "Apps"
-msgstr "Aplikazioak"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Ezin izan da \"%s\" eguneratu."
@@ -79,10 +75,6 @@ msgid ""
"administrator."
msgstr "Deskargatu fitzategiak zati txikiagoetan, banan-banan edo eskatu mesedez zure administradoreari"
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "ezin izan da zehaztu"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Aplikazioa ez dago gaituta"
@@ -212,50 +204,46 @@ msgid "seconds ago"
msgstr "segundu"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "orain dela minutu 1"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "orain dela %d minutu"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "orain dela ordu bat"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "orain dela %d ordu"
-
-#: template/functions.php:85
msgid "today"
msgstr "gaur"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "atzo"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "orain dela %d egun"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "joan den hilabetean"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "orain dela %d hilabete"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "joan den urtean"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "urte"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 1bcb0d13906..1d71b7b9554 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -122,7 +122,11 @@ msgstr "Errorea aplikazioa eguneratzen zen bitartean"
msgid "Updated"
msgstr "Eguneratuta"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Gordetzen..."
@@ -143,31 +147,31 @@ msgstr "Ezin izan da erabiltzailea aldatu"
msgid "Groups"
msgstr "Taldeak"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Talde administradorea"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Ezabatu"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "gehitu taldea"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Baliozko erabiltzaile izena eman behar da"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Errore bat egon da erabiltzailea sortzean"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Baliozko pasahitza eman behar da"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Euskera"
@@ -238,106 +242,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Exekutatu zeregin bat orri karga bakoitzean"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php webcron zerbitzu batean erregistratua dago cron.php minuturo http bidez deitzeko."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "Erabili sistemaren cron zerbitzua cron.php fitxategia minuturo deitzeko."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Partekatzea"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Gaitu Elkarbanatze APIa"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Baimendu loturak"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Baimendu igoera publikoak"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Baimendu erabiltzaileak besteak bere partekatutako karpetetan fitxategiak igotzea"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Baimendu birpartekatzea"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Baimendu erabiltzaileak edonorekin elkarbanatzen"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Segurtasuna"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Behartu HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Egunkaria"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Erregistro maila"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Gehiago"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Gutxiago"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Bertsioa"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Enkriptazioa"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Sarrera Izena"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 2627732cb8d..e9c2fb101c7 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -155,198 +155,185 @@ msgstr "Erabiltzaileen saioa hasteko iragazkia"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Erabiltzaile zerrendaren Iragazkia"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "txantiloirik gabe, adb. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Taldeen iragazkia"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Konexio Ezarpenak"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Konfigurazio Aktiboa"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Markatuta ez dagoenean, konfigurazio hau ez da kontutan hartuko."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Portua"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Babeskopia (Replica) Ostalaria"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Eman babeskopia ostalari gehigarri bat. LDAP/AD zerbitzari nagusiaren replica bat izan behar da."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Babeskopia (Replica) Ataka"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Desgaitu Zerbitzari Nagusia"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Erabili TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Ez erabili LDAPS konexioetarako, huts egingo du."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Katxearen Bizi-Iraupena"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "segundutan. Aldaketak katxea husten du."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Karpetaren Ezarpenak"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Oinarrizko Erabiltzaile Zuhaitza"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Erabiltzaile DN Oinarri bat lerroko"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Erabili Bilaketa Atributuak "
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Aukerakoa; atributu bat lerro bakoitzeko"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Taldeen bistaratzeko izena duen eremua"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Oinarrizko Talde Zuhaitza"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Talde DN Oinarri bat lerroko"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Taldekatu Bilaketa Atributuak "
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Talde-Kide elkarketak"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Atributu Bereziak"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Kuota Eremua"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Kuota Lehenetsia"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "bytetan"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Eposta eremua"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Barneko erabiltzaile izena"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Egiaztatu Konfigurazioa"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Laguntza"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 576a489ef39..1075ec5c3e9 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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -138,59 +138,55 @@ msgstr "نوامبر"
msgid "December"
msgstr "دسامبر"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "تنظیمات"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "ثانیه‌ها پیش"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 دقیقه پیش"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{دقیقه ها} دقیقه های پیش"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 ساعت پیش"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{ساعت ها} ساعت ها پیش"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "امروز"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "دیروز"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{روزها} روزهای پیش"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "ماه قبل"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{ماه ها} ماه ها پیش"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "ماه‌های قبل"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "سال قبل"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "سال‌های قبل"
@@ -198,23 +194,19 @@ msgstr "سال‌های قبل"
msgid "Choose"
msgstr "انتخاب کردن"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "منصرف شدن"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "خطا در بارگذاری قالب انتخاب کننده فایل"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "بله"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "نه"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "قبول"
@@ -378,9 +370,10 @@ msgstr "به روز رسانی ناموفق بود. لطفا این خطا را
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "پسورد ابرهای شما تغییرکرد"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -579,6 +572,10 @@ msgstr "%s در دسترس است. برای چگونگی به روز رسانی
msgid "Log out"
msgstr "خروج"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "ورود به سیستم اتوماتیک ردشد!"
@@ -616,14 +613,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "اینجا<br><br> فقط به شما اجازه میدهد که بدانید %s به اشتراک گذاشته شده»%s« توسط شما.<br><a href=\"%s\"> مشاهده آن!</a><br><br> به سلامتی!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "بازگشت"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "بعدی"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 1317b3c7247..a5fd2a7adb4 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -95,12 +95,12 @@ msgstr "فضای کافی در دسترس نیست"
msgid "Upload cancelled."
msgstr "بار گذاری لغو شد"
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. "
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL نمی تواند خالی باشد."
@@ -108,8 +108,8 @@ msgstr "URL نمی تواند خالی باشد."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "نام پوشه نامعتبر است. استفاده از 'به اشتراک گذاشته شده' متعلق به ownCloud میباشد."
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "خطا"
@@ -121,15 +121,11 @@ msgstr "اشتراک‌گذاری"
msgid "Delete permanently"
msgstr "حذف قطعی"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "حذف"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "تغییرنام"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "در انتظار"
@@ -157,15 +153,12 @@ msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد."
msgid "undo"
msgstr "بازگشت"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "انجام عمل حذف"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 پرونده آپلود شد."
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "بارگذاری فایل ها"
@@ -191,43 +184,43 @@ msgstr "فضای ذخیره ی شما کاملا پر است، بیش از ای
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است."
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "نام"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "اندازه"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "تاریخ"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 پوشه"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{ شمار} پوشه ها"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 پرونده"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{ شمار } فایل ها"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/app.php:73
#, php-format
@@ -310,6 +303,10 @@ msgstr "دانلود"
msgid "Unshare"
msgstr "لغو اشتراک"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "حذف"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)"
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index ac77efb7663..4e22a4b067c 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -62,18 +62,18 @@ msgid ""
"files."
msgstr "کلید خصوصی شما معتبر نمی باشد! ظاهرا رمزعبور شما بیرون از سیستم ownCloud تغییر یافته است( به عنوان مثال پوشه سازمان شما ). شما میتوانید رمزعبور کلید خصوصی خود را در تنظیمات شخصیتان به روز کنید تا بتوانید به فایل های رمزگذاری شده خود را دسترسی داشته باشید."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "نیازمندی های گمشده"
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "لطفا مطمئن شوید که PHP 5.3.3 یا جدیدتر نصب شده و پسوند OpenSSL PHP فعال است و به درستی پیکربندی شده است. در حال حاضر، برنامه رمزگذاری غیر فعال شده است."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index a39839bae35..84ebd4737a2 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index 82f4d47d036..b7425ae04ba 100644
--- a/l10n/fa/files_trashbin.po
+++ b/l10n/fa/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,15 @@ msgstr "نام"
msgid "Deleted"
msgstr "حذف شده"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 پوشه"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{ شمار} پوشه ها"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 پرونده"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{ شمار } فایل ها"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index a547252a6b0..94d2683d00d 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "کاربران"
#: app.php:409
-msgid "Apps"
-msgstr " برنامه ها"
-
-#: app.php:417
msgid "Admin"
msgstr "مدیر"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "نمیتواند مشخص شود"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "برنامه فعال نشده است"
@@ -211,50 +203,42 @@ msgid "seconds ago"
msgstr "ثانیه‌ها پیش"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 دقیقه پیش"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d دقیقه پیش"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 ساعت پیش"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d ساعت پیش"
-
-#: template/functions.php:85
msgid "today"
msgstr "امروز"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "دیروز"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d روز پیش"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "ماه قبل"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%dماه پیش"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "سال قبل"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "سال‌های قبل"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 6c0c4eb1e48..a81077fb92f 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -121,7 +121,11 @@ msgstr "خطا در هنگام بهنگام سازی برنامه"
msgid "Updated"
msgstr "بروز رسانی انجام شد"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "در حال ذخیره سازی..."
@@ -142,31 +146,31 @@ msgstr "حذف کاربر امکان پذیر نیست"
msgid "Groups"
msgstr "گروه ها"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "گروه مدیران"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "حذف"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "افزودن گروه"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "نام کاربری صحیح باید وارد شود"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "خطا در ایجاد کاربر"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "رمز عبور صحیح باید وارد شود"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -237,106 +241,106 @@ msgstr ""
msgid "Cron"
msgstr "زمانبند"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "اجرای یک وظیفه با هر بار بارگذاری صفحه"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "اشتراک گذاری"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "فعال کردن API اشتراک گذاری"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "اجازه ی لینک ها"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "مجوز اشتراک گذاری مجدد"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "اجازه به کاربران برای اشتراک گذاری دوباره با آنها"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "اجازه به کابران برای اشتراک گذاری با همه"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "اجازه به کاربران برای اشتراک گذاری ، تنها با دیگر کابران گروه خودشان"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "امنیت"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "وادار کردن HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "کارنامه"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "سطح ورود"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "بیش‌تر"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "کم‌تر"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "نسخه"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "استفاده ابن آدرس <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\"> برای دسترسی فایل های شما از طریق WebDAV </a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "رمزگذاری"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "نام کاربری"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 138ed1e8fa6..dabbd41a9ce 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -155,198 +155,185 @@ msgstr "فیلتر ورودی کاربر"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "فیلتر گروه"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "بدون هیچ گونه حفره یا سوراخ، به عنوان مثال، \"objectClass = posixGroup\"."
-
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "تنظیمات اتصال"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "پیکربندی فعال"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "زمانیکه انتخاب نشود، این پیکربندی نادیده گرفته خواهد شد."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "درگاه"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "پشتیبان گیری (بدل) میزبان"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "پشتیبان گیری (بدل) پورت"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "غیر فعال کردن سرور اصلی"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "استفاده ازTLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "علاوه بر این برای اتصالات LDAPS از آن استفاده نکنید، با شکست مواجه خواهد شد."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "غیر حساس به بزرگی و کوچکی حروف LDAP سرور (ویندوز)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "غیرفعال کردن اعتبار گواهی نامه SSL ."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "توصیه نمی شود، تنها برای آزمایش استفاده کنید."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "تنظیمات پوشه"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "فیلد نام کاربر"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "کاربر درخت پایه"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "یک کاربر پایه DN در هر خط"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "ویژگی های جستجوی کاربر"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "اختیاری؛ یک ویژگی در هر خط"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "فیلد نام گروه"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "گروه درخت پایه "
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "یک گروه پایه DN در هر خط"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "گروه صفات جستجو"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "انجمن گروه کاربران"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "ویژگی های مخصوص"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "سهمیه بندی انجام نشد."
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "سهمیه بندی پیش فرض"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "در بایت"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "ایمیل ارسال نشد."
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "قانون نامگذاری پوشه خانه کاربر"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "خالی گذاشتن برای نام کاربری (پیش فرض). در غیر این صورت، تعیین یک ویژگی LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "نام کاربری داخلی"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "ویژگی نام کاربری داخلی:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "نادیده گرفتن تشخیص UUID "
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "صفت UUID:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "نام کاربری - نگاشت کاربر LDAP "
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "پاک کردن نام کاربری- LDAP نگاشت کاربر "
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "پاک کردن نام گروه -LDAP گروه نقشه برداری"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "امتحان پیکربندی"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "راه‌نما"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 72b034badb4..9ca82320bcc 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -138,59 +138,59 @@ msgstr "marraskuu"
msgid "December"
msgstr "joulukuu"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Asetukset"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "sekuntia sitten"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 minuutti sitten"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n minuutti sitten"
+msgstr[1] "%n minuuttia sitten"
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minuuttia sitten"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n tunti sitten"
+msgstr[1] "%n tuntia sitten"
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 tunti sitten"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} tuntia sitten"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "tänään"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "eilen"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} päivää sitten"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "%n päivä sitten"
+msgstr[1] "%n päivää sitten"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "viime kuussa"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} kuukautta sitten"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n kuukausi sitten"
+msgstr[1] "%n kuukautta sitten"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "kuukautta sitten"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "viime vuonna"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "vuotta sitten"
@@ -198,23 +198,19 @@ msgstr "vuotta sitten"
msgid "Choose"
msgstr "Valitse"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Peru"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Kyllä"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ei"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ok"
@@ -285,7 +281,7 @@ msgstr "Salasana"
#: js/share.js:198
msgid "Allow Public Upload"
-msgstr ""
+msgstr "Salli julkinen lähetys"
#: js/share.js:202
msgid "Email link to person"
@@ -378,9 +374,10 @@ msgstr "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud-salasanan nollaus"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -579,6 +576,10 @@ msgstr "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan."
msgid "Log out"
msgstr "Kirjaudu ulos"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Lisää sovelluksia"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automaattinen sisäänkirjautuminen hylättiin!"
@@ -616,14 +617,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Hei!<br><br>%s jakoi kohteen »%s« kanssasi.<br><a href=\"%s\">Katso se tästä!</a><br><br>Näkemiin!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "edellinen"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "seuraava"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 303c76c8899..dcf22e09ae1 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -95,12 +95,12 @@ msgstr "Tilaa ei ole riittävästi"
msgid "Upload cancelled."
msgstr "Lähetys peruttu."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "Verkko-osoite ei voi olla tyhjä"
@@ -108,8 +108,8 @@ msgstr "Verkko-osoite ei voi olla tyhjä"
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Virhe"
@@ -121,15 +121,11 @@ msgstr "Jaa"
msgid "Delete permanently"
msgstr "Poista pysyvästi"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Poista"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Nimeä uudelleen"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Odottaa"
@@ -157,15 +153,13 @@ msgstr ""
msgid "undo"
msgstr "kumoa"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "suorita poistotoiminto"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "Lähetetään %n tiedosto"
+msgstr[1] "Lähetetään %n tiedostoa"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -191,43 +185,45 @@ msgstr "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkro
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Tallennustila on melkein loppu ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
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:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nimi"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Koko"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Muokattu"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 kansio"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} kansiota"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 tiedosto"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n kansio"
+msgstr[1] "%n kansiota"
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} tiedostoa"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n tiedosto"
+msgstr[1] "%n tiedostoa"
#: lib/app.php:73
#, php-format
@@ -310,6 +306,10 @@ msgstr "Lataa"
msgid "Unshare"
msgstr "Peru jakaminen"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Poista"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Lähetettävä tiedosto on liian suuri"
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index 732087d4ef5..d9687472967 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -62,18 +62,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 6194c089988..fd6c9d78d87 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index 2b355bfe39f..717af8af88c 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/files_trashbin.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-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 06:10+0000\n"
+"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"PO-Revision-Date: 2013-08-15 09:01+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"
@@ -52,21 +52,17 @@ msgstr "Nimi"
msgid "Deleted"
msgstr "Poistettu"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 kansio"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} kansiota"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 tiedosto"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} tiedostoa"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n kansio"
+msgstr[1] "%n kansiota"
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n tiedosto"
+msgstr[1] "%n tiedostoa"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index ba476ca2d4f..9a990b0377b 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Käyttäjät"
#: app.php:409
-msgid "Apps"
-msgstr "Sovellukset"
-
-#: app.php:417
msgid "Admin"
msgstr "Ylläpitäjä"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-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"
@@ -211,56 +203,52 @@ msgid "seconds ago"
msgstr "sekuntia sitten"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 minuutti sitten"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n minuutti sitten"
+msgstr[1] "%n minuuttia sitten"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minuuttia sitten"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n tunti sitten"
+msgstr[1] "%n tuntia sitten"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 tunti sitten"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d tuntia sitten"
-
-#: template/functions.php:85
msgid "today"
msgstr "tänään"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "eilen"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d päivää sitten"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] "%n päivä sitten"
+msgstr[1] "%n päivää sitten"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "viime kuussa"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d kuukautta sitten"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n kuukausi sitten"
+msgstr[1] "%n kuukautta sitten"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "viime vuonna"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "vuotta sitten"
#: template.php:297
msgid "Caused by:"
-msgstr ""
+msgstr "Aiheuttaja:"
#: vcategories.php:188 vcategories.php:249
#, php-format
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 381015dd21e..3bdd091b224 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\n"
+"PO-Revision-Date: 2013-08-21 19:00+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -121,7 +121,11 @@ msgstr "Virhe sovellusta päivittäessä"
msgid "Updated"
msgstr "Päivitetty"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa."
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Tallennetaan..."
@@ -142,31 +146,31 @@ msgstr "Käyttäjän poistaminen ei onnistunut"
msgid "Groups"
msgstr "Ryhmät"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Ryhmän ylläpitäjä"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Poista"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "lisää ryhmä"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Anna kelvollinen käyttäjätunnus"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Virhe käyttäjää luotaessa"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Anna kelvollinen salasana"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "_kielen_nimi_"
@@ -237,106 +241,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Jakaminen"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Käytä jakamisen ohjelmointirajapintaa"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Salli linkit"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Salli käyttäjien jakaa kohteita käyttäen linkkejä"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Salli uudelleenjakaminen"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Mahdollistaa käyttäjien jakavan uudelleen heidän kanssaan jaettuja kohteita"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Salli käyttäjien jakaa kenen tahansa kanssa"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Tietoturva"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Pakota HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Loki"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Lokitaso"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Enemmän"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Vähemmän"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versio"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Käytä tätä osoitetta <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">päästäksesi käsiksi tiedostoihisi WebDAVin kautta</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Salaus"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr "Salaussovellus ei ole enää käytössä, pura kaikkien tiedostojesi salaus"
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr "Pura kaikkien tiedostojen salaus"
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Kirjautumisnimi"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 358ee7001d7..394517b9292 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "Login suodatus"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Määrittelee käytettävän suodattimen, kun sisäänkirjautumista yritetään. %%uid korvaa sisäänkirjautumisessa käyttäjätunnuksen."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Käyttäjien suodatus"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Määrittelee käytettävän suodattimen, kun käyttäjiä haetaan. "
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "ilman paikanvaraustermiä, ts. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Ryhmien suodatus"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan. "
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Yhteysasetukset"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Portti"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Poista pääpalvelin käytöstä"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Käytä TLS:ää"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Poista käytöstä SSL-varmenteen vahvistus"
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Ei suositella, käytä vain testausta varten."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "sekunneissa. Muutos tyhjentää välimuistin."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Hakemistoasetukset"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Käyttäjän näytettävän nimen kenttä"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Oletuskäyttäjäpuu"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Ryhmän \"näytettävä nimi\"-kenttä"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Ryhmien juuri"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "tavuissa"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Sähköpostikenttä"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Ohje"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 838c8b679e4..b5e48526b0a 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -142,59 +142,59 @@ msgstr "novembre"
msgid "December"
msgstr "décembre"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Paramètres"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "il y a quelques secondes"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "il y a une minute"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "il y a {minutes} minutes"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "Il y a une heure"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "Il y a {hours} heures"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "aujourd'hui"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "hier"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "il y a {days} jours"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "le mois dernier"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "Il y a {months} mois"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "il y a plusieurs mois"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "l'année dernière"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "il y a plusieurs années"
@@ -202,23 +202,19 @@ msgstr "il y a plusieurs années"
msgid "Choose"
msgstr "Choisir"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Annuler"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Erreur de chargement du modèle du sélecteur de fichier"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Oui"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ok"
@@ -382,9 +378,10 @@ msgstr "La mise à jour a échoué. Veuillez signaler ce problème à la <a href
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Réinitialisation de votre mot de passe Owncloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -583,6 +580,10 @@ msgstr "%s est disponible. Obtenez plus d'informations sur la façon de mettre
msgid "Log out"
msgstr "Se déconnecter"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Connexion automatique rejetée !"
@@ -620,14 +621,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Salut,<br><br>je veux juste vous signaler %s partagé »%s« avec vous.<br><a href=\"%s\">Voyez-le!</a><br><br>Bonne continuation!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "précédent"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "suivant"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 4c33dc27a39..175956137dc 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -97,12 +97,12 @@ msgstr "Espace disponible insuffisant"
msgid "Upload cancelled."
msgstr "Envoi annulé."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "L'URL ne peut-être vide"
@@ -110,8 +110,8 @@ msgstr "L'URL ne peut-être vide"
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/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Erreur"
@@ -123,15 +123,11 @@ msgstr "Partager"
msgid "Delete permanently"
msgstr "Supprimer de façon définitive"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Supprimer"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Renommer"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "En attente"
@@ -159,15 +155,13 @@ msgstr "{new_name} a été remplacé par {old_name}"
msgid "undo"
msgstr "annuler"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "effectuer l'opération de suppression"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 fichier en cours d'envoi"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "fichiers en cours d'envoi"
@@ -193,43 +187,45 @@ msgstr "Votre espage de stockage est plein, les fichiers ne peuvent plus être t
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux."
-#: js/files.js:344
+#: js/files.js:358
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:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nom"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Taille"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Modifié"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 dossier"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} dossiers"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 fichier"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} fichiers"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -312,6 +308,10 @@ msgstr "Télécharger"
msgid "Unshare"
msgstr "Ne plus partager"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Supprimer"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Téléversement trop volumineux"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index 379e785e9e1..174e4d3f3a3 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -65,18 +65,18 @@ msgid ""
"files."
msgstr "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Système minimum requis non respecté."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Veuillez vous assurer qu'une version de PHP 5.3.3 ou plus récente est installée et que l'extension OpenSSL de PHP est activée et configurée correctement. En attendant, l'application de cryptage a été désactivée."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 67c79c9ec35..c6eae4ea599 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index 7a2616f6dd1..464c518b8a5 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr "Nom"
msgid "Deleted"
msgstr "Effacé"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 dossier"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} dossiers"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 fichier"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} fichiers"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index a16420a728b..1c17ec9eeaa 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Utilisateurs"
#: app.php:409
-msgid "Apps"
-msgstr "Applications"
-
-#: app.php:417
msgid "Admin"
msgstr "Administration"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "impossible à déterminer"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "L'application n'est pas activée"
@@ -211,50 +203,46 @@ msgid "seconds ago"
msgstr "il y a quelques secondes"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "il y a une minute"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "il y a %d minutes"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "Il y a une heure"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "Il y a %d heures"
-
-#: template/functions.php:85
msgid "today"
msgstr "aujourd'hui"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "hier"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "il y a %d jours"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "le mois dernier"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "Il y a %d mois"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "l'année dernière"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "il y a plusieurs années"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index a17f6cb3300..9b43aabef4d 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -124,7 +124,11 @@ msgstr "Erreur lors de la mise à jour de l'application"
msgid "Updated"
msgstr "Mise à jour effectuée avec succès"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Enregistrement..."
@@ -145,31 +149,31 @@ msgstr "Impossible de retirer l'utilisateur"
msgid "Groups"
msgstr "Groupes"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Groupe Admin"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Supprimer"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "ajouter un groupe"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Un nom d'utilisateur valide doit être saisi"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Erreur lors de la création de l'utilisateur"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Un mot de passe valide doit être saisi"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Français"
@@ -240,106 +244,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Exécute une tâche à chaque chargement de page"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Partage"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Activer l'API de partage"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Autoriser les applications à utiliser l'API de partage"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Autoriser les liens"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Autoriser le repartage"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Autoriser les utilisateurs à partager avec tout le monde"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Sécurité"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Forcer HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Log"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Niveau de log"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Plus"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Moins"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Version"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -469,6 +473,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Utilisez cette adresse pour <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accéder à vos fichiers via WebDAV</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Chiffrement"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Nom de la connexion"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 52e8f7e72e8..9729b2532b7 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -155,198 +155,185 @@ msgstr "Modèle d'authentification utilisateurs"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtre d'utilisateurs"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "sans élément de substitution, par exemple \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Filtre de groupes"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Définit le filtre à appliquer lors de la récupération des groupes."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Paramètres de connexion"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Configuration active"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Lorsque non cochée, la configuration sera ignorée."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Serveur de backup (réplique)"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Fournir un serveur de backup optionnel. Il doit s'agir d'une réplique du serveur LDAP/AD principal."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Port du serveur de backup (réplique)"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Désactiver le serveur principal"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Utiliser TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "À ne pas utiliser pour les connexions LDAPS (cela échouera)."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Serveur LDAP insensible à la casse (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Désactiver la validation du certificat SSL."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Non recommandé, utilisation pour tests uniquement."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Durée de vie du cache"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "en secondes. Tout changement vide le cache."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Paramètres du répertoire"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Champ \"nom d'affichage\" de l'utilisateur"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "DN racine de l'arbre utilisateurs"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Un DN racine utilisateur par ligne"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Recherche des attributs utilisateur"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Optionnel, un attribut par ligne"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Champ \"nom d'affichage\" du groupe"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "DN racine de l'arbre groupes"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Un DN racine groupe par ligne"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Recherche des attributs du groupe"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Association groupe-membre"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Attributs spéciaux"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Champ du quota"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Quota par défaut"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Champ Email"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Convention de nommage du répertoire utilisateur"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Laisser vide "
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Nom d'utilisateur interne"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Nom d'utilisateur interne:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Surcharger la détection d'UUID"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "Attribut UUID :"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Association Nom d'utilisateur-Utilisateur LDAP"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Supprimer l'association utilisateur interne-utilisateur LDAP"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Supprimer l'association nom de groupe-groupe LDAP"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Tester la configuration"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Aide"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index db43bc51fb6..50cf7e0e18d 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -138,59 +138,59 @@ msgstr "novembro"
msgid "December"
msgstr "decembro"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Axustes"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "hai 1 minuto"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "hai %n minuto"
+msgstr[1] "hai %n minutos"
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "hai {minutes} minutos"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "hai %n hora"
+msgstr[1] "hai %n horas"
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "Vai 1 hora"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "hai {hours} horas"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "hoxe"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "onte"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "hai {days} días"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "hai %n día"
+msgstr[1] "hai %n días"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "último mes"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "hai {months} meses"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "hai %n mes"
+msgstr[1] "hai %n meses"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "último ano"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "anos atrás"
@@ -198,23 +198,19 @@ msgstr "anos atrás"
msgid "Choose"
msgstr "Escoller"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Produciuse un erro ao cargar o modelo do selector de ficheiros"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Si"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Aceptar"
@@ -378,9 +374,10 @@ msgstr "A actualización non foi satisfactoria, informe deste problema á <a hr
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Restabelecer o contrasinal de ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "Restabelecer o contrasinal %s"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -579,6 +576,10 @@ msgstr "%s está dispoñíbel. Obteña máis información sobre como actualizar.
msgid "Log out"
msgstr "Desconectar"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Máis aplicativos"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Rexeitouse a entrada automática"
@@ -616,14 +617,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Ola,<br><br>só facerlle saber que %s compartiu «%s» con vostede.<br><a href=\"%s\">Véxao!</a><br><br>Saúdos!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "anterior"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "seguinte"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index a7f5d6d1ce9..70312ce0d91 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-20 11:10+0000\n"
+"Last-Translator: mbouzada <mbouzada@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"
@@ -95,21 +95,21 @@ msgstr "O espazo dispoñíbel é insuficiente"
msgid "Upload cancelled."
msgstr "Envío cancelado."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:234 js/files.js:353
msgid "URL cannot be empty."
msgstr "O URL non pode quedar baleiro."
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:239 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Erro"
@@ -121,15 +121,11 @@ msgstr "Compartir"
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Eliminar"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Renomear"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Pendentes"
@@ -157,15 +153,13 @@ msgstr "substituír {new_name} por {old_name}"
msgid "undo"
msgstr "desfacer"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "realizar a operación de eliminación"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "Cargando %n ficheiro"
+msgstr[1] "Cargando %n ficheiros"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "Enviándose 1 ficheiro"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "ficheiros enviándose"
@@ -191,43 +185,45 @@ msgstr "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros."
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nome de cartafol incorrecto. O uso de «Shared» está reservado por Owncloud"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nome"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 cartafol"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n cartafol"
+msgstr[1] "%n cartafoles"
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} cartafoles"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 ficheiro"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} ficheiros"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n ficheiro"
+msgstr[1] "%n ficheiros"
#: lib/app.php:73
#, php-format
@@ -310,6 +306,10 @@ msgstr "Descargar"
msgid "Unshare"
msgstr "Deixar de compartir"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Eliminar"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Envío demasiado grande"
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index a9de5bfcc7f..bdd69c84048 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.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-08-03 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 10:20+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -64,18 +64,18 @@ msgid ""
"files."
msgstr "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros"
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Non se cumpren os requisitos."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de que a extensión OpenSSL PHP estea activada e configurada correctamente. Polo de agora foi desactivado o aplicativo de cifrado."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado."
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr "Os seguintes usuarios non teñen configuración para o cifrado:"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 13e9cefab47..887502a08be 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index 5766c76f565..ad7adc59d70 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/files_trashbin.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-08-01 01:55-0400\n"
-"PO-Revision-Date: 2013-07-31 09:20+0000\n"
+"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"PO-Revision-Date: 2013-08-15 10:20+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -52,21 +52,17 @@ msgstr "Nome"
msgid "Deleted"
msgstr "Eliminado"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 cartafol"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} cartafoles"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 ficheiro"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} ficheiros"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n cartafol"
+msgstr[1] "%n cartafoles"
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n ficheiro"
+msgstr[1] "%n ficheiros"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index e166c0d1ada..49881baaafb 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Usuarios"
#: app.php:409
-msgid "Apps"
-msgstr "Aplicativos"
-
-#: app.php:417
msgid "Admin"
msgstr "Administración"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Non foi posíbel anovar «%s»."
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr "Descargue os ficheiros en cachos máis pequenos e por separado, ou pídallos amabelmente ao seu administrador."
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "non foi posíbel determinalo"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "O aplicativo non está activado"
@@ -211,50 +203,46 @@ msgid "seconds ago"
msgstr "segundos atrás"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "hai 1 minuto"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "hai %n minuto"
+msgstr[1] "hai %n minutos"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "hai %d minutos"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "hai %n hora"
+msgstr[1] "hai %n horas"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "Vai 1 hora"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "Vai %d horas"
-
-#: template/functions.php:85
msgid "today"
msgstr "hoxe"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "onte"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "hai %d días"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] "hai %n día"
+msgstr[1] "hai %n días"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "último mes"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "Vai %d meses"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "hai %n mes"
+msgstr[1] "hai %n meses"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "último ano"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "anos atrás"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 4003cde32ba..ba4d53c4fac 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 11:10+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -121,7 +121,11 @@ msgstr "Produciuse un erro mentres actualizaba o aplicativo"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Descifrando ficheiros... isto pode levar un anaco."
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Gardando..."
@@ -142,31 +146,31 @@ msgstr "Non é posíbel retirar o usuario"
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Grupo Admin"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Eliminar"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "engadir un grupo"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Debe fornecer un nome de usuario"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Produciuse un erro ao crear o usuario"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Debe fornecer un contrasinal"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Galego"
@@ -237,106 +241,106 @@ msgstr "Este servidor non ten conexión a Internet. Isto significa que algunhas
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Executar unha tarefa con cada páxina cargada"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php unha vez por minuto a través de HTTP."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "Use o servizo de sistema cron para chamar ao ficheiro cron.php unha vez por minuto."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Compartindo"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Activar o API para compartir"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Permitir que os aplicativos empreguen o API para compartir"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Permitir ligazóns"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Permitir que os usuarios compartan elementos ao público con ligazóns"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Permitir os envíos públicos"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Permitir que os usuarios lle permitan a outros enviar aos seus cartafoles compartidos publicamente"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Permitir compartir"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Permitir que os usuarios compartan de novo os elementos compartidos con eles"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Permitir que os usuarios compartan con calquera"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Permitir que os usuarios compartan só cos usuarios dos seus grupos"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Seguranza"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Forzar HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forzar que os clientes se conecten a %s empregando unha conexión cifrada."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Conéctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Rexistro"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Nivel de rexistro"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Máis"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Empregue esta ligazón <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Cifrado"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr "o aplicativo de cifrado non está activado, descifrar todos os ficheiros"
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr "Contrasinal de acceso"
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr "Descifrar todos os ficheiros"
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Nome de acceso"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 06ecfaeb682..5e1d0d000e3 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 11:20+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -155,198 +155,185 @@ msgstr "Filtro de acceso de usuarios"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso. Exemplo: «uid=%%uid»"
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "usar a marca de posición %%uid, p.ex «uid=%%uid»"
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtro da lista de usuarios"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Define o filtro a aplicar cando se recompilan os usuarios."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "sen ningunha marca de posición, como p.ex «objectClass=persoa»."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr "Define o filtro a aplicar cando de recuperan os usuarios (sen comodíns). Exemplo: «objectClass=person»"
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Define o filtro a aplicar cando se recompilan os grupos."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix»."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr "Define o filtro a aplicar cando de recuperan os usuarios (sen comodíns). Exemplo: «objectClass=posixGroup»"
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Axustes da conexión"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Configuración activa"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Se está sen marcar, omítese esta configuración."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Porto"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Servidor da copia de seguranza (Réplica)"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Porto da copia de seguranza (Réplica)"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Desactivar o servidor principal"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr "Conectar só co servidor de réplica."
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Non utilizalo ademais para conexións LDAPS xa que fallará."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Desactiva a validación do certificado SSL."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no teu servidor %s."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Non se recomenda. Só para probas."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr "Non recomendado, utilizar só para probas! Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor %s."
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Tempo de persistencia da caché"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "en segundos. Calquera cambio baleira a caché."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Axustes do directorio"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Campo de mostra do nome de usuario"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr "O atributo LDAP a empregar para xerar o nome de usuario para amosar."
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Base da árbore de usuarios"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Un DN base de usuario por liña"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Atributos de busca do usuario"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Opcional; un atributo por liña"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Campo de mostra do nome de grupo"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr "O atributo LDAP úsase para xerar os nomes dos grupos que amosar."
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Base da árbore de grupo"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Un DN base de grupo por liña"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Atributos de busca do grupo"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Asociación de grupos e membros"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Atributos especiais"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Campo de cota"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Cota predeterminada"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Campo do correo"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Regra de nomeado do cartafol do usuario"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Nome de usuario interno"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ]. Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omítense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario. Tamén é parte dun URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Atributo do nome de usuario interno:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Ignorar a detección do UUID"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "De xeito predeterminado, o atributo UUID é detectado automaticamente. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "Atributo do UUID:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Asignación do usuario ao «nome de usuario LDAP»"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
"experimental stage."
msgstr "Os nomes de usuario empreganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais."
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Limpar a asignación do usuario ao «nome de usuario LDAP»"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Limpar a asignación do grupo ao «nome de grupo LDAP»"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Probar a configuración"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Axuda"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 815769afeb2..4919323ca05 100644
--- a/l10n/he/core.po
+++ b/l10n/he/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -138,59 +138,59 @@ msgstr "נובמבר"
msgid "December"
msgstr "דצמבר"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "הגדרות"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "שניות"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "לפני דקה אחת"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "לפני {minutes} דקות"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "לפני שעה"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "לפני {hours} שעות"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "היום"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "אתמול"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "לפני {days} ימים"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "חודש שעבר"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "לפני {months} חודשים"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "חודשים"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "שנה שעברה"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "שנים"
@@ -198,23 +198,19 @@ msgstr "שנים"
msgid "Choose"
msgstr "בחירה"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "ביטול"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "שגיאה בטעינת תבנית בחירת הקבצים"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "כן"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "לא"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "בסדר"
@@ -378,9 +374,10 @@ msgstr "תהליך העדכון לא הושלם בהצלחה. נא דווח את
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "איפוס הססמה של ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -579,6 +576,10 @@ msgstr "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע
msgid "Log out"
msgstr "התנתקות"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "בקשת הכניסה האוטומטית נדחתה!"
@@ -616,14 +617,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "הקודם"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "הבא"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 1071366768b..1b7e785ebf1 100644
--- a/l10n/he/files.po
+++ b/l10n/he/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -95,12 +95,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr "ההעלאה בוטלה."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "קישור אינו יכול להיות ריק."
@@ -108,8 +108,8 @@ msgstr "קישור אינו יכול להיות ריק."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "שגיאה"
@@ -121,15 +121,11 @@ msgstr "שתף"
msgid "Delete permanently"
msgstr "מחק לצמיתות"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "מחיקה"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "שינוי שם"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "ממתין"
@@ -157,15 +153,13 @@ msgstr "{new_name} הוחלף ב־{old_name}"
msgid "undo"
msgstr "ביטול"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "ביצוע פעולת מחיקה"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "קובץ אחד נשלח"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "קבצים בהעלאה"
@@ -191,43 +185,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "שם"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "גודל"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "זמן שינוי"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "תיקייה אחת"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} תיקיות"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "קובץ אחד"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} קבצים"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -310,6 +306,10 @@ msgstr "הורדה"
msgid "Unshare"
msgstr "הסר שיתוף"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "מחיקה"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "העלאה גדולה מידי"
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index c7d690a7876..200c5801924 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 9ce5f7cc91e..0af4dee2ecc 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index e5ec90f0187..b938a87bca0 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -52,21 +52,17 @@ msgstr "שם"
msgid "Deleted"
msgstr "נמחק"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "תיקייה אחת"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} תיקיות"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "קובץ אחד"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} קבצים"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index 3596f6929c0..ba288940743 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "משתמשים"
#: app.php:409
-msgid "Apps"
-msgstr "יישומים"
-
-#: app.php:417
msgid "Admin"
msgstr "מנהל"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr "יישומים אינם מופעלים"
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr "שניות"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "לפני דקה אחת"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "לפני %d דקות"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "לפני שעה"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "לפני %d שעות"
-
-#: template/functions.php:85
msgid "today"
msgstr "היום"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "אתמול"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "לפני %d ימים"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "חודש שעבר"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "לפני %d חודשים"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "שנה שעברה"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "שנים"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 468f47334f6..29198d3642a 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -121,7 +121,11 @@ msgstr "אירעה שגיאה בעת עדכון היישום"
msgid "Updated"
msgstr "מעודכן"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "שמירה…"
@@ -142,31 +146,31 @@ msgstr "לא ניתן להסיר את המשתמש"
msgid "Groups"
msgstr "קבוצות"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "מנהל הקבוצה"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "מחיקה"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "הוספת קבוצה"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "יש לספק שם משתמש תקני"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "יצירת המשתמש נכשלה"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "יש לספק ססמה תקנית"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "עברית"
@@ -237,106 +241,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "יש להפעיל משימה אחת עם כל עמוד שנטען"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "שיתוף"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "הפעלת API השיתוף"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "לאפשר ליישום להשתמש ב־API השיתוף"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "לאפשר קישורים"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "לאפשר למשתמשים לשתף פריטים "
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "לאפשר שיתוף מחדש"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "לאפשר למשתמשים לשתף הלאה פריטים ששותפו אתם"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "לאפשר למשתמשים לשתף עם כל אחד"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "לאפשר למשתמשים לשתף עם משתמשים בקבוצות שלהם בלבד"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "אבטחה"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "לאלץ HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "יומן"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "רמת הדיווח"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "יותר"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "פחות"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "גרסא"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "הצפנה"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "שם כניסה"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 92412a3acf2..af6906d1973 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -155,198 +155,185 @@ msgstr "סנן כניסת משתמש"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "סנן רשימת משתמשים"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "סנן קבוצה"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "פורט"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "בשניות. שינוי מרוקן את המטמון."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "בבתים"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "עזרה"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index da414f326bf..27c6e564ae4 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -138,59 +138,59 @@ msgstr "नवंबर"
msgid "December"
msgstr "दिसम्बर"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "सेटिंग्स"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -198,23 +198,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -378,8 +374,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -579,6 +576,10 @@ msgstr ""
msgid "Log out"
msgstr "लोग आउट"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -616,14 +617,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "पिछला"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "अगला"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 303d4b30b47..f3bce0ac149 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-07-23 01:55-0400\n"
-"PO-Revision-Date: 2013-07-23 05:04+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "त्रुटि"
@@ -120,11 +120,7 @@ msgstr "साझा करें"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
-
-#: js/filelist.js:457
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:460 js/filelist.js:518
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -285,45 +281,49 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Deleted files"
msgstr ""
-#: templates/index.php:48
+#: templates/index.php:46
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:54
+#: templates/index.php:52
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:61
+#: templates/index.php:59
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:73
msgid "Download"
msgstr ""
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
msgid "Unshare"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:105
msgid "Upload too large"
msgstr ""
-#: templates/index.php:109
+#: templates/index.php:107
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:114
+#: templates/index.php:112
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:117
+#: templates/index.php:115
msgid "Current scanning"
msgstr ""
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index cea31a0a3eb..ac181cbae06 100644
--- a/l10n/hi/files_encryption.po
+++ b/l10n/hi/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+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"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index bce2a8c6051..6ebcc054149 100644
--- a/l10n/hi/files_trashbin.po
+++ b/l10n/hi/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index 82f9745909e..28b270f1948 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "उपयोगकर्ता"
#: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
msgid "Admin"
msgstr ""
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 1cbce126524..6c4da2cc6c6 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index dba9ae3b02f..053000fe64c 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "सहयोग"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 81bdf7ec8fe..fc513b2f685 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,63 @@ msgstr "Studeni"
msgid "December"
msgstr "Prosinac"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Postavke"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "sekundi prije"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:758
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:815
msgid "today"
msgstr "danas"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "jučer"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "prošli mjesec"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "mjeseci"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "prošlu godinu"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "godina"
@@ -197,23 +201,19 @@ msgstr "godina"
msgid "Choose"
msgstr "Izaberi"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Odustani"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "U redu"
@@ -377,9 +377,10 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud resetiranje lozinke"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +579,10 @@ msgstr ""
msgid "Log out"
msgstr "Odjava"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +620,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "prethodan"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "sljedeći"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 0ac273788ea..b15680bceff 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr "Slanje poništeno."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Greška"
@@ -120,15 +120,11 @@ msgstr "Podijeli"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Obriši"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Promjeni ime"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "U tijeku"
@@ -156,15 +152,14 @@ msgstr ""
msgid "undo"
msgstr "vrati"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
-
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 datoteka se učitava"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "datoteke se učitavaju"
@@ -190,43 +185,47 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Ime"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Veličina"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Zadnja promjena"
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +308,10 @@ msgstr "Preuzimanje"
msgid "Unshare"
msgstr "Makni djeljenje"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Obriši"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Prijenos je preobiman"
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index 348a47b40d2..db272d0927c 100644
--- a/l10n/hr/files_encryption.po
+++ b/l10n/hr/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+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"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 74836110cc8..ee7cc3cc679 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index b1d72376aa7..76a24e0c67e 100644
--- a/l10n/hr/files_trashbin.po
+++ b/l10n/hr/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,19 @@ msgstr "Ime"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 04da1356f08..32395b83128 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Korisnici"
#: app.php:409
-msgid "Apps"
-msgstr "Aplikacije"
-
-#: app.php:417
msgid "Admin"
msgstr "Administrator"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,50 @@ msgid "seconds ago"
msgstr "sekundi prije"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr ""
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template/functions.php:85
msgid "today"
msgstr "danas"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "jučer"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "prošli mjesec"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "prošlu godinu"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "godina"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index e3c59e31c93..660714684d6 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Spremanje..."
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__ime_jezika__"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "dnevnik"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "više"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 724cb66407c..bbd09586144 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Pomoć"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 5584638c0e4..715adea419f 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: ebela <bela@dandre.hu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -139,59 +139,59 @@ msgstr "november"
msgid "December"
msgstr "december"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Beállítások"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "pár másodperce"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 perce"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} perce"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 órája"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} órája"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "ma"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "tegnap"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} napja"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "múlt hónapban"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} hónapja"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "több hónapja"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "tavaly"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "több éve"
@@ -199,23 +199,19 @@ msgstr "több éve"
msgid "Choose"
msgstr "Válasszon"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Nem sikerült betölteni a fájlkiválasztó sablont"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Igen"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nem"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ok"
@@ -379,9 +375,10 @@ msgstr "A frissítés nem sikerült. Kérem értesítse erről a problémáról
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud jelszó-visszaállítás"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -580,6 +577,10 @@ msgstr "%s rendelkezésre áll. További információ a frissítéshez."
msgid "Log out"
msgstr "Kilépés"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Az automatikus bejelentkezés sikertelen!"
@@ -617,14 +618,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Üdv!<br><br>Új hír: %s megosztotta Önnel ezt: »%s«.<br><a href=\"%s\">Itt nézhető meg!</a><br><br>Minden jót!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "előző"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "következő"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 7aced2efc9f..cc2316c691e 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -95,12 +95,12 @@ msgstr "Nincs elég szabad hely"
msgid "Upload cancelled."
msgstr "A feltöltést megszakítottuk."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "Az URL nem lehet semmi."
@@ -108,8 +108,8 @@ msgstr "Az URL nem lehet semmi."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Hiba"
@@ -121,15 +121,11 @@ msgstr "Megosztás"
msgid "Delete permanently"
msgstr "Végleges törlés"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Törlés"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Átnevezés"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Folyamatban"
@@ -157,15 +153,13 @@ msgstr "{new_name} fájlt kicseréltük ezzel: {old_name}"
msgid "undo"
msgstr "visszavonás"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "a törlés végrehajtása"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 fájl töltődik föl"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "fájl töltődik föl"
@@ -191,43 +185,45 @@ msgstr "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhat
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "A tároló majdnem tele van ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Érvénytelen mappanév. A név használata csak a Owncloud számára lehetséges."
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Név"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Méret"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Módosítva"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 mappa"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} mappa"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 fájl"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} fájl"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -310,6 +306,10 @@ msgstr "Letöltés"
msgid "Unshare"
msgstr "A megosztás visszavonása"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Törlés"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "A feltöltés túl nagy"
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 4454bdef40c..7f282b4ac56 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index d56e22a6e28..43059eac1fc 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
@@ -32,27 +32,27 @@ msgstr "Elküld"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Sajnos úgy tűnik, ez a link már nem működik."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Ennek az oka a következő lehet:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "az állományt időközben eltávolították"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "lejárt a link érvényességi ideje"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "letiltásra került a megosztás"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "További információért forduljon ahhoz, aki ezt a linket küldte Önnek!"
#: templates/public.php:15
#, php-format
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index 32d8861a33b..4e5d7207c9f 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# 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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,25 +52,21 @@ msgstr "Név"
msgid "Deleted"
msgstr "Törölve"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 mappa"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} mappa"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 fájl"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} fájl"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
-msgstr ""
+msgstr "visszaállítva"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index 36ab19be996..5fabacbc2ff 100644
--- a/l10n/hu_HU/files_versions.po
+++ b/l10n/hu_HU/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# 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-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:40+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"
@@ -28,15 +29,15 @@ msgstr "Az állományok korábbi változatai"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "Nem sikerült a(z) {file} állományt erre visszaállítani: {timestamp}."
#: js/versions.js:79
msgid "More versions..."
-msgstr ""
+msgstr "További változatok..."
#: js/versions.js:116
msgid "No other versions available"
-msgstr ""
+msgstr "Az állománynak nincs több változata"
#: js/versions.js:149
msgid "Restore"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index 40fca00f72d..e508505f741 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
-"Last-Translator: ebela <bela@dandre.hu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -36,14 +36,10 @@ msgid "Users"
msgstr "Felhasználók"
#: app.php:409
-msgid "Apps"
-msgstr "Alkalmazások"
-
-#: app.php:417
msgid "Admin"
msgstr "Adminsztráció"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Sikertelen Frissítés \"%s\"."
@@ -79,10 +75,6 @@ msgid ""
"administrator."
msgstr "Tölts le a fileokat kisebb chunkokban, kölün vagy kérj segitséget a rendszergazdádtól."
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "nem határozható meg"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Az alkalmazás nincs engedélyezve"
@@ -212,50 +204,46 @@ msgid "seconds ago"
msgstr "pár másodperce"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 perce"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d perce"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 órája"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d órája"
-
-#: template/functions.php:85
msgid "today"
msgstr "ma"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "tegnap"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d napja"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "múlt hónapban"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d hónapja"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "tavaly"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "több éve"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 28ad2b6ab17..464a3c622e8 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
-"Last-Translator: ebela <bela@dandre.hu>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -123,7 +123,11 @@ msgstr "Hiba történt a programfrissítés közben"
msgid "Updated"
msgstr "Frissítve"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Mentés..."
@@ -144,31 +148,31 @@ msgstr "A felhasználót nem sikerült eltávolítáni"
msgid "Groups"
msgstr "Csoportok"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Csoportadminisztrátor"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Törlés"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "csoport hozzáadása"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Érvényes felhasználónevet kell megadnia"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "A felhasználó nem hozható létre"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Érvényes jelszót kell megadnia"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -239,106 +243,106 @@ msgstr "A kiszolgálónak nincs müködő internet kapcsolata. Ez azt jelenti, h
msgid "Cron"
msgstr "Ütemezett feladatok"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "A cron.php webcron szolgáltatásként van regisztrálva. Hívja meg a cron.php állományt http-n keresztül percenként egyszer."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "A rendszer cron szolgáltatásának használata. Hívja meg a cron.php állományt percenként egyszer a rendszer cron szolgáltatásának segítségével."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Megosztás"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "A megosztás API-jának engedélyezése"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Linkek engedélyezése"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Lehetővé teszi, hogy a felhasználók linkek segítségével külsősökkel is megoszthassák az adataikat"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Feltöltést engedélyezése mindenki számára"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Engedélyezni a felhasználóknak, hogy beállíithassák, hogy mások feltölthetnek a nyilvánosan megosztott mappákba."
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "A továbbosztás engedélyezése"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "A felhasználók bárkivel megoszthatják állományaikat"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "A felhasználók csak olyanokkal oszthatják meg állományaikat, akikkel közös csoportban vannak"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Biztonság"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Kötelező HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak a %s szolgáltatáshoz."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Kérjük kapcsolodjon a %s rendszerhez HTTPS protokollon keresztül, hogy be vagy ki kapcsoljaa kötelező SSL beállítást."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Naplózás"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Naplózási szint"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Több"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Kevesebb"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Verzió"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -468,6 +472,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Ezt a címet használja, ha <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV-on keresztül szeretné elérni az állományait</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Titkosítás"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Bejelentkezési név"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index a3a8d807eb2..166a16c7f81 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -156,198 +156,185 @@ msgstr "Szűrő a bejelentkezéshez"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "használja az %%uid változót, pl. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "A felhasználók szűrője"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Ez a szűrő érvényes a felhasználók listázásakor."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "itt ne használjon változót, pl. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "A csoportok szűrője"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Ez a szűrő érvényes a csoportok listázásakor."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "itt ne használjunk változót, pl. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Kapcsolati beállítások"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "A beállítás aktív"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Ha nincs kipipálva, ez a beállítás kihagyódik."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Másodkiszolgáló (replika)"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Adjon meg egy opcionális másodkiszolgálót. Ez a fő LDAP/AD kiszolgáló szinkron másolata (replikája) kell legyen."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "A másodkiszolgáló (replika) portszáma"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "A fő szerver kihagyása"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Használjunk TLS-t"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "LDAPS kapcsolatok esetén ne kapcsoljuk be, mert nem fog működni."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Ne ellenőrizzük az SSL-tanúsítvány érvényességét"
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nem javasolt, csak tesztelésre érdemes használni."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "A gyorsítótár tárolási időtartama"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "másodpercben. A változtatás törli a cache tartalmát."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Címtár beállítások"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "A felhasználónév mezője"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "A felhasználói fa gyökere"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Soronként egy felhasználói fa gyökerét adhatjuk meg"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "A felhasználók lekérdezett attribútumai"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Nem kötelező megadni, soronként egy attribútum"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "A csoport nevének mezője"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "A csoportfa gyökere"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Soronként egy csoportfa gyökerét adhatjuk meg"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "A csoportok lekérdezett attribútumai"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "A csoporttagság attribútuma"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Különleges attribútumok"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Kvóta mező"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Alapértelmezett kvóta"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "bájtban"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Email mező"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "A home könyvtár elérési útvonala"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!"
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Belső felhasználónév"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -363,15 +350,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "A belső felhasználónév attribútuma:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Az UUID-felismerés felülbírálása"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -382,15 +369,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "UUID attribútum:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Felhasználó - LDAP felhasználó hozzárendelés"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -404,18 +391,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "A felhasználó - LDAP felhasználó hozzárendelés törlése"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "A csoport - LDAP csoport hozzárendelés törlése"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "A beállítások tesztelése"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Súgó"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index d9387c503c8..e2aceb5731c 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr "Նոյեմբեր"
msgid "December"
msgstr "Դեկտեմբեր"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr ""
-#: js/js.js:715
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:716
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:717
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:718
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:719
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:720
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:721
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:722
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:723
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:724
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:725
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:726
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:727
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +197,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -226,7 +222,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:631 js/share.js:643
+#: js/share.js:643 js/share.js:655
msgid "Error"
msgstr ""
@@ -246,7 +242,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:671
+#: js/share.js:131 js/share.js:683
msgid "Error while sharing"
msgstr ""
@@ -346,23 +342,23 @@ msgstr ""
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:618
+#: js/share.js:398 js/share.js:630
msgid "Password protected"
msgstr ""
-#: js/share.js:631
+#: js/share.js:643
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:643
+#: js/share.js:655
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:658
+#: js/share.js:670
msgid "Sending ..."
msgstr ""
-#: js/share.js:669
+#: js/share.js:681
msgid "Email sent"
msgstr ""
@@ -377,8 +373,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -461,7 +458,7 @@ msgstr ""
msgid "Access forbidden"
msgstr ""
-#: templates/404.php:12
+#: templates/404.php:15
msgid "Cloud not found"
msgstr ""
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr ""
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 78f3d8894a7..4769f28713c 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,15 +120,11 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Ջնջել"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr ""
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr "Բեռնել"
msgid "Unshare"
msgstr ""
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Ջնջել"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr ""
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
index ad6527023c2..e9b9f2afbe8 100644
--- a/l10n/hy/files_encryption.po
+++ b/l10n/hy/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index 59d5e3109f5..bdb47a3fbc9 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
index f04b85a1891..b1c3d308429 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,17 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index 40f120e5355..c4bd9162a85 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/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: 2013-07-24 01:55-0400\n"
-"PO-Revision-Date: 2013-07-24 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -34,19 +34,15 @@ msgid "Users"
msgstr ""
#: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
msgid "Admin"
msgstr ""
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: defaults.php:33
+#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,54 +202,50 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
-#: template.php:296
+#: template.php:297
msgid "Caused by:"
msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 0cb76a2fd2f..a4f0a39f2e3 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 40ead5a3d60..8b2b904fe7f 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/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: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 16f83c98df6..901f0476070 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,59 @@ msgstr "Novembre"
msgid "December"
msgstr "Decembre"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Configurationes"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +197,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Cancellar"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -377,9 +373,10 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Reinitialisation del contrasigno de ownCLoud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr "Clauder le session"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "prev"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "prox"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 071e4f73194..0ef13b54839 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Error"
@@ -120,15 +120,11 @@ msgstr "Compartir"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Deler"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr ""
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nomine"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Dimension"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Modificate"
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr "Discargar"
msgid "Unshare"
msgstr ""
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Deler"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Incargamento troppo longe"
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index e4f044f7d2d..04eb7d8960c 100644
--- a/l10n/ia/files_encryption.po
+++ b/l10n/ia/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+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"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index ac0a658eb5e..6fb91fb6c7e 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index 27a04602b6b..0ac362ef502 100644
--- a/l10n/ia/files_trashbin.po
+++ b/l10n/ia/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr "Nomine"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index 5a15ebc1e9c..2d76564c421 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Usatores"
#: app.php:409
-msgid "Apps"
-msgstr "Applicationes"
-
-#: app.php:417
msgid "Admin"
msgstr "Administration"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index b490b5b0547..45bea595cdd 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Interlingua"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Registro"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Plus"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 8dd885a0628..a8bd30ff193 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Adjuta"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 17b4712d164..abd8fc9cd4d 100644
--- a/l10n/id/core.po
+++ b/l10n/id/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,55 @@ msgstr "November"
msgid "December"
msgstr "Desember"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Setelan"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "beberapa detik yang lalu"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 menit yang lalu"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} menit yang lalu"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 jam yang lalu"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} jam yang lalu"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "hari ini"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "kemarin"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} hari yang lalu"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "bulan kemarin"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} bulan yang lalu"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "beberapa bulan lalu"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "tahun kemarin"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "beberapa tahun lalu"
@@ -197,23 +193,19 @@ msgstr "beberapa tahun lalu"
msgid "Choose"
msgstr "Pilih"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Batal"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Tidak"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Oke"
@@ -377,9 +369,10 @@ msgstr "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://githu
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Setel ulang sandi ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +571,10 @@ msgstr ""
msgid "Log out"
msgstr "Keluar"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Masuk otomatis ditolak!"
@@ -615,14 +612,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "sebelumnya"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "selanjutnya"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/id/files.po b/l10n/id/files.po
index b3ba4692e85..2afa9512605 100644
--- a/l10n/id/files.po
+++ b/l10n/id/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -94,12 +94,12 @@ msgstr "Ruang penyimpanan tidak mencukupi"
msgid "Upload cancelled."
msgstr "Pengunggahan dibatalkan."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL tidak boleh kosong"
@@ -107,8 +107,8 @@ msgstr "URL tidak boleh kosong"
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Galat"
@@ -120,15 +120,11 @@ msgstr "Bagikan"
msgid "Delete permanently"
msgstr "Hapus secara permanen"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Hapus"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Ubah nama"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Menunggu"
@@ -156,15 +152,12 @@ msgstr "mengganti {new_name} dengan {old_name}"
msgid "undo"
msgstr "urungkan"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "Lakukan operasi penghapusan"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 berkas diunggah"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "berkas diunggah"
@@ -190,43 +183,43 @@ msgstr "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkr
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nama folder salah. Nama 'Shared' telah digunakan oleh Owncloud."
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nama"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Ukuran"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 folder"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} folder"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 berkas"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} berkas"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +302,10 @@ msgstr "Unduh"
msgid "Unshare"
msgstr "Batalkan berbagi"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Hapus"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Yang diunggah terlalu besar"
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index e65b75b2cac..a6c250dbb00 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 79f5f77df10..1a7fb0fbb08 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index 464071170b1..5f5941b22ad 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,15 @@ msgstr "Nama"
msgid "Deleted"
msgstr "Dihapus"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 folder"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} folder"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 berkas"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} berkas"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 808d582a7d0..a687ac2f3ef 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Pengguna"
#: app.php:409
-msgid "Apps"
-msgstr "Aplikasi"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "tidak dapat ditentukan"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Aplikasi tidak diaktifkan"
@@ -210,50 +202,42 @@ msgid "seconds ago"
msgstr "beberapa detik yang lalu"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 menit yang lalu"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d menit yang lalu"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 jam yang lalu"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d jam yang lalu"
-
-#: template/functions.php:85
msgid "today"
msgstr "hari ini"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "kemarin"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d hari yang lalu"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "bulan kemarin"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d bulan yang lalu"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "tahun kemarin"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "beberapa tahun lalu"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index d3e8034ef13..f4bb62020a1 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -120,7 +120,11 @@ msgstr "Gagal ketika memperbarui aplikasi"
msgid "Updated"
msgstr "Diperbarui"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Menyimpan..."
@@ -141,31 +145,31 @@ msgstr "Tidak dapat menghapus pengguna"
msgid "Groups"
msgstr "Grup"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Admin Grup"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Hapus"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "tambah grup"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Tuliskan nama pengguna yang valid"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Gagal membuat pengguna"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Tuliskan sandi yang valid"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Jalankan tugas setiap kali halaman dimuat"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Berbagi"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Aktifkan API Pembagian"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Izinkan aplikasi untuk menggunakan API Pembagian"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Izinkan tautan"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Izinkan pengguna untuk berbagi item kepada publik lewat tautan"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Izinkan pembagian ulang"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka."
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Izinkan pengguna untuk berbagi kepada siapa saja"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Hanya izinkan pengguna untuk berbagi dengan pengguna pada grup mereka sendiri"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Keamanan"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Selalu Gunakan HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Catat"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Level pencatatan"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Lainnya"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Ciutkan"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versi"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Enkripsi"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Nama Masuk"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index acb31ed65e1..e165b0b8d33 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "gunakan saringan login"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "gunakan pengganti %%uid, mis. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Daftar Filter Pengguna"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definisikan filter untuk diterapkan saat menerima pengguna."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "tanpa pengganti apapun, mis. \"objectClass=seseorang\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "saringan grup"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definisikan filter untuk diterapkan saat menerima grup."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Pengaturan Koneksi"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Konfigurasi Aktif"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Jika tidak dicentang, konfigurasi ini dilewati."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Host Cadangan (Replika)"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Port Cadangan (Replika)"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Nonaktifkan Server Utama"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "gunakan TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Server LDAP dengan kapitalisasi tidak sensitif (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "matikan validasi sertivikat SSL"
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "tidak disarankan, gunakan hanya untuk pengujian."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Gunakan Tembolok untuk Time-To-Live"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "dalam detik. perubahan mengosongkan cache"
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Pengaturan Direktori"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Bidang Tampilan Nama Pengguna"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Pohon Pengguna Dasar"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Satu Pengguna Base DN per baris"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Atribut Pencarian Pengguna"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Pilihan; satu atribut per baris"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Bidang Tampilan Nama Grup"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Pohon Grup Dasar"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Satu Grup Base DN per baris"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Atribut Pencarian Grup"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "asosiasi Anggota-Grup"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Atribut Khusus"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Bidang Kuota"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Kuota Baku"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "dalam bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Bidang Email"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Aturan Penamaan Folder Home Pengguna"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Uji Konfigurasi"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Bantuan"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index acc203bf921..875e468f20a 100644
--- a/l10n/is/core.po
+++ b/l10n/is/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -138,59 +138,59 @@ msgstr "Nóvember"
msgid "December"
msgstr "Desember"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Stillingar"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "sek."
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "Fyrir 1 mínútu"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} min síðan"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "Fyrir 1 klst."
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "fyrir {hours} klst."
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "í dag"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "í gær"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} dagar síðan"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "síðasta mánuði"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "fyrir {months} mánuðum"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "mánuðir síðan"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "síðasta ári"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "einhverjum árum"
@@ -198,23 +198,19 @@ msgstr "einhverjum árum"
msgid "Choose"
msgstr "Veldu"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Hætta við"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Já"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Í lagi"
@@ -378,9 +374,10 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Uppfærslan heppnaðist. Beini þér til ownCloud nú."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "endursetja ownCloud lykilorð"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -579,6 +576,10 @@ msgstr "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir."
msgid "Log out"
msgstr "Útskrá"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Sjálfvirkri innskráningu hafnað!"
@@ -616,14 +617,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "fyrra"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "næsta"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 3a908a4d0f8..0cc47cc2229 100644
--- a/l10n/is/files.po
+++ b/l10n/is/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr "Ekki nægt pláss tiltækt"
msgid "Upload cancelled."
msgstr "Hætt við innsendingu."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "Vefslóð má ekki vera tóm."
@@ -107,8 +107,8 @@ msgstr "Vefslóð má ekki vera tóm."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Villa"
@@ -120,15 +120,11 @@ msgstr "Deila"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Eyða"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Endurskýra"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Bíður"
@@ -156,15 +152,13 @@ msgstr "yfirskrifaði {new_name} með {old_name}"
msgid "undo"
msgstr "afturkalla"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 skrá innsend"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
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:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nafn"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Stærð"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Breytt"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 mappa"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} möppur"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 skrá"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} skrár"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr "Niðurhal"
msgid "Unshare"
msgstr "Hætta deilingu"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Eyða"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Innsend skrá er of stór"
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index 441753b069d..db4f65b88d8 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index e4966a548d8..20e744006b8 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index 6566b26e9db..c28f1236b66 100644
--- a/l10n/is/files_trashbin.po
+++ b/l10n/is/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr "Nafn"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 mappa"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} möppur"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 skrá"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} skrár"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 32295e15e8f..426da0a471f 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Notendur"
#: app.php:409
-msgid "Apps"
-msgstr "Forrit"
-
-#: app.php:417
msgid "Admin"
msgstr "Stjórnun"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Forrit ekki virkt"
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr "sek."
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "Fyrir 1 mínútu"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "fyrir %d mínútum"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "Fyrir 1 klst."
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "fyrir %d klst."
-
-#: template/functions.php:85
msgid "today"
msgstr "í dag"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "í gær"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "fyrir %d dögum"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "síðasta mánuði"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "fyrir %d mánuðum"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "síðasta ári"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "einhverjum árum"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 85dc87ad7d9..cd72b76be08 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -121,7 +121,11 @@ msgstr ""
msgid "Updated"
msgstr "Uppfært"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Er að vista ..."
@@ -142,31 +146,31 @@ msgstr ""
msgid "Groups"
msgstr "Hópar"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Hópstjóri"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Eyða"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr ""
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr ""
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__nafn_tungumáls__"
@@ -237,106 +241,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Meira"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Minna"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Útgáfa"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Dulkóðun"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index be713f10c07..389e4c206ef 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -155,198 +155,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Prúfa uppsetningu"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Hjálp"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 173d4522e0d..e2a608899bb 100644
--- a/l10n/it/core.po
+++ b/l10n/it/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -140,59 +140,59 @@ msgstr "Novembre"
msgid "December"
msgstr "Dicembre"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Impostazioni"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "secondi fa"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "Un minuto fa"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minuti fa"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 ora fa"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} ore fa"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "oggi"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} giorni fa"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "mese scorso"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} mesi fa"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "mesi fa"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "anno scorso"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "anni fa"
@@ -200,23 +200,19 @@ msgstr "anni fa"
msgid "Choose"
msgstr "Scegli"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Annulla"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Errore durante il caricamento del modello del selezionatore di file"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Sì"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ok"
@@ -380,9 +376,10 @@ msgstr "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"http
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Ripristino password di ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -581,6 +578,10 @@ msgstr "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento."
msgid "Log out"
msgstr "Esci"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Accesso automatico rifiutato."
@@ -618,14 +619,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso «%s» con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "precedente"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "successivo"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 17724a5967a..5f8c561cb46 100644
--- a/l10n/it/files.po
+++ b/l10n/it/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -96,12 +96,12 @@ msgstr "Spazio disponibile insufficiente"
msgid "Upload cancelled."
msgstr "Invio annullato"
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "L'URL non può essere vuoto."
@@ -109,8 +109,8 @@ msgstr "L'URL non può essere vuoto."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Errore"
@@ -122,15 +122,11 @@ msgstr "Condividi"
msgid "Delete permanently"
msgstr "Elimina definitivamente"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Elimina"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Rinomina"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "In corso"
@@ -158,15 +154,13 @@ msgstr "sostituito {new_name} con {old_name}"
msgid "undo"
msgstr "annulla"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "esegui l'operazione di eliminazione"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 file in fase di caricamento"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "caricamento file"
@@ -192,43 +186,45 @@ msgstr "Lo spazio di archiviazione è pieno, i file non possono essere più aggi
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
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:344
+#: js/files.js:358
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:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nome"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Dimensione"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Modificato"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 cartella"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} cartelle"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 file"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} file"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -311,6 +307,10 @@ msgstr "Scarica"
msgid "Unshare"
msgstr "Rimuovi condivisione"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Elimina"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Caricamento troppo grande"
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index d550f72c047..eac60e403ba 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.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-08-03 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 07:00+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -64,18 +64,18 @@ msgid ""
"files."
msgstr "La chiave privata non è valida! Forse la password è stata cambiata esternamente al sistema di ownCloud (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Requisiti mancanti."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata."
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr "I seguenti utenti non sono configurati per la cifratura:"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index b2ebeff4403..f314ab509b1 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index 19d8c8f15d3..188d8e7e9c0 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/files_trashbin.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-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 06:00+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -52,21 +52,17 @@ msgstr "Nome"
msgid "Deleted"
msgstr "Eliminati"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 cartella"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} cartelle"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 file"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} file"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index ef7fe07c142..0802ffca262 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -36,14 +36,10 @@ msgid "Users"
msgstr "Utenti"
#: app.php:409
-msgid "Apps"
-msgstr "Applicazioni"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Aggiornamento non riuscito \"%s\"."
@@ -79,10 +75,6 @@ msgid ""
"administrator."
msgstr "Scarica i file in blocchi più piccoli, separatamente o chiedi al tuo amministratore."
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "non può essere determinato"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "L'applicazione non è abilitata"
@@ -212,50 +204,46 @@ msgid "seconds ago"
msgstr "secondi fa"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "Un minuto fa"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minuti fa"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 ora fa"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d ore fa"
-
-#: template/functions.php:85
msgid "today"
msgstr "oggi"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "ieri"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d giorni fa"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "mese scorso"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d mesi fa"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "anno scorso"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "anni fa"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 11753861f8b..8736fd0d1a0 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -123,7 +123,11 @@ msgstr "Errore durante l'aggiornamento"
msgid "Updated"
msgstr "Aggiornato"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Salvataggio in corso..."
@@ -144,31 +148,31 @@ msgstr "Impossibile rimuovere l'utente"
msgid "Groups"
msgstr "Gruppi"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Gruppi amministrati"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Elimina"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "aggiungi gruppo"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Deve essere fornito un nome utente valido"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Errore durante la creazione dell'utente"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Deve essere fornita una password valida"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Italiano"
@@ -239,106 +243,106 @@ msgstr "Questo server ownCloud non ha una connessione a Internet funzionante. Ci
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Esegui un'operazione con ogni pagina caricata"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php è registrato su un servizio webcron per invocare la pagina cron.php ogni minuto su http."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "Usa il servizio cron di sistema per invocare il file cron.php ogni minuto."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Condivisione"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Abilita API di condivisione"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Consenti alle applicazioni di utilizzare le API di condivisione"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Consenti collegamenti"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Consenti caricamenti pubblici"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Consenti agli utenti di abilitare altri al caricamento nelle loro cartelle pubbliche condivise"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Consenti la ri-condivisione"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Consenti agli utenti di condividere a loro volta elementi condivisi da altri"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Consenti agli utenti di condividere con chiunque"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Consenti agli utenti di condividere solo con utenti dei loro gruppi"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Protezione"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Forza HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forza i client a connettersi a %s tramite una connessione cifrata."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Log"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Livello di log"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Altro"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Meno"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versione"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -468,6 +472,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Utilizza questo indirizzo per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedere ai tuoi file via WebDAV</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Cifratura"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Nome utente"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index b71bd28689d..c9793a8644e 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -155,198 +155,185 @@ msgstr "Filtro per l'accesso utente"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtro per l'elenco utenti"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Specifica quale filtro utilizzare durante il recupero degli utenti."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Filtro per il gruppo"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Specifica quale filtro utilizzare durante il recupero dei gruppi."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Impostazioni di connessione"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Configurazione attiva"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Se deselezionata, questa configurazione sarà saltata."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Porta"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Host di backup (Replica)"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Fornisci un host di backup opzionale. Deve essere una replica del server AD/LDAP principale."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Porta di backup (Replica)"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Disabilita server principale"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr "Collegati solo al server di replica."
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Usa TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Da non utilizzare per le connessioni LDAPS, non funzionerà."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Case insensitve LDAP server (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Disattiva il controllo del certificato SSL."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server %s."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Non consigliato, utilizzare solo per test."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Tempo di vita della cache"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "in secondi. Il cambio svuota la cache."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Impostazioni delle cartelle"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Campo per la visualizzazione del nome utente"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr "L'attributo LDAP da usare per generare il nome visualizzato dell'utente."
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Struttura base dell'utente"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Un DN base utente per riga"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Attributi di ricerca utente"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Opzionale; un attributo per riga"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Campo per la visualizzazione del nome del gruppo"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr "L'attributo LDAP da usare per generare il nome visualizzato del gruppo."
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Struttura base del gruppo"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Un DN base gruppo per riga"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Attributi di ricerca gruppo"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Associazione gruppo-utente "
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Attributi speciali"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Campo Quota"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Quota predefinita"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "in byte"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Campo Email"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Regola di assegnazione del nome della cartella utente"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Nome utente interno"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri: [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà aggiunto/incrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una parte di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti)."
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Attributo nome utente interno:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Ignora rilevamento UUID"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "In modo predefinito, l'attributo UUID viene rilevato automaticamente. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti)."
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "Attributo UUID:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Associazione Nome utente-Utente LDAP"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
"experimental stage."
msgstr "I nomi utente sono utilizzati per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate. Il nome utente interno è utilizzato dappertutto. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione, ma solo in una fase sperimentale o di test."
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Cancella associazione Nome utente-Utente LDAP"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Cancella associazione Nome gruppo-Gruppo LDAP"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Prova configurazione"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Aiuto"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 0118ea9fe20..93d6745203d 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -5,12 +5,14 @@
# Translators:
# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
# plazmism <gomidori@live.jp>, 2013
+# Koichi MATSUMOTO <mzch@me.com>, 2013
+# tt yn <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -139,59 +141,55 @@ msgstr "11月"
msgid "December"
msgstr "12月"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "設定"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "数秒前"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 分前"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n 分前"
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} 分前"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n 時間後"
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 時間前"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} 時間前"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "今日"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} 日前"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "%n 日後"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "一月前"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} 月前"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n カ月後"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "月前"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "一年前"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "年前"
@@ -199,23 +197,19 @@ msgstr "年前"
msgid "Choose"
msgstr "選択"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "ファイルピッカーのテンプレートの読み込みエラー"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "はい"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "いいえ"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "OK"
@@ -379,9 +373,10 @@ msgstr "更新に成功しました。この問題を <a href=\"https://github.c
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "更新に成功しました。今すぐownCloudにリダイレクトします。"
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloudのパスワードをリセットします"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "%s パスワードリセット"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -498,7 +493,7 @@ msgstr "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "%s を安全に利用する為に インストールされているPHPをアップデートしてください。"
#: templates/installation.php:32
msgid ""
@@ -523,7 +518,7 @@ msgstr ".htaccess ファイルが動作していないため、おそらくあ
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。"
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -580,6 +575,10 @@ msgstr "%s が利用可能です。更新方法に関してさらに情報を取
msgid "Log out"
msgstr "ログアウト"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "他のアプリ"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "自動ログインは拒否されました!"
@@ -617,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>それでは。"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "前"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "次"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 90a702baaa7..e27df447a18 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -5,15 +5,16 @@
# Translators:
# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
# plazmism <gomidori@live.jp>, 2013
+# Koichi MATSUMOTO <mzch@me.com>, 2013
# pabook <pabook.32@gmail.com>, 2013
# tt yn <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-20 09:00+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"
@@ -98,21 +99,21 @@ msgstr "利用可能なスペースが十分にありません"
msgid "Upload cancelled."
msgstr "アップロードはキャンセルされました。"
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:234 js/files.js:353
msgid "URL cannot be empty."
msgstr "URLは空にできません。"
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:239 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "エラー"
@@ -124,15 +125,11 @@ msgstr "共有"
msgid "Delete permanently"
msgstr "完全に削除する"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "削除"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "名前の変更"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "中断"
@@ -160,15 +157,12 @@ msgstr "{old_name} を {new_name} に置換"
msgid "undo"
msgstr "元に戻す"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "削除を実行"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "%n 個のファイルをアップロード中"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "ファイルを1つアップロード中"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "ファイルをアップロード中"
@@ -194,43 +188,43 @@ msgstr "あなたのストレージは一杯です。ファイルの更新と同
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "あなたのストレージはほぼ一杯です({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。"
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。"
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "名前"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "サイズ"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "変更"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 フォルダ"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n個のフォルダ"
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} フォルダ"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 ファイル"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} ファイル"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n個のファイル"
#: lib/app.php:73
#, php-format
@@ -313,6 +307,10 @@ msgstr "ダウンロード"
msgid "Unshare"
msgstr "共有解除"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "削除"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "アップロードには大きすぎます。"
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index abf03aaf897..ba39e536210 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
+"Last-Translator: tt yn <tetuyano+transi@gmail.com>\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"
@@ -64,20 +64,20 @@ msgid ""
"files."
msgstr "秘密鍵が有効ではありません。パスワードがownCloudシステムの外部(例えば、企業ディレクトリ)から変更された恐れがあります。個人設定で秘密鍵のパスワードを更新して、暗号化されたファイルを回復出来ます。"
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "必要要件が満たされていません。"
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "必ず、PHP 5.3.3以上をインストールし、OpenSSLのPHP拡張を有効にして適切に設定してください。現時点では暗号化アプリは無効になっています。"
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。"
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "以下のユーザーは、暗号化設定がされていません:"
#: js/settings-admin.js:11
msgid "Saving..."
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index 7ce0742beb9..a2bd99586b9 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"Last-Translator: tt yn <tetuyano+transi@gmail.com>\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"
@@ -32,27 +32,27 @@ msgstr "送信"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "申し訳ございません。このリンクはもう利用できません。"
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "理由は以下の通りと考えられます:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "アイテムが削除されました"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "リンクの期限が切れています"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "共有が無効になっています"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "不明な点は、こちらのリンクの提供者に確認をお願いします。"
#: templates/public.php:15
#, php-format
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index 6c8e95fefdf..a52a5067369 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/files_trashbin.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# plazmism <gomidori@live.jp>, 2013
+# tt yn <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"PO-Revision-Date: 2013-08-15 09:50+0000\n"
+"Last-Translator: plazmism <gomidori@live.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"
@@ -51,25 +53,19 @@ msgstr "名前"
msgid "Deleted"
msgstr "削除済み"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 フォルダ"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n個のフォルダ"
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} フォルダ"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 ファイル"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} ファイル"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n個のファイル"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
-msgstr ""
+msgstr "復元済"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index 3946f049c5a..d6a42e38c1d 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Koichi MATSUMOTO <mzch@me.com>, 2013
# tt yn <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,17 +36,13 @@ msgid "Users"
msgstr "ユーザ"
#: app.php:409
-msgid "Apps"
-msgstr "アプリ"
-
-#: app.php:417
msgid "Admin"
msgstr "管理"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "\"%s\" へのアップグレードに失敗しました。"
#: defaults.php:35
msgid "web services under your control"
@@ -54,7 +51,7 @@ msgstr "管理下のウェブサービス"
#: files.php:66 files.php:98
#, php-format
msgid "cannot open \"%s\""
-msgstr ""
+msgstr "\"%s\" が開けません"
#: files.php:226
msgid "ZIP download is turned off."
@@ -76,11 +73,7 @@ msgstr "選択したファイルはZIPファイルの生成には大きすぎま
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
-msgstr ""
-
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "測定できませんでした"
+msgstr "ファイルは、小さいファイルに分割されてダウンロードされます。もしくは、管理者にお尋ねください。"
#: json.php:28
msgid "Application is not enabled"
@@ -211,56 +204,48 @@ msgid "seconds ago"
msgstr "数秒前"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 分前"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n 分前"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d 分前"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n 時間後"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 時間前"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d 時間前"
-
-#: template/functions.php:85
msgid "today"
msgstr "今日"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "昨日"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d 日前"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] "%n 日後"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "一月前"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d 分前"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n カ月後"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "一年前"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "年前"
#: template.php:297
msgid "Caused by:"
-msgstr ""
+msgstr "原因は以下:"
#: vcategories.php:188 vcategories.php:249
#, php-format
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index d7754992c93..913c5d1b9a7 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 09:10+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"
@@ -123,7 +123,11 @@ msgstr "アプリの更新中にエラーが発生"
msgid "Updated"
msgstr "更新済み"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。"
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "保存中..."
@@ -144,31 +148,31 @@ msgstr "ユーザを削除出来ません"
msgid "Groups"
msgstr "グループ"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "グループ管理者"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "削除"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "グループを追加"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "有効なユーザ名を指定する必要があります"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "ユーザ作成エラー"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "有効なパスワードを指定する必要があります"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Japanese (日本語)"
@@ -239,106 +243,106 @@ msgstr "このサーバーはインターネットに接続していません。
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "各ページの読み込み時にタスクを実行する"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "http経由で1分間に1回cron.phpを呼び出すように cron.phpがwebcron サービスに登録されています。"
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "cron.phpファイルを1分間に1回実行する為にサーバーのcronサービスを利用する。"
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "共有"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "共有APIを有効にする"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "アプリからの共有APIの利用を許可する"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "リンクを許可する"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "リンクによりアイテムを公開することを許可する"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "パブリックなアップロードを許可"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "公開している共有フォルダへのアップロードを共有しているメンバーにも許可"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "再共有を許可する"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "ユーザが共有しているアイテムの再共有を許可する"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "ユーザが誰とでも共有することを許可する"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "ユーザにグループ内のユーザとのみ共有を許可する"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "セキュリティ"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "常にHTTPSを使用する"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "クライアントから %sへの接続を常に暗号化する。"
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "強制的なSSL接続を有効/無効にするために、HTTPS経由で %s へ接続してください。"
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "ログ"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "ログレベル"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "もっと見る"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "閉じる"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "バージョン"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -468,6 +472,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV経由でファイルにアクセス</a>するにはこのアドレスを利用してください"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "暗号化"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください"
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr "ログインパスワード"
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr "すべてのファイルを複合する"
+
#: templates/users.php:21
msgid "Login Name"
msgstr "ログイン名"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index cdb3a32b0bf..cbbbfc99a47 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -4,13 +4,14 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# tt yn <tetuyano+transi@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 09:10+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"
@@ -91,7 +92,7 @@ msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behavior. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能性があります。システム管理者にどちらかを無効にするよう問い合わせてください。"
#: templates/settings.php:12
msgid ""
@@ -155,198 +156,185 @@ msgstr "ユーザログインフィルタ"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。"
+"username in the login action. Example: \"uid=%%uid\""
+msgstr "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザ名が入ります。例: \"uid=%%uid\""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "ユーザリストフィルタ"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "ユーザーを取得するときに適用するフィルターを定義する。"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "プレースホルダーを利用しないでください。例 \"objectClass=person\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr "ユーザ取得時に適用するフィルタを定義します(プレースホルダ無し)。例: \"objectClass=person\""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "グループフィルタ"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "グループを取得するときに適用するフィルターを定義する。"
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr "グループ取得時に適用するフィルタを定義します(プレースホルダ無し)。例: \"objectClass=posixGroup\""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "接続設定"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "設定はアクティブです"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "チェックを外すと、この設定はスキップされます。"
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "ポート"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "バックアップ(レプリカ)ホスト"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバのレプリカである必要があります。"
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "バックアップ(レプリカ)ポート"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "メインサーバを無効にする"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "レプリカサーバーにのみ接続します。"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "TLSを利用"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "LDAPS接続のために追加でそれを利用しないで下さい。失敗します。"
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "大文字/小文字を区別しないLDAPサーバ(Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "SSL証明書の確認を無効にする。"
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "推奨しません、テスト目的でのみ利用してください。"
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr "推奨されません、テストにおいてのみ使用してください!このオプションでのみ接続が動作する場合は、LDAP サーバのSSL証明書を %s サーバにインポートしてください。"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "キャッシュのTTL"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "秒。変更後にキャッシュがクリアされます。"
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "ディレクトリ設定"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "ユーザ表示名のフィールド"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "ユーザの表示名の生成に利用するLDAP属性"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "ベースユーザツリー"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "1行に1つのユーザベースDN"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "ユーザ検索属性"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "オプション:1行に1属性"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "グループ表示名のフィールド"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "ユーザのグループ表示名の生成に利用するLDAP属性"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "ベースグループツリー"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "1行に1つのグループベースDN"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "グループ検索属性"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "グループとメンバーの関連付け"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "特殊属性"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "クォータフィールド"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "クォータのデフォルト"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "バイト"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "メールフィールド"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "ユーザのホームフォルダ命名規則"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "ユーザ名を空のままにしてください(デフォルト)。そうでない場合は、LDAPもしくはADの属性を指定してください。"
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "内部ユーザ名"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -360,17 +348,17 @@ msgid ""
"behavior as before ownCloud 5 enter the user display name attribute in the "
"following field. Leave it empty for default behavior. Changes will have "
"effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "デフォルトでは、内部ユーザ名はUUID属性から作成されます。これにより、ユーザ名がユニークであり、かつ文字の変換が不要であることを保証します。内部ユーザ名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザ名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダ名としても用いられます。例えば*DAVサービスのように、リモートURLの一部でもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザ表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング(追加)されたLDAPユーザにおいてのみ有効となります。"
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "内部ユーザ名属性:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "UUID検出を再定義する"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -379,17 +367,17 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behavior. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング(追加)されたLDAPユーザとLDAPグループに対してのみ有効となります。"
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "UUID属性:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "ユーザ名とLDAPユーザのマッピング"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -401,20 +389,20 @@ msgid ""
" is not configuration sensitive, it affects all LDAP configurations! Never "
"clear the mappings in a production environment, only in a testing or "
"experimental stage."
-msgstr ""
+msgstr "ユーザ名は(メタ)データの保存と割り当てに使用されます。ユーザを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザ名からLDAPユーザへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます!本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "ユーザ名とLDAPユーザのマッピングをクリアする"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "グループ名とLDAPグループのマッピングをクリアする"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "設定をテスト"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "ヘルプ"
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index a6e96b91fef..16224d91946 100644
--- a/l10n/ka/core.po
+++ b/l10n/ka/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -137,59 +137,55 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr ""
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "წამის წინ"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 წუთის წინ"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 საათის წინ"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "დღეს"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "გუშინ"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +193,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -377,8 +369,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -578,6 +571,10 @@ msgstr ""
msgid "Log out"
msgstr ""
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +612,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index bae4e7aefa5..0ba377534ee 100644
--- a/l10n/ka/files.po
+++ b/l10n/ka/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,15 +120,11 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr ""
@@ -156,15 +152,12 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +183,43 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +302,10 @@ msgstr "გადმოწერა"
msgid "Unshare"
msgstr ""
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
#: templates/index.php:105
msgid "Upload too large"
msgstr ""
diff --git a/l10n/ka/files_encryption.po b/l10n/ka/files_encryption.po
index c2da2724657..581f6b03001 100644
--- a/l10n/ka/files_encryption.po
+++ b/l10n/ka/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index 5bc5f41fc52..64ba6094207 100644
--- a/l10n/ka/files_sharing.po
+++ b/l10n/ka/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_trashbin.po b/l10n/ka/files_trashbin.po
index 90098bc62cc..36d83d1478b 100644
--- a/l10n/ka/files_trashbin.po
+++ b/l10n/ka/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,15 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ka/lib.po b/l10n/ka/lib.po
index 9c181af82e1..cf8cf5f9064 100644
--- a/l10n/ka/lib.po
+++ b/l10n/ka/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "მომხმარებლები"
#: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
msgid "Admin"
msgstr "ადმინისტრატორი"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,42 @@ msgid "seconds ago"
msgstr "წამის წინ"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 წუთის წინ"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d წუთის წინ"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 საათის წინ"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template/functions.php:85
msgid "today"
msgstr "დღეს"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "გუშინ"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d დღის წინ"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr ""
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po
index 82c0600bc84..e4fb05fac6b 100644
--- a/l10n/ka/settings.po
+++ b/l10n/ka/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
index 2ed240f9a6f..537446f5b40 100644
--- a/l10n/ka/user_ldap.po
+++ b/l10n/ka/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "შველა"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index a6bb4bf0094..13d2a8bc987 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,55 @@ msgstr "ნოემბერი"
msgid "December"
msgstr "დეკემბერი"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "პარამეტრები"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "წამის წინ"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 წუთის წინ"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} წუთის წინ"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 საათის წინ"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} საათის წინ"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "დღეს"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "გუშინ"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} დღის წინ"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "გასულ თვეში"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} თვის წინ"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "თვის წინ"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "ბოლო წელს"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "წლის წინ"
@@ -197,23 +193,19 @@ msgstr "წლის წინ"
msgid "Choose"
msgstr "არჩევა"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "უარყოფა"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "კი"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "არა"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "დიახ"
@@ -377,9 +369,10 @@ msgstr "განახლება ვერ განხორციელდ
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud პაროლის შეცვლა"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +571,10 @@ msgstr ""
msgid "Log out"
msgstr "გამოსვლა"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "ავტომატური შესვლა უარყოფილია!"
@@ -615,14 +612,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "წინა"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "შემდეგი"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 04b3363a7d3..1706eb1ccdd 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr "საკმარისი ადგილი არ არის"
msgid "Upload cancelled."
msgstr "ატვირთვა შეჩერებულ იქნა."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას"
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL არ შეიძლება იყოს ცარიელი."
@@ -107,8 +107,8 @@ msgstr "URL არ შეიძლება იყოს ცარიელი."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "შეცდომა"
@@ -120,15 +120,11 @@ msgstr "გაზიარება"
msgid "Delete permanently"
msgstr "სრულად წაშლა"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "წაშლა"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "გადარქმევა"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "მოცდის რეჟიმში"
@@ -156,15 +152,12 @@ msgstr "{new_name} შეცვლილია {old_name}–ით"
msgid "undo"
msgstr "დაბრუნება"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "მიმდინარეობს წაშლის ოპერაცია"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 ფაილის ატვირთვა"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "ფაილები იტვირთება"
@@ -190,43 +183,43 @@ msgstr "თქვენი საცავი გადაივსო. ფა
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "დაუშვებელი ფოლდერის სახელი. 'Shared'–ის გამოყენება რეზერვირებულია Owncloud–ის მიერ"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "სახელი"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "ზომა"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "შეცვლილია"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 საქაღალდე"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} საქაღალდე"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 ფაილი"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} ფაილი"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +302,10 @@ msgstr "ჩამოტვირთვა"
msgid "Unshare"
msgstr "გაუზიარებადი"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "წაშლა"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "ასატვირთი ფაილი ძალიან დიდია"
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index 2b1948e6609..7fde56cdb73 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 31c89e7e6cd..65b24c1c116 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 550132c2d1f..b41813f0a6d 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,15 @@ msgstr "სახელი"
msgid "Deleted"
msgstr "წაშლილი"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 საქაღალდე"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} საქაღალდე"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 ფაილი"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} ფაილი"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index cbc529f5892..3a986486330 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "მომხმარებელი"
#: app.php:409
-msgid "Apps"
-msgstr "აპლიკაციები"
-
-#: app.php:417
msgid "Admin"
msgstr "ადმინისტრატორი"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "ვერ განისაზღვრა"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "აპლიკაცია არ არის აქტიური"
@@ -210,50 +202,42 @@ msgid "seconds ago"
msgstr "წამის წინ"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 წუთის წინ"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d წუთის წინ"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 საათის წინ"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d საათის წინ"
-
-#: template/functions.php:85
msgid "today"
msgstr "დღეს"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "გუშინ"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d დღის წინ"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "გასულ თვეში"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d თვის წინ"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "ბოლო წელს"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "წლის წინ"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 9d20dea82bd..61c49828358 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -121,7 +121,11 @@ msgstr "შეცდომა აპლიკაციის განახლ
msgid "Updated"
msgstr "განახლებულია"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "შენახვა..."
@@ -142,31 +146,31 @@ msgstr "მომხმარებლის წაშლა ვერ მოხ
msgid "Groups"
msgstr "ჯგუფები"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "ჯგუფის ადმინისტრატორი"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "წაშლა"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "ჯგუფის დამატება"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "უნდა მიუთითოთ არსებული მომხმარებლის სახელი"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "შეცდომა მომხმარებლის შექმნისას"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "უნდა მიუთითოთ არსებული პაროლი"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -237,106 +241,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron–ი"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "გაზიარება"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Share API–ის ჩართვა"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "დაუშვი აპლიკაციების უფლება Share API –ზე"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "ლინკების დაშვება"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "მიეცი მომხმარებლებს უფლება რომ გააზიაროს ელემენტები საჯაროდ ლინკებით"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "გადაზიარების დაშვება"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "მიეცით მომხმარებლებს უფლება რომ გააზიაროს მისთვის გაზიარებული"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "მიეცით უფლება მომხმარებლებს გააზიაროს ყველასთვის"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "მიეცით უფლება მომხმარებლებს რომ გააზიაროს მხოლოდ თავიანთი ჯგუფისთვის"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "უსაფრთხოება"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "HTTPS–ის ჩართვა"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "ლოგი"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "ლოგირების დონე"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "უფრო მეტი"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "უფრო ნაკლები"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "ვერსია"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "ენკრიპცია"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "მომხმარებლის სახელი"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index a0beedfcc2f..da010f03eee 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "მომხმარებლის ფილტრი"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "როცა შემოსვლა განხორციელდება ასეიძლება მოვახდინოთ გაფილტვრა. %%uid შეიცვლება იუზერნეიმით მომხმარებლის ველში."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "გამოიყენეთ %%uid დამასრულებელი მაგ: \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "მომხმარებლებიის სიის ფილტრი"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "გაფილტვრა განხორციელდება, როცა მომხმარებლების სია ჩამოიტვირთება."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "ჯგუფის ფილტრი"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "გაფილტვრა განხორციელდება, როცა ჯგუფის სია ჩამოიტვირთება."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "კავშირის პარამეტრები"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "კონფიგურაცია აქტიურია"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "როცა გადანიშნულია, ეს კონფიგურაცია გამოტოვებული იქნება."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "პორტი"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "ბექაფ (რეპლიკა) ჰოსტი"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "მიუთითეთ რაიმე ბექაფ ჰოსტი. ის უნდა იყოს ძირითადი LDAP/AD სერვერის რეპლიკა."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "ბექაფ (რეპლიკა) პორტი"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "გამორთეთ ძირითადი სერვერი"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "გამოიყენეთ TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "არ გამოიყენოთ დამატებით LDAPS კავშირი. ის წარუმატებლად დასრულდება."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "გამორთეთ SSL სერთიფიკატის ვალიდაცია."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "არ არის რეკომენდირებული, გამოიყენეთ მხოლოდ სატესტოდ."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "ქეშის სიცოცხლის ხანგრძლივობა"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "წამებში. ცვლილება ასუფთავებს ქეშს."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "დირექტორიის პარამეტრები"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "მომხმარებლის დისფლეის სახელის ფილდი"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "ძირითად მომხმარებელთა სია"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "ერთი მომხმარებლის საწყისი DN ერთ ხაზზე"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "მომხმარებლის ძებნის ატრიბუტი"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "ოფციონალური; თითო ატრიბუტი თითო ხაზზე"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "ჯგუფის დისფლეის სახელის ფილდი"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "ძირითად ჯგუფთა სია"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "ერთი ჯგუფის საწყისი DN ერთ ხაზზე"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "ჯგუფური ძებნის ატრიბუტი"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "ჯგუფის წევრობის ასოციაცია"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "სპეციალური ატრიბუტები"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "ქვოტას ველი"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "საწყისი ქვოტა"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "ბაიტებში"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "იმეილის ველი"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "მომხმარებლის Home დირექტორიის სახელების დარქმევის წესი"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "დატოვეთ ცარიელი მომხმარებლის სახელი (default). სხვა დანარჩენში მიუთითეთ LDAP/AD ატრიბუტი."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "კავშირის ტესტირება"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "დახმარება"
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index fe738594442..1ebb511ac38 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -137,59 +137,55 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr ""
-#: js/js.js:715
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:716
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:717
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:718
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
-#: js/js.js:719
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
-#: js/js.js:720
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:721
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:722
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: js/js.js:723
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:724
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: js/js.js:725
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:726
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:727
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +193,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -226,7 +218,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:631 js/share.js:643
+#: js/share.js:643 js/share.js:655
msgid "Error"
msgstr ""
@@ -246,7 +238,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:671
+#: js/share.js:131 js/share.js:683
msgid "Error while sharing"
msgstr ""
@@ -346,23 +338,23 @@ msgstr ""
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:618
+#: js/share.js:398 js/share.js:630
msgid "Password protected"
msgstr ""
-#: js/share.js:631
+#: js/share.js:643
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:643
+#: js/share.js:655
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:658
+#: js/share.js:670
msgid "Sending ..."
msgstr ""
-#: js/share.js:669
+#: js/share.js:681
msgid "Email sent"
msgstr ""
@@ -377,8 +369,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -461,7 +454,7 @@ msgstr ""
msgid "Access forbidden"
msgstr ""
-#: templates/404.php:12
+#: templates/404.php:15
msgid "Cloud not found"
msgstr ""
@@ -578,6 +571,10 @@ msgstr ""
msgid "Log out"
msgstr ""
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +612,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 83638dc16fd..810fccb7bf6 100644
--- a/l10n/kn/files.po
+++ b/l10n/kn/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-07-22 01:54-0400\n"
-"PO-Revision-Date: 2013-07-22 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,11 +120,7 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
@@ -156,15 +152,12 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
-
-#: js/filelist.js:457
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
-#: js/filelist.js:460 js/filelist.js:518
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +183,43 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/app.php:73
#, php-format
@@ -285,45 +278,49 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Deleted files"
msgstr ""
-#: templates/index.php:48
+#: templates/index.php:46
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:54
+#: templates/index.php:52
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:61
+#: templates/index.php:59
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:73
msgid "Download"
msgstr ""
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
msgid "Unshare"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:105
msgid "Upload too large"
msgstr ""
-#: templates/index.php:109
+#: templates/index.php:107
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:114
+#: templates/index.php:112
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:117
+#: templates/index.php:115
msgid "Current scanning"
msgstr ""
diff --git a/l10n/kn/files_encryption.po b/l10n/kn/files_encryption.po
index e02a0220c2c..be1a9ea38cd 100644
--- a/l10n/kn/files_encryption.po
+++ b/l10n/kn/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/kn/files_trashbin.po b/l10n/kn/files_trashbin.po
index 0f12a8c380b..4a8a4c3ae76 100644
--- a/l10n/kn/files_trashbin.po
+++ b/l10n/kn/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,15 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index 9b637e4cf9f..63406f842e7 100644
--- a/l10n/kn/lib.po
+++ b/l10n/kn/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: 2013-07-24 01:55-0400\n"
-"PO-Revision-Date: 2013-07-24 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -34,19 +34,15 @@ msgid "Users"
msgstr ""
#: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
msgid "Admin"
msgstr ""
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: defaults.php:33
+#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,54 +202,46 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
-#: template.php:296
+#: template.php:297
msgid "Caused by:"
msgstr ""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index 224c7063ecd..cc0192feeb9 100644
--- a/l10n/kn/settings.po
+++ b/l10n/kn/settings.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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index e24987ef4dd..24c7a343258 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/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: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index f3161b3030c..f99e2b89d90 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -139,59 +139,55 @@ msgstr "11월"
msgid "December"
msgstr "12월"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "설정"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "초 전"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1분 전"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes}분 전"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1시간 전"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours}시간 전"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "오늘"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "어제"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days}일 전"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "지난 달"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months}개월 전"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "개월 전"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "작년"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "년 전"
@@ -199,23 +195,19 @@ msgstr "년 전"
msgid "Choose"
msgstr "선택"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "취소"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "예"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "아니요"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "승락"
@@ -379,9 +371,10 @@ msgstr "업데이트가 실패하였습니다. 이 문제를 <a href=\"https://g
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "업데이트가 성공하였습니다. ownCloud로 돌아갑니다."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud 암호 재설정"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -580,6 +573,10 @@ msgstr ""
msgid "Log out"
msgstr "로그아웃"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "자동 로그인이 거부되었습니다!"
@@ -617,14 +614,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "이전"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "다음"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 57cf7f3dfa8..cdab5cceeb1 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -96,12 +96,12 @@ msgstr "여유 공간이 부족합니다"
msgid "Upload cancelled."
msgstr "업로드가 취소되었습니다."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL을 입력해야 합니다."
@@ -109,8 +109,8 @@ msgstr "URL을 입력해야 합니다."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "오류"
@@ -122,15 +122,11 @@ msgstr "공유"
msgid "Delete permanently"
msgstr "영원히 삭제"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "삭제"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "이름 바꾸기"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "대기 중"
@@ -158,15 +154,12 @@ msgstr "{old_name}이(가) {new_name}(으)로 대체됨"
msgid "undo"
msgstr "되돌리기"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "삭제 작업중"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "파일 1개 업로드 중"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "파일 업로드중"
@@ -192,43 +185,43 @@ msgstr "저장 공간이 가득 찼습니다. 파일을 업데이트하거나
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "폴더 이름이 유효하지 않습니다. "
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "이름"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "크기"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "수정됨"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "폴더 1개"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "폴더 {count}개"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "파일 1개"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "파일 {count}개"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/app.php:73
#, php-format
@@ -311,6 +304,10 @@ msgstr "다운로드"
msgid "Unshare"
msgstr "공유 해제"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "삭제"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "업로드한 파일이 너무 큼"
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 848bb1530ca..96c4ba62311 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -62,18 +62,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index f3be635c899..6de0e6cf3d2 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index ca3ff2f09c4..3e48f534a18 100644
--- a/l10n/ko/files_trashbin.po
+++ b/l10n/ko/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,15 @@ msgstr "이름"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "폴더 1개"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "폴더 {count}개"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "파일 1개"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "파일 {count}개"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index a603bde297f..780a12d6343 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "사용자"
#: app.php:409
-msgid "Apps"
-msgstr "앱"
-
-#: app.php:417
msgid "Admin"
msgstr "관리자"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "결정할 수 없음"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "앱이 활성화되지 않았습니다"
@@ -211,50 +203,42 @@ msgid "seconds ago"
msgstr "초 전"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1분 전"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d분 전"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1시간 전"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d시간 전"
-
-#: template/functions.php:85
msgid "today"
msgstr "오늘"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "어제"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d일 전"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "지난 달"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d개월 전"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "작년"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "년 전"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 43a6a722423..3b5fbb866a4 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -121,7 +121,11 @@ msgstr "앱을 업데이트하는 중 오류 발생"
msgid "Updated"
msgstr "업데이트됨"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "저장 중..."
@@ -142,31 +146,31 @@ msgstr "사용자를 삭제할 수 없음"
msgid "Groups"
msgstr "그룹"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "그룹 관리자"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "삭제"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "그룹 추가"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "올바른 사용자 이름을 입력해야 함"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "사용자 생성 오류"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "올바른 암호를 입력해야 함"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "한국어"
@@ -237,106 +241,106 @@ msgstr ""
msgid "Cron"
msgstr "크론"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "개별 페이지를 불러올 때마다 실행"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "공유"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "공유 API 사용하기"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "앱에서 공유 API를 사용할 수 있도록 허용"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "링크 허용"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "사용자가 개별 항목의 링크를 공유할 수 있도록 허용"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "재공유 허용"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "사용자에게 공유된 항목을 다시 공유할 수 있도록 허용"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "누구나와 공유할 수 있도록 허용"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "사용자가 속해 있는 그룹의 사용자와만 공유할 수 있도록 허용"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "보안"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "HTTPS 강제 사용"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "로그"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "로그 단계"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "더 중요함"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "덜 중요함"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "버전"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "암호화"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "로그인 이름"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 547021c9105..903dc63b87f 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "사용자 로그인 필터"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "로그인을 시도할 때 적용할 필터입니다. %%uid는 로그인 작업에서의 사용자 이름으로 대체됩니다."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "%%uid 자리 비움자를 사용하십시오. 예제: \"uid=%%uid\"\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "사용자 목록 필터"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "사용자를 검색할 때 적용할 필터를 정의합니다."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=person\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "그룹 필터"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "그룹을 검색할 때 적용할 필터를 정의합니다."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "연결 설정"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "구성 활성화"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "포트"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "백업 (복제) 포트"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "백업 (복제) 포트"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "주 서버 비활성화"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "TLS 사용"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "서버에서 대소문자를 구분하지 않음 (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "SSL 인증서 유효성 검사를 해제합니다."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "추천하지 않음, 테스트로만 사용하십시오."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "초. 항목 변경 시 캐시가 갱신됩니다."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "디렉토리 설정"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "사용자의 표시 이름 필드"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "기본 사용자 트리"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "사용자 DN을 한 줄에 하나씩 입력하십시오"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "사용자 검색 속성"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "그룹의 표시 이름 필드"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "기본 그룹 트리"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "그룹 기본 DN을 한 줄에 하나씩 입력하십시오"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "그룹 검색 속성"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "그룹-회원 연결"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "바이트"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "도움말"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 2c8de7bc54c..d258cb5e7f3 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "ده‌ستكاری"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +197,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -377,8 +373,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr "چوونەدەرەوە"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "پێشتر"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "دواتر"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 978078f33b6..6a342f3dfac 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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
@@ -107,8 +107,8 @@ msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "هه‌ڵه"
@@ -120,15 +120,11 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr ""
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "ناو"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr "داگرتن"
msgid "Unshare"
msgstr ""
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
#: templates/index.php:105
msgid "Upload too large"
msgstr ""
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index 7cfa02f06a3..4df94a238d9 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 764a162a141..83b88021ea2 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index af7cba23c3d..1addb81ba48 100644
--- a/l10n/ku_IQ/files_trashbin.po
+++ b/l10n/ku_IQ/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr "ناو"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 84017f953cd..983e005aa24 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "به‌كارهێنه‌ر"
#: app.php:409
-msgid "Apps"
-msgstr "به‌رنامه‌كان"
-
-#: app.php:417
msgid "Admin"
msgstr "به‌ڕێوه‌به‌ری سه‌ره‌كی"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index 7285c3da28a..ba15b44ca9f 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "پاشکه‌وتده‌کات..."
@@ -141,31 +145,31 @@ msgstr ""
msgid "Groups"
msgstr ""
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr ""
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr ""
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr ""
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "نهێنیکردن"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 7d971996c51..c2ca53a1932 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "یارمەتی"
diff --git a/l10n/l10n.pl b/l10n/l10n.pl
index b07d6d686bc..851be8f7ccf 100644
--- a/l10n/l10n.pl
+++ b/l10n/l10n.pl
@@ -39,7 +39,7 @@ sub crawlFiles{
foreach my $i ( @files ){
next if substr( $i, 0, 1 ) eq '.';
next if $i eq 'l10n';
-
+
if( -d $dir.'/'.$i ){
push( @found, crawlFiles( $dir.'/'.$i ));
}
@@ -64,6 +64,16 @@ sub readIgnorelist{
return %ignore;
}
+sub getPluralInfo {
+ my( $info ) = @_;
+
+ # get string
+ $info =~ s/.*Plural-Forms: (.+)\\n.*/$1/;
+ $info =~ s/^(.*)\\n.*/$1/g;
+
+ return $info;
+}
+
my $task = shift( @ARGV );
my $place = '..';
@@ -100,11 +110,17 @@ if( $task eq 'read' ){
foreach my $file ( @totranslate ){
next if $ignore{$file};
- my $keyword = ( $file =~ /\.js$/ ? 't:2' : 't');
+ my $keywords = '';
+ if( $file =~ /\.js$/ ){
+ $keywords = '--keyword=t:2 --keyword=n:2,3';
+ }
+ else{
+ $keywords = '--keyword=t --keyword=n:1,2';
+ }
my $language = ( $file =~ /\.js$/ ? 'Python' : 'PHP');
my $joinexisting = ( -e $output ? '--join-existing' : '');
print " Reading $file\n";
- `xgettext --output="$output" $joinexisting --keyword=$keyword --language=$language "$file" --from-code=UTF-8 --package-version="5.0.0" --package-name="ownCloud Core" --msgid-bugs-address="translations\@owncloud.org"`;
+ `xgettext --output="$output" $joinexisting $keywords --language=$language "$file" --from-code=UTF-8 --package-version="5.0.0" --package-name="ownCloud Core" --msgid-bugs-address="translations\@owncloud.org"`;
}
chdir( $whereami );
}
@@ -118,7 +134,7 @@ elsif( $task eq 'write' ){
print " Processing $app\n";
foreach my $language ( @languages ){
next if $language eq 'templates';
-
+
my $input = "${whereami}/$language/$app.po";
next unless -e $input;
@@ -126,18 +142,38 @@ elsif( $task eq 'write' ){
my $array = Locale::PO->load_file_asarray( $input );
# Create array
my @strings = ();
+ my $plurals;
+
foreach my $string ( @{$array} ){
- next if $string->msgid() eq '""';
- next if $string->msgstr() eq '""';
- push( @strings, $string->msgid()." => ".$string->msgstr());
+ if( $string->msgid() eq '""' ){
+ # Translator information
+ $plurals = getPluralInfo( $string->msgstr());
+ }
+ elsif( defined( $string->msgstr_n() )){
+ # plural translations
+ my @variants = ();
+ my $identifier = $string->msgid()."::".$string->msgid_plural();
+ $identifier =~ s/"/_/g;
+
+ foreach my $variant ( sort { $a <=> $b} keys( %{$string->msgstr_n()} )){
+ push( @variants, $string->msgstr_n()->{$variant} );
+ }
+
+ push( @strings, "\"$identifier\" => array(".join(",", @variants).")");
+ }
+ else{
+ # singular translations
+ next if $string->msgstr() eq '""';
+ push( @strings, $string->msgid()." => ".$string->msgstr());
+ }
}
next if $#strings == -1; # Skip empty files
# Write PHP file
open( OUT, ">$language.php" );
- print OUT "<?php \$TRANSLATIONS = array(\n";
+ print OUT "<?php\n\$TRANSLATIONS = array(\n";
print OUT join( ",\n", @strings );
- print OUT "\n);\n";
+ print OUT "\n);\n\$PLURAL_FORMS = \"$plurals\";\n";
close( OUT );
}
chdir( $whereami );
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 77e438a5279..998bef35792 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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -138,59 +138,59 @@ msgstr "November"
msgid "December"
msgstr "Dezember"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Astellungen"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "Sekonnen hir"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 Minutt hir"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "virun {minutes} Minutten"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "virun 1 Stonn"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "virun {hours} Stonnen"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "haut"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "gëschter"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "virun {days} Deeg"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "leschte Mount"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "virun {months} Méint"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "Méint hir"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "Lescht Joer"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "Joren hir"
@@ -198,23 +198,19 @@ msgstr "Joren hir"
msgid "Choose"
msgstr "Auswielen"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Ofbriechen"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Feeler beim Luede vun der Virlag fir d'Fichiers-Selektioun"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Jo"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "OK"
@@ -378,9 +374,10 @@ msgstr "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Den Update war erfollegräich. Du gëss elo bei d'ownCloud ëmgeleet."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Passwuert-Zrécksetzung vun der ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -579,6 +576,10 @@ msgstr "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséi
msgid "Log out"
msgstr "Ofmellen"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatesch Umeldung ofgeleent!"
@@ -616,14 +617,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Hallo,<br><br>ech wëll just Bescheed soen dass den/d' %s, »%s« mat dir gedeelt huet.<br><a href=\"%s\">Kucken!</a><br><br>E schéine Bonjour!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "zeréck"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "weider"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 985b0af5094..2043b2dca23 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr "Upload ofgebrach."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Fehler"
@@ -120,15 +120,11 @@ msgstr "Deelen"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Läschen"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr ""
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr "réckgängeg man"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Numm"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Gréisst"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Geännert"
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr "Download"
msgid "Unshare"
msgstr "Net méi deelen"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Läschen"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Upload ze grouss"
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index d845e6353de..15dacc9dc19 100644
--- a/l10n/lb/files_encryption.po
+++ b/l10n/lb/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+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"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index d221e3871f4..caaaa536d10 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 3ec4a563f02..6e89845dc20 100644
--- a/l10n/lb/files_trashbin.po
+++ b/l10n/lb/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr "Numm"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index ede1c573d7c..8ee53d4cf04 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Benotzer"
#: app.php:409
-msgid "Apps"
-msgstr "Applikatiounen"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -211,50 +203,46 @@ msgid "seconds ago"
msgstr "Sekonnen hir"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 Minutt hir"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "vrun 1 Stonn"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template/functions.php:85
msgid "today"
msgstr "haut"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "gëschter"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "Läschte Mount"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "Läscht Joer"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "Joren hier"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index b2aaad004c4..9a9db6a3fc5 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Speicheren..."
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Share API aschalten"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Erlab Apps d'Share API ze benotzen"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Links erlaben"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Resharing erlaben"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Useren erlaben mat egal wiem ze sharen"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Log"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Méi"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index ff308c5e0e5..291529dde43 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Hëllef"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index ca9c5b80294..bb9ac1fab08 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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -139,59 +139,63 @@ msgstr "Lapkritis"
msgid "December"
msgstr "Gruodis"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Nustatymai"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "prieš sekundę"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "Prieš 1 minutę"
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "Prieš {count} minutes"
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "prieš 1 valandą"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "prieš {hours} valandas"
-
-#: js/js.js:758
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:815
msgid "today"
msgstr "šiandien"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "Prieš {days} dienas"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "praeitą mėnesį"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "prieš {months} mėnesių"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "prieš mėnesį"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "praeitais metais"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "prieš metus"
@@ -199,23 +203,19 @@ msgstr "prieš metus"
msgid "Choose"
msgstr "Pasirinkite"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Atšaukti"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Klaida pakraunant failų naršyklę"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Taip"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Gerai"
@@ -379,9 +379,10 @@ msgstr "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud slaptažodžio atkūrimas"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -580,6 +581,10 @@ msgstr "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą."
msgid "Log out"
msgstr "Atsijungti"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatinis prisijungimas atmestas!"
@@ -617,14 +622,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "atgal"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "kitas"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 5b9fc48cf9d..e4819c2b8f5 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -95,12 +95,12 @@ msgstr "Nepakanka vietos"
msgid "Upload cancelled."
msgstr "Įkėlimas atšauktas."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL negali būti tuščias."
@@ -108,8 +108,8 @@ msgstr "URL negali būti tuščias."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Klaida"
@@ -121,15 +121,11 @@ msgstr "Dalintis"
msgid "Delete permanently"
msgstr "Ištrinti negrįžtamai"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Ištrinti"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Pervadinti"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Laukiantis"
@@ -157,15 +153,14 @@ msgstr "pakeiskite {new_name} į {old_name}"
msgid "undo"
msgstr "anuliuoti"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "ištrinti"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "įkeliamas 1 failas"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "įkeliami failai"
@@ -191,43 +186,47 @@ msgstr "Jūsų visa vieta serveryje užimta"
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Pavadinimas"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Dydis"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Pakeista"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 aplankalas"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} aplankalai"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 failas"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} failai"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/app.php:73
#, php-format
@@ -310,6 +309,10 @@ msgstr "Atsisiųsti"
msgid "Unshare"
msgstr "Nebesidalinti"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Ištrinti"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Įkėlimui failas per didelis"
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index 22f3b98d907..b8b075046ac 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -62,18 +62,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 54d647f95f3..20ba007ff21 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index 91904a4e8d5..febfc2f1b01 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -52,21 +52,19 @@ msgstr "Pavadinimas"
msgid "Deleted"
msgstr "Ištrinti"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 aplankalas"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} aplankalai"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 failas"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} failai"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index a3da13549d0..34cc04cbf53 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Vartotojai"
#: app.php:409
-msgid "Apps"
-msgstr "Programos"
-
-#: app.php:417
msgid "Admin"
msgstr "Administravimas"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Programa neįjungta"
@@ -211,50 +203,50 @@ msgid "seconds ago"
msgstr "prieš sekundę"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "Prieš 1 minutę"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "prieš %d minučių"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "prieš 1 valandą"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "prieš %d valandų"
-
-#: template/functions.php:85
msgid "today"
msgstr "šiandien"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "vakar"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "prieš %d dienų"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "praeitą mėnesį"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "prieš %d mėnesių"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "praeitais metais"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "prieš metus"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 239d969d0fe..a0c8555bbe5 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -121,7 +121,11 @@ msgstr "Įvyko klaida atnaujinant programą"
msgid "Updated"
msgstr "Atnaujinta"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Saugoma..."
@@ -142,31 +146,31 @@ msgstr "Nepavyko ištrinti vartotojo"
msgid "Groups"
msgstr "Grupės"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Ištrinti"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "pridėti grupę"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Vartotojo vardas turi būti tinkamas"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Klaida kuriant vartotoją"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Slaptažodis turi būti tinkamas"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Kalba"
@@ -237,106 +241,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Dalijimasis"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Lesti nuorodas"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Leisti dalintis"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Saugumas"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Žurnalas"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Žurnalo išsamumas"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Daugiau"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Mažiau"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versija"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Šifravimas"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Vartotojo vardas"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 254827f3a86..af344de49a7 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Grupės filtras"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Prievadas"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Naudoti TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Išjungti SSL sertifikato tikrinimą."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nerekomenduojama, naudokite tik testavimui."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Pagalba"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 2e092f8a986..c5a0608398f 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# stendec <stendec@inbox.lv>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -20,7 +21,7 @@ msgstr ""
#: ajax/share.php:97
#, php-format
msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s kopīgots »%s« ar jums"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -137,59 +138,63 @@ msgstr "Novembris"
msgid "December"
msgstr "Decembris"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Iestatījumi"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "sekundes atpakaļ"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "pirms 1 minūtes"
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "pirms {minutes} minūtēm"
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "pirms 1 stundas"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "pirms {hours} stundām"
-
-#: js/js.js:758
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "Tagad, %n minūtes"
+msgstr[1] "Pirms %n minūtes"
+msgstr[2] "Pirms %n minūtēm"
+
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "Šodien, %n stundas"
+msgstr[1] "Pirms %n stundas"
+msgstr[2] "Pirms %n stundām"
+
+#: js/js.js:815
msgid "today"
msgstr "šodien"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "vakar"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "pirms {days} dienām"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "Šodien, %n dienas"
+msgstr[1] "Pirms %n dienas"
+msgstr[2] "Pirms %n dienām"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "pagājušajā mēnesī"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "pirms {months} mēnešiem"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "Šomēnes, %n mēneši"
+msgstr[1] "Pirms %n mēneša"
+msgstr[2] "Pirms %n mēnešiem"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "mēnešus atpakaļ"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "gājušajā gadā"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "gadus atpakaļ"
@@ -197,23 +202,19 @@ msgstr "gadus atpakaļ"
msgid "Choose"
msgstr "Izvēlieties"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Atcelt"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
-msgstr ""
+msgstr "Kļūda ielādējot datņu ņēmēja veidni"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Jā"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nē"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Labi"
@@ -284,7 +285,7 @@ msgstr "Parole"
#: js/share.js:198
msgid "Allow Public Upload"
-msgstr ""
+msgstr "Ļaut publisko augšupielādi."
#: js/share.js:202
msgid "Email link to person"
@@ -377,9 +378,10 @@ msgstr "Atjaunināšana beidzās nesekmīgi. Lūdzu, ziņojiet par šo problēmu
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud paroles maiņa"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "%s paroles maiņa"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -390,11 +392,11 @@ msgid ""
"The link to reset your password has been sent to your email.<br>If you do "
"not receive it within a reasonable amount of time, check your spam/junk "
"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "Saite uz paroles atjaunošanas vietu ir nosūtīta uz epastu.<br>Ja vēstu nav atnākusi, pārbaudiet epasta mēstuļu mapi.<br>Jā tās tur nav, jautājiet sistēmas administratoram."
#: lostpassword/templates/lostpassword.php:12
msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "Pieprasījums neizdevās!<br>Vai Jūs pārliecinājāties ka epasts/lietotājvārds ir pareizi?"
#: lostpassword/templates/lostpassword.php:15
msgid "You will receive a link to reset your password via Email."
@@ -411,11 +413,11 @@ msgid ""
"will be no way to get your data back after your password is reset. If you "
"are not sure what to do, please contact your administrator before you "
"continue. Do you really want to continue?"
-msgstr ""
+msgstr "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?"
#: lostpassword/templates/lostpassword.php:24
msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Jā, Es tiešām vēlos mainīt savu paroli"
#: lostpassword/templates/lostpassword.php:27
msgid "Request reset"
@@ -474,7 +476,7 @@ msgid ""
"View it: %s\n"
"\n"
"Cheers!"
-msgstr ""
+msgstr "Sveiks,\nTikai daru tev zināmu ka %s dalās %s ar tevi.\nApskati to: %s\n\nJaukiņi Labiņi!"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
@@ -491,12 +493,12 @@ msgstr "Brīdinājums par drošību"
#: templates/installation.php:25
msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "Jūsu PHP ir ievainojamība pret NULL Byte uzbrukumiem (CVE-2006-7243)"
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Lūdzu atjauniniet PHP instalāciju lai varētu droši izmantot %s."
#: templates/installation.php:32
msgid ""
@@ -521,7 +523,7 @@ msgstr "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta,
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -572,12 +574,16 @@ msgstr "Pabeigt iestatīšanu"
#: templates/layout.user.php:41
#, php-format
msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s ir pieejams. Uzziniet vairāk kā atjaunināt."
#: templates/layout.user.php:66
msgid "Log out"
msgstr "Izrakstīties"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Vairāk programmu"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automātiskā ierakstīšanās ir noraidīta!"
@@ -613,15 +619,7 @@ msgstr "Alternatīvās pieteikšanās"
msgid ""
"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
"href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr ""
-
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "iepriekšējā"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "nākamā"
+msgstr "Sveiks,<br><br>Tikai daru tev zināmu ka %s dalās %s ar tevi.<br><a href=\"%s\">Apskati to!</a><br><br>Jaukiņi Labiņi!"
#: templates/update.php:3
#, php-format
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 2906d12760e..3b3ce3b88ed 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# stendec <stendec@inbox.lv>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -29,11 +30,11 @@ msgstr "Nevarēja pārvietot %s"
#: ajax/upload.php:16 ajax/upload.php:45
msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Nevar uzstādīt augšupielādes mapi."
#: ajax/upload.php:22
msgid "Invalid Token"
-msgstr ""
+msgstr "Nepareiza pilnvara"
#: ajax/upload.php:59
msgid "No file was uploaded. Unknown error"
@@ -94,21 +95,21 @@ msgstr "Nepietiek brīvas vietas"
msgid "Upload cancelled."
msgstr "Augšupielāde ir atcelta."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL nevar būt tukšs."
#: js/file-upload.js:238 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Kļūdains mapes nosaukums. 'Shared' lietošana ir rezervēta no ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Kļūda"
@@ -120,15 +121,11 @@ msgstr "Dalīties"
msgid "Delete permanently"
msgstr "Dzēst pavisam"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Dzēst"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Pārsaukt"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Gaida savu kārtu"
@@ -156,17 +153,16 @@ msgstr "aizvietoja {new_name} ar {old_name}"
msgid "undo"
msgstr "atsaukt"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "veikt dzēšanas darbību"
-
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "Augšupielādē 1 datni"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "%n"
+msgstr[1] "Augšupielāde %n failu"
+msgstr[2] "Augšupielāde %n failus"
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
-msgstr ""
+msgstr "fails augšupielādējas"
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -190,48 +186,52 @@ msgstr "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhron
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nederīgs mapes nosaukums. “Koplietots” izmantojums ir rezervēts ownCloud servisam."
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nosaukums"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Izmērs"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Mainīts"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 mape"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} mapes"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 datne"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n mapes"
+msgstr[1] "%n mape"
+msgstr[2] "%n mapes"
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} datnes"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n faili"
+msgstr[1] "%n fails"
+msgstr[2] "%n faili"
#: lib/app.php:73
#, php-format
msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s nevar tikt pārsaukts"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
@@ -309,6 +309,10 @@ msgstr "Lejupielādēt"
msgid "Unshare"
msgstr "Pārtraukt dalīšanos"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Dzēst"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Datne ir par lielu, lai to augšupielādētu"
@@ -329,11 +333,11 @@ msgstr "Šobrīd tiek caurskatīts"
#: templates/part.list.php:74
msgid "directory"
-msgstr ""
+msgstr "direktorija"
#: templates/part.list.php:76
msgid "directories"
-msgstr ""
+msgstr "direktorijas"
#: templates/part.list.php:85
msgid "file"
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index db6b8fd1426..2f583edb1c2 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index ac2e481d533..87322e13a61 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# stendec <stendec@inbox.lv>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-23 01:55-0400\n"
-"PO-Revision-Date: 2013-07-23 05:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-16 07:00+0000\n"
+"Last-Translator: stendec <stendec@inbox.lv>\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,7 +18,7 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
msgid "Access granted"
msgstr "Piešķirta pieeja"
@@ -25,7 +26,7 @@ msgstr "Piešķirta pieeja"
msgid "Error configuring Dropbox storage"
msgstr "Kļūda, konfigurējot Dropbox krātuvi"
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:65 js/google.js:86
msgid "Grant access"
msgstr "Piešķirt pieeju"
@@ -33,29 +34,29 @@ msgstr "Piešķirt pieeju"
msgid "Please provide a valid Dropbox app key and secret."
msgstr "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu."
-#: js/google.js:36 js/google.js:93
+#: js/google.js:42 js/google.js:121
msgid "Error configuring Google Drive storage"
msgstr "Kļūda, konfigurējot Google Drive krātuvi"
-#: lib/config.php:447
+#: lib/config.php:453
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 "<b>Brīdinājums:</b> nav uzinstalēts “smbclient”. Nevar montēt CIFS/SMB koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē."
-#: lib/config.php:450
+#: lib/config.php:457
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 "<b>Brīdinājums: </b> uz PHP nav aktivēts vai instalēts FTP atbalsts. Nevar montēt FTP koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē."
-#: lib/config.php:453
+#: lib/config.php:460
msgid ""
"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
"your system administrator to install it."
-msgstr ""
+msgstr "<b>Brīdinājums:</b> PHP Curl atbalsts nav instalēts. OwnCloud / WebDAV vai GoogleDrive montēšana nav iespējama. Lūdziet sistēmas administratoram lai tas tiek uzstādīts."
#: templates/settings.php:3
msgid "External Storage"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 1afacc6cca0..71c4b1fd73f 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 51ca2b8d25d..06237b847d0 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# stendec <stendec@inbox.lv>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-16 08:10+0000\n"
+"Last-Translator: stendec <stendec@inbox.lv>\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"
@@ -51,25 +52,23 @@ msgstr "Nosaukums"
msgid "Deleted"
msgstr "Dzēsts"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 mape"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "Nekas, %n mapes"
+msgstr[1] "%n mape"
+msgstr[2] "%n mapes"
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} mapes"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 datne"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} datnes"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "Neviens! %n faaili"
+msgstr[1] "%n fails"
+msgstr[2] "%n faili"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
-msgstr ""
+msgstr "atjaunots"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index 276da094bc7..36471317d5a 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# stendec <stendec@inbox.lv>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,17 +35,13 @@ msgid "Users"
msgstr "Lietotāji"
#: app.php:409
-msgid "Apps"
-msgstr "Lietotnes"
-
-#: app.php:417
msgid "Admin"
msgstr "Administratori"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "Kļūda atjauninot \"%s\""
#: defaults.php:35
msgid "web services under your control"
@@ -53,7 +50,7 @@ msgstr "tīmekļa servisi tavā varā"
#: files.php:66 files.php:98
#, php-format
msgid "cannot open \"%s\""
-msgstr ""
+msgstr "Nevar atvērt \"%s\""
#: files.php:226
msgid "ZIP download is turned off."
@@ -75,11 +72,7 @@ msgstr "Izvēlētās datnes ir pārāk lielas, lai izveidotu zip datni."
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
-msgstr ""
-
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "nevarēja noteikt"
+msgstr "Lejupielādējiet savus failus mazākās daļās, atsevišķi vai palūdziet tos administratoram."
#: json.php:28
msgid "Application is not enabled"
@@ -171,7 +164,7 @@ msgstr "Izmest šo lietotāju no MySQL."
#: setup/oci.php:34
msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Nevar izveidot savienojumu ar Oracle"
#: setup/oci.php:41 setup/oci.php:113
msgid "Oracle username and/or password not valid"
@@ -210,56 +203,56 @@ msgid "seconds ago"
msgstr "sekundes atpakaļ"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "pirms 1 minūtes"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] "Pirms %n minūtēm"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "pirms %d minūtēm"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] "Pirms %n stundām"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "pirms 1 stundas"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "pirms %d stundām"
-
-#: template/functions.php:85
msgid "today"
msgstr "šodien"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "vakar"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "pirms %d dienām"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] "Pirms %n dienām"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "pagājušajā mēnesī"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "pirms %d mēnešiem"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] "Pirms %n mēnešiem"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "gājušajā gadā"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "gadus atpakaļ"
#: template.php:297
msgid "Caused by:"
-msgstr ""
+msgstr "Cēlonis:"
#: vcategories.php:188 vcategories.php:249
#, php-format
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 0b9ff593b02..cfc93b2ae11 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# stendec <stendec@inbox.lv>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -28,7 +29,7 @@ msgstr "Autentifikācijas kļūda"
#: ajax/changedisplayname.php:31
msgid "Your display name has been changed."
-msgstr ""
+msgstr "Jūsu redzamais vārds ir mainīts."
#: ajax/changedisplayname.php:34
msgid "Unable to change display name"
@@ -120,7 +121,11 @@ msgstr "Kļūda, atjauninot lietotni"
msgid "Updated"
msgstr "Atjaunināta"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Saglabā..."
@@ -141,31 +146,31 @@ msgstr "Nevar izņemt lietotāju"
msgid "Groups"
msgstr "Grupas"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Grupas administrators"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Dzēst"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "pievienot grupu"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Jānorāda derīgs lietotājvārds"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Kļūda, veidojot lietotāju"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Jānorāda derīga parole"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__valodas_nosaukums__"
@@ -180,7 +185,7 @@ msgid ""
"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 "Jūsu datu direktorija un faili visticamāk ir pieejami no interneta. .htaccess fails nedarbojas. Ir rekomendēts konfigurēt serveri tā lai jūsu datu direktorija nav lasāma vai pārvietot to ārpus tīmekļa servera dokumentu mapes."
#: templates/admin.php:29
msgid "Setup Warning"
@@ -195,7 +200,7 @@ msgstr "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datn
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Lūdzu kārtīgi izlasiet <a href=\"%s\">uzstādīšanas norādījumus</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -217,7 +222,7 @@ msgid ""
"System locale can't be set to %s. 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 %s."
-msgstr ""
+msgstr "Sistēmas lokalizāciju nevar nomainīt uz %s. Tas nozīmē ka var rasties sarežģījumi ar dažu burtu attēlošanu failu nosaukumos. Ir rekomendēts uzstādīt nepieciešamās pakotnes lai atbalstītu %s lokalizāciju."
#: templates/admin.php:75
msgid "Internet connection not working"
@@ -230,112 +235,112 @@ msgid ""
"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."
-msgstr ""
+msgstr "Šim serverim nav savienojums ar internetu. Tas nozīmē ka nebūs tādas iespējas kā ārējo datu nesēju montēšana, paziņojumi par atjauninājumiem vai citu izstrādātāju programmu uzstādīšana. Attālināta failu piekļuve vai paziņojumu epastu sūtīšana iespējams arī nedarbosies. Ir rekomendēts iespējot interneta savienojumu lai gūtu iespēju izmantotu visus risinājumus."
#: templates/admin.php:92
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Izpildīt vienu uzdevumu ar katru ielādēto lapu"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "cron.php ir reģistrēts webcron servisā lai izsauktu cron.php vienreiz minūtē caur http."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "Izmantojiet sistēmas cron servisu lai izsauktu cron.php reizi minūtē."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Dalīšanās"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Aktivēt koplietošanas API"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Ļauj lietotnēm izmantot koplietošanas API"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Atļaut saites"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Ļaut lietotājiem publiski dalīties ar vienumiem, izmantojot saites"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
-msgstr ""
+msgstr "Atļaut publisko augšupielādi"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "Ļaut lietotājiem iespējot atļaut citiem augšupielādēt failus viņu publiskajās mapēs"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Atļaut atkārtotu koplietošanu"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Ļaut lietotājiem dalīties ar vienumiem atkārtoti"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Ļaut lietotājiem dalīties ar visiem"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Ļaut lietotājiem dalīties ar lietotājiem to grupās"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Drošība"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Uzspiest HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu"
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Žurnāls"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Žurnāla līmenis"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Vairāk"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Mazāk"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versija"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -463,6 +468,22 @@ msgstr "WebDAV"
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr "Lietojiet šo adresi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">lai piekļūtu saviem failiem ar WebDAV</a>"
+
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Šifrēšana"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
msgstr ""
#: templates/users.php:21
@@ -475,13 +496,13 @@ msgstr "Izveidot"
#: templates/users.php:36
msgid "Admin Recovery Password"
-msgstr ""
+msgstr "Administratora atgūšanas parole"
#: templates/users.php:37 templates/users.php:38
msgid ""
"Enter the recovery password in order to recover the users files during "
"password change"
-msgstr ""
+msgstr "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā."
#: templates/users.php:42
msgid "Default Storage"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 556a293a7c3..3811f911bae 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "Lietotāja ierakstīšanās filtrs"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Definē filtru, ko izmantot, kad mēģina ierakstīties. %%uid ierakstīšanās darbībā aizstāj lietotājvārdu."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "lieto %%uid vietturi, piemēram, \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Lietotāju saraksta filtrs"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definē filtru, ko izmantot, kad saņem lietotāju sarakstu."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "bez jebkādiem vietturiem, piemēram, \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Grupu filtrs"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definē filtru, ko izmantot, kad saņem grupu sarakstu."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "bez jebkādiem vietturiem, piemēram, \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Savienojuma iestatījumi"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Konfigurācija ir aktīva"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Ja nav atzīmēts, šī konfigurācija tiks izlaista."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Ports"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Rezerves (kopija) serveris"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Norādi rezerves serveri (nav obligāti). Tam ir jābūt galvenā LDAP/AD servera kopijai."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Rezerves (kopijas) ports"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Deaktivēt galveno serveri"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Lietot TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Neizmanto papildu LDAPS savienojumus! Tas nestrādās."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Reģistrnejutīgs LDAP serveris (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Izslēgt SSL sertifikātu validēšanu."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nav ieteicams, izmanto tikai testēšanai!"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Kešatmiņas dzīvlaiks"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "sekundēs. Izmaiņas iztukšos kešatmiņu."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Direktorijas iestatījumi"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Lietotāja redzamā vārda lauks"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Bāzes lietotāju koks"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Viena lietotāju bāzes DN rindā"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Lietotāju meklēšanas atribūts"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Neobligāti; viens atribūts rindā"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Grupas redzamā nosaukuma lauks"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Bāzes grupu koks"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Viena grupu bāzes DN rindā"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Grupu meklēšanas atribūts"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Grupu piederības asociācija"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Īpašie atribūti"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Kvotu lauks"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Kvotas noklusējums"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "baitos"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "E-pasta lauks"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Lietotāja mājas mapes nosaukšanas kārtula"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Testa konfigurācija"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Palīdzība"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index dbcf6c58cd2..701879cd51a 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,59 @@ msgstr "Ноември"
msgid "December"
msgstr "Декември"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Подесувања"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "пред секунди"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "пред 1 минута"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "пред {minutes} минути"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "пред 1 час"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "пред {hours} часови"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "денеска"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "пред {days} денови"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "минатиот месец"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "пред {months} месеци"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "пред месеци"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "минатата година"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "пред години"
@@ -197,23 +197,19 @@ msgstr "пред години"
msgid "Choose"
msgstr "Избери"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Откажи"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Во ред"
@@ -377,9 +373,10 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ресетирање на лозинка за ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr "Одјава"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Одбиена автоматска најава!"
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "претходно"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "следно"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index afc9d5c7815..a5d3ad32194 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr "Преземањето е прекинато."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "Адресата неможе да биде празна."
@@ -107,8 +107,8 @@ msgstr "Адресата неможе да биде празна."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Грешка"
@@ -120,15 +120,11 @@ msgstr "Сподели"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Избриши"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Преименувај"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Чека"
@@ -156,15 +152,13 @@ msgstr "заменета {new_name} со {old_name}"
msgid "undo"
msgstr "врати"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 датотека се подига"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Име"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Големина"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Променето"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 папка"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} папки"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 датотека"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} датотеки"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr "Преземи"
msgid "Unshare"
msgstr "Не споделувај"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Избриши"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Фајлот кој се вчитува е преголем"
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index e7309b2e087..23d0a82d933 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index ffd5a17d6e7..f669e2ffd24 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index 33c4555dfae..b92b21c1c47 100644
--- a/l10n/mk/files_trashbin.po
+++ b/l10n/mk/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr "Име"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 папка"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} папки"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 датотека"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} датотеки"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index d874bda2e51..e22d5843f50 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Корисници"
#: app.php:409
-msgid "Apps"
-msgstr "Аппликации"
-
-#: app.php:417
msgid "Admin"
msgstr "Админ"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Апликацијата не е овозможена"
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr "пред секунди"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "пред 1 минута"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "пред %d минути"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "пред 1 час"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "пред %d часови"
-
-#: template/functions.php:85
msgid "today"
msgstr "денеска"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "вчера"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "пред %d денови"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "минатиот месец"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "пред %d месеци"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "минатата година"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "пред години"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index e11d8a822c7..77eea7f21cc 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Снимам..."
@@ -141,31 +145,31 @@ msgstr ""
msgid "Groups"
msgstr "Групи"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Администратор на група"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Избриши"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr ""
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr ""
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Записник"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Ниво на логирање"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Повеќе"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Помалку"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Енкрипција"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index d1883cd979a..323404d6364 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Помош"
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index 1beda2b8444..fccd1c57f6e 100644
--- a/l10n/ml_IN/core.po
+++ b/l10n/ml_IN/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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr ""
-#: js/js.js:715
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:716
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:717
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:718
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:719
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:720
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:721
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:722
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:723
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:724
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:725
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:726
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:727
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +197,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -226,7 +222,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:631 js/share.js:643
+#: js/share.js:643 js/share.js:655
msgid "Error"
msgstr ""
@@ -246,7 +242,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:671
+#: js/share.js:131 js/share.js:683
msgid "Error while sharing"
msgstr ""
@@ -346,23 +342,23 @@ msgstr ""
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:618
+#: js/share.js:398 js/share.js:630
msgid "Password protected"
msgstr ""
-#: js/share.js:631
+#: js/share.js:643
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:643
+#: js/share.js:655
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:658
+#: js/share.js:670
msgid "Sending ..."
msgstr ""
-#: js/share.js:669
+#: js/share.js:681
msgid "Email sent"
msgstr ""
@@ -377,8 +373,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -461,7 +458,7 @@ msgstr ""
msgid "Access forbidden"
msgstr ""
-#: templates/404.php:12
+#: templates/404.php:15
msgid "Cloud not found"
msgstr ""
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr ""
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po
index 056f4c8f4b5..83b5a5da14d 100644
--- a/l10n/ml_IN/files.po
+++ b/l10n/ml_IN/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-07-22 01:54-0400\n"
-"PO-Revision-Date: 2013-07-22 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,11 +120,7 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
-
-#: js/filelist.js:457
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:460 js/filelist.js:518
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -285,45 +281,49 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Deleted files"
msgstr ""
-#: templates/index.php:48
+#: templates/index.php:46
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:54
+#: templates/index.php:52
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:61
+#: templates/index.php:59
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:73
msgid "Download"
msgstr ""
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
msgid "Unshare"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:105
msgid "Upload too large"
msgstr ""
-#: templates/index.php:109
+#: templates/index.php:107
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:114
+#: templates/index.php:112
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:117
+#: templates/index.php:115
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ml_IN/files_encryption.po b/l10n/ml_IN/files_encryption.po
index e97dc7732ae..76387876387 100644
--- a/l10n/ml_IN/files_encryption.po
+++ b/l10n/ml_IN/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/ml_IN/files_trashbin.po b/l10n/ml_IN/files_trashbin.po
index 56f3b0e82b6..42c24ca6423 100644
--- a/l10n/ml_IN/files_trashbin.po
+++ b/l10n/ml_IN/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,17 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ml_IN/lib.po b/l10n/ml_IN/lib.po
index 8590f74b674..0e8c35fca63 100644
--- a/l10n/ml_IN/lib.po
+++ b/l10n/ml_IN/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: 2013-07-24 01:55-0400\n"
-"PO-Revision-Date: 2013-07-24 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -34,19 +34,15 @@ msgid "Users"
msgstr ""
#: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
msgid "Admin"
msgstr ""
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: defaults.php:33
+#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,54 +202,50 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
-#: template.php:296
+#: template.php:297
msgid "Caused by:"
msgstr ""
diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po
index e3333f6983a..ae59755b18c 100644
--- a/l10n/ml_IN/settings.po
+++ b/l10n/ml_IN/settings.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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/ml_IN/user_ldap.po b/l10n/ml_IN/user_ldap.po
index ec0a03b42ce..a7b06da5286 100644
--- a/l10n/ml_IN/user_ldap.po
+++ b/l10n/ml_IN/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: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index cd60d15f453..cfb078e9e2a 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,55 @@ msgstr "November"
msgid "December"
msgstr "Disember"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Tetapan"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +193,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Batal"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Tidak"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ok"
@@ -377,9 +369,10 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Set semula kata lalaun ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +571,10 @@ msgstr ""
msgid "Log out"
msgstr "Log keluar"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +612,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "sebelum"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "seterus"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index f99439ded33..83db5d48b58 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr "Muatnaik dibatalkan."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Ralat"
@@ -120,15 +120,11 @@ msgstr "Kongsi"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Padam"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Dalam proses"
@@ -156,15 +152,12 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +183,43 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nama"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Saiz"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +302,10 @@ msgstr "Muat turun"
msgid "Unshare"
msgstr ""
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Padam"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Muatnaik terlalu besar"
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index 0508639aeae..8b66830466a 100644
--- a/l10n/ms_MY/files_encryption.po
+++ b/l10n/ms_MY/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+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"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 954e77ca28a..7ce6237f3d0 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index 3a1caf6884c..cb56fbd7745 100644
--- a/l10n/ms_MY/files_trashbin.po
+++ b/l10n/ms_MY/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,15 @@ msgstr "Nama"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 1c115a03272..7f34225a016 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Pengguna"
#: app.php:409
-msgid "Apps"
-msgstr "Aplikasi"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,42 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 0504ad67a59..c18b8be698a 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Simpan..."
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "_nama_bahasa_"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Log"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Tahap Log"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Lanjutan"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 351df3db37f..de6d8fa0134 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Bantuan"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 511c253152a..a1e4d461931 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -137,59 +137,55 @@ msgstr "နိုဝင်ဘာ"
msgid "December"
msgstr "ဒီဇင်ဘာ"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr ""
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "စက္ကန့်အနည်းငယ်က"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "၁ မိနစ်အရင်က"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "၁ နာရီ အရင်က"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "ယနေ့"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "မနေ့က"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "ပြီးခဲ့သောလ"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "မနှစ်က"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "နှစ် အရင်က"
@@ -197,23 +193,19 @@ msgstr "နှစ် အရင်က"
msgid "Choose"
msgstr "ရွေးချယ်"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "ပယ်ဖျက်မည်"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "ဟုတ်"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "မဟုတ်ဘူး"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "အိုကေ"
@@ -377,8 +369,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -578,6 +571,10 @@ msgstr ""
msgid "Log out"
msgstr ""
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +612,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "ယခင်"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "နောက်သို့"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index 19a7af920ed..84606a993f6 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,15 +120,11 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr ""
@@ -156,15 +152,12 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +183,43 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +302,10 @@ msgstr "ဒေါင်းလုတ်"
msgid "Unshare"
msgstr ""
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
#: templates/index.php:105
msgid "Upload too large"
msgstr ""
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
index ee3d3592630..9aedac17d42 100644
--- a/l10n/my_MM/files_encryption.po
+++ b/l10n/my_MM/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index d04bb04647c..77d34ee18f7 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_trashbin.po b/l10n/my_MM/files_trashbin.po
index 5b874f21745..0611fe45b55 100644
--- a/l10n/my_MM/files_trashbin.po
+++ b/l10n/my_MM/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,15 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index 2dc174649a1..a8a9bc152a8 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "သုံးစွဲသူ"
#: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
msgid "Admin"
msgstr "အက်ဒမင်"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "မဆုံးဖြတ်နိုင်ပါ။"
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,42 @@ msgid "seconds ago"
msgstr "စက္ကန့်အနည်းငယ်က"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "၁ မိနစ်အရင်က"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d မိနစ်အရင်က"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "၁ နာရီ အရင်က"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d နာရီအရင်က"
-
-#: template/functions.php:85
msgid "today"
msgstr "ယနေ့"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "မနေ့က"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d ရက် အရင်က"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "ပြီးခဲ့သောလ"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d လအရင်က"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "မနှစ်က"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "နှစ် အရင်က"
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index 903834397b0..f537d21d9e2 100644
--- a/l10n/my_MM/settings.po
+++ b/l10n/my_MM/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index f9f369565af..62ed04aa882 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "အကူအညီ"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index ea3d97c5cd6..6533a847d21 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -138,59 +138,59 @@ msgstr "November"
msgid "December"
msgstr "Desember"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Innstillinger"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "sekunder siden"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 minutt siden"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minutter siden"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 time siden"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} timer siden"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "i dag"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "i går"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} dager siden"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "forrige måned"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} måneder siden"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "måneder siden"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "forrige år"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "år siden"
@@ -198,23 +198,19 @@ msgstr "år siden"
msgid "Choose"
msgstr "Velg"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ok"
@@ -378,9 +374,10 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Tilbakestill ownCloud passord"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -579,6 +576,10 @@ msgstr ""
msgid "Log out"
msgstr "Logg ut"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatisk pålogging avvist!"
@@ -616,14 +617,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "forrige"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "neste"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 081415b1b70..ea723ff9903 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -4,13 +4,14 @@
#
# Translators:
# Hans Nesse <>, 2013
+# TheLugal <thelugal@gmail.com>, 2013
# Stein-Aksel Basma <stabasm@hotmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -35,7 +36,7 @@ msgstr "Kunne ikke sette opplastingskatalog."
#: ajax/upload.php:22
msgid "Invalid Token"
-msgstr ""
+msgstr "Ugyldig nøkkel"
#: ajax/upload.php:59
msgid "No file was uploaded. Unknown error"
@@ -96,12 +97,12 @@ msgstr "Ikke nok lagringsplass"
msgid "Upload cancelled."
msgstr "Opplasting avbrutt."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL-en kan ikke være tom."
@@ -109,8 +110,8 @@ msgstr "URL-en kan ikke være tom."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Feil"
@@ -122,15 +123,11 @@ msgstr "Del"
msgid "Delete permanently"
msgstr "Slett permanent"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Slett"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
-msgstr "Omdøp"
+msgstr "Gi nytt navn"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Ventende"
@@ -152,21 +149,19 @@ msgstr "avbryt"
#: js/filelist.js:350
msgid "replaced {new_name} with {old_name}"
-msgstr "erstatt {new_name} med {old_name}"
+msgstr "erstattet {new_name} med {old_name}"
#: js/filelist.js:350
msgid "undo"
msgstr "angre"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "utfør sletting"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "Laster opp %n fil"
+msgstr[1] "Laster opp %n filer"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 fil lastes opp"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "filer lastes opp"
@@ -190,50 +185,52 @@ msgstr "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkro
#: js/files.js:82
msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)"
+msgstr "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)"
+
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
-#: js/files.js:231
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Navn"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Størrelse"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Endret"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 mappe"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} mapper"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n mappe"
+msgstr[1] "%n mapper"
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
#: lib/app.php:73
#, php-format
msgid "%s could not be renamed"
-msgstr ""
+msgstr "Kunne ikke gi nytt navn til %s"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
@@ -311,6 +308,10 @@ msgstr "Last ned"
msgid "Unshare"
msgstr "Avslutt deling"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Slett"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Filen er for stor"
@@ -323,7 +324,7 @@ msgstr "Filene du prøver å laste opp er for store for å laste opp til denne s
#: templates/index.php:112
msgid "Files are being scanned, please wait."
-msgstr "Skanner etter filer, vennligst vent."
+msgstr "Skanner filer, vennligst vent."
#: templates/index.php:115
msgid "Current scanning"
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index 063a792c558..1aea5d92add 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index c3ad85d42b1..ccc3611f726 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 551d45ae2cf..8a0267ad7cb 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-17 22: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"
@@ -52,21 +52,17 @@ msgstr "Navn"
msgid "Deleted"
msgstr "Slettet"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 mappe"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} mapper"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] "%n mapper"
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] "%n filer"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 9ddd3f5c576..81cf9faa238 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Brukere"
#: app.php:409
-msgid "Apps"
-msgstr "Apper"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Applikasjon er ikke påslått"
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr "sekunder siden"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 minutt siden"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minutter siden"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 time siden"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d timer siden"
-
-#: template/functions.php:85
msgid "today"
msgstr "i dag"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "i går"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d dager siden"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "forrige måned"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d måneder siden"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "forrige år"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "år siden"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 4240547121a..7c1c0736cfa 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -122,7 +122,11 @@ msgstr "Feil ved oppdatering av app"
msgid "Updated"
msgstr "Oppdatert"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Lagrer..."
@@ -143,31 +147,31 @@ msgstr "Kunne ikke slette bruker"
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Gruppeadministrator"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Slett"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "legg til gruppe"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Oppgi et gyldig brukernavn"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Feil ved oppretting av bruker"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Oppgi et gyldig passord"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -238,106 +242,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Utfør en oppgave med hver side som blir lastet"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Deling"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Aktiver API for Deling"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Tillat apps å bruke API for Deling"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Tillat lenker"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Tillat brukere å dele filer med lenker"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "TIllat videredeling"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Tillat brukere å dele filer som allerede har blitt delt med dem"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Tillat brukere å dele med alle"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Tillat kun deling med andre brukere i samme gruppe"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Sikkerhet"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Tving HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Logg"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Loggnivå"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Mer"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versjon"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Bruk denne adressen for å <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">få tilgang til filene dine via WebDAV</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Logginn navn"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 853b63433cf..037b9206594 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "Brukerpålogging filter"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Definerer filteret som skal brukes når et påloggingsforsøk blir utført. %%uid erstatter brukernavnet i innloggingshandlingen."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "bruk %%uid plassholder, f.eks. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Brukerliste filter"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definerer filteret som skal brukes, når systemet innhenter brukere."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "uten noe plassholder, f.eks. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Gruppefilter"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definerer filteret som skal brukes, når systemet innhenter grupper."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "uten noe plassholder, f.eks. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Konfigurasjon aktiv"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Når ikke huket av så vil denne konfigurasjonen bli hoppet over."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Sikkerhetskopierings (Replica) vert"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Bruk TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Case-insensitiv LDAP tjener (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Slå av SSL-sertifikat validering"
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Ikke anbefalt, bruk kun for testing"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "i sekunder. En endring tømmer bufferen."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Vis brukerens navnfelt"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Hovedbruker tre"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "En Bruker Base DN pr. linje"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Vis gruppens navnfelt"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Hovedgruppe tre"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "En gruppe hoved-DN pr. linje"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "gruppe-medlem assosiasjon"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Hjelp"
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index 34bd08ae62a..8278426322d 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr ""
-#: js/js.js:715
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:716
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:717
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:718
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:719
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:720
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:721
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:722
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:723
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:724
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:725
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:726
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:727
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +197,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -226,7 +222,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:631 js/share.js:643
+#: js/share.js:643 js/share.js:655
msgid "Error"
msgstr ""
@@ -246,7 +242,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:671
+#: js/share.js:131 js/share.js:683
msgid "Error while sharing"
msgstr ""
@@ -346,23 +342,23 @@ msgstr ""
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:618
+#: js/share.js:398 js/share.js:630
msgid "Password protected"
msgstr ""
-#: js/share.js:631
+#: js/share.js:643
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:643
+#: js/share.js:655
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:658
+#: js/share.js:670
msgid "Sending ..."
msgstr ""
-#: js/share.js:669
+#: js/share.js:681
msgid "Email sent"
msgstr ""
@@ -377,8 +373,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -461,7 +458,7 @@ msgstr ""
msgid "Access forbidden"
msgstr ""
-#: templates/404.php:12
+#: templates/404.php:15
msgid "Cloud not found"
msgstr ""
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr ""
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index 26e7154708e..d09313ed514 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/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-07-22 01:54-0400\n"
-"PO-Revision-Date: 2013-07-22 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,11 +120,7 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
-
-#: js/filelist.js:457
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:460 js/filelist.js:518
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -285,45 +281,49 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Deleted files"
msgstr ""
-#: templates/index.php:48
+#: templates/index.php:46
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:54
+#: templates/index.php:52
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:61
+#: templates/index.php:59
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:73
msgid "Download"
msgstr ""
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
msgid "Unshare"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:105
msgid "Upload too large"
msgstr ""
-#: templates/index.php:109
+#: templates/index.php:107
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:114
+#: templates/index.php:112
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:117
+#: templates/index.php:115
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ne/files_encryption.po b/l10n/ne/files_encryption.po
index 268adc60bd5..a30502e5bbf 100644
--- a/l10n/ne/files_encryption.po
+++ b/l10n/ne/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/ne/files_trashbin.po b/l10n/ne/files_trashbin.po
index 5b7a422b1f9..06099b3a416 100644
--- a/l10n/ne/files_trashbin.po
+++ b/l10n/ne/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,17 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index 5445c8e816c..8852f856cc1 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/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: 2013-07-24 01:55-0400\n"
-"PO-Revision-Date: 2013-07-24 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -34,19 +34,15 @@ msgid "Users"
msgstr ""
#: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
msgid "Admin"
msgstr ""
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: defaults.php:33
+#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,54 +202,50 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
-#: template.php:296
+#: template.php:297
msgid "Caused by:"
msgstr ""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index 20fa4cf7fb4..578a57af945 100644
--- a/l10n/ne/settings.po
+++ b/l10n/ne/settings.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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index 5ca0bf8245f..823ea6ee1a6 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/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: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index c515ab3bab4..59e41074d63 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -4,13 +4,14 @@
#
# Translators:
# André Koot <meneer@tken.net>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013
# Jorcee <mail@jordyc.nl>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -139,59 +140,59 @@ msgstr "november"
msgid "December"
msgstr "december"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Instellingen"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "seconden geleden"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 minuut geleden"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] "%n minuten geleden"
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minuten geleden"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] "%n uur geleden"
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 uur geleden"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} uren geleden"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "vandaag"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "gisteren"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} dagen geleden"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] "%n dagen geleden"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "vorige maand"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} maanden geleden"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] "%n maanden geleden"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "maanden geleden"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "vorig jaar"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "jaar geleden"
@@ -199,23 +200,19 @@ msgstr "jaar geleden"
msgid "Choose"
msgstr "Kies"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Annuleer"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Fout bij laden van bestandsselectie sjabloon"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ok"
@@ -379,9 +376,10 @@ msgstr "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud-wachtwoord herstellen"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "%s wachtwoord reset"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -498,7 +496,7 @@ msgstr "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)"
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Werk uw PHP installatie bij om %s veilig te kunnen gebruiken."
#: templates/installation.php:32
msgid ""
@@ -523,7 +521,7 @@ msgstr "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -580,6 +578,10 @@ msgstr "%s is beschikbaar. Verkrijg meer informatie over het bijwerken."
msgid "Log out"
msgstr "Afmelden"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Meer applicaties"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatische aanmelding geweigerd!"
@@ -617,14 +619,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Hallo daar,<br><br> %s deelde »%s« met jou.<br><a href=\"%s\">Bekijk!</a><br><br>Veel plezier!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "vorige"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "volgende"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 5a89e893def..154a7551d0c 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -4,13 +4,14 @@
#
# Translators:
# André Koot <meneer@tken.net>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 22:00+0000\n"
+"Last-Translator: kwillems <kwillems@zonnet.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"
@@ -95,21 +96,21 @@ msgstr "Niet genoeg ruimte beschikbaar"
msgid "Upload cancelled."
msgstr "Uploaden geannuleerd."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:234 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL kan niet leeg zijn."
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:239 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Fout"
@@ -121,15 +122,11 @@ msgstr "Delen"
msgid "Delete permanently"
msgstr "Verwijder definitief"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Verwijder"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Hernoem"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "In behandeling"
@@ -157,15 +154,13 @@ msgstr "verving {new_name} met {old_name}"
msgid "undo"
msgstr "ongedaan maken"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "uitvoeren verwijderactie"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "%n bestand aan het uploaden"
+msgstr[1] "%n bestanden aan het uploaden"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 bestand wordt ge-upload"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "bestanden aan het uploaden"
@@ -191,43 +186,45 @@ msgstr "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen."
+
+#: js/files.js:245
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:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Naam"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Grootte"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Aangepast"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 map"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] "%n mappen"
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} mappen"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 bestand"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} bestanden"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] "%n bestanden"
#: lib/app.php:73
#, php-format
@@ -310,6 +307,10 @@ msgstr "Downloaden"
msgid "Unshare"
msgstr "Stop met delen"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Verwijder"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Upload is te groot"
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index d76778bb108..b72cecc5040 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/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: 2013-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
+"Last-Translator: Len <lenny@weijl.org>\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"
@@ -63,20 +63,20 @@ msgid ""
"files."
msgstr "Uw privésleutel is niet geldig! Misschien was uw wachtwoord van buitenaf gewijzigd. U kunt het wachtwoord van uw privésleutel aanpassen in uw persoonlijke instellingen om toegang tot uw versleutelde bestanden te vergaren."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Missende benodigdheden."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld."
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "De volgende gebruikers hebben geen configuratie voor encryptie:"
#: js/settings-admin.js:11
msgid "Saving..."
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index e0c421cf232..a9f681aaee2 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -4,13 +4,14 @@
#
# Translators:
# André Koot <meneer@tken.net>, 2013
+# Len <lenny@weijl.org>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"Last-Translator: Len <lenny@weijl.org>\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"
@@ -32,27 +33,27 @@ msgstr "Verzenden"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Sorry, deze link lijkt niet meer in gebruik te zijn."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Redenen kunnen zijn:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "bestand was verwijderd"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "de link is verlopen"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "delen is uitgeschakeld"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd."
#: templates/public.php:15
#, php-format
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index bea50408d88..ba5a8671355 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/files_trashbin.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-08-02 01:56-0400\n"
-"PO-Revision-Date: 2013-08-01 13:40+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-17 06:30+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"
@@ -52,21 +52,17 @@ msgstr "Naam"
msgid "Deleted"
msgstr "Verwijderd"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 map"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} mappen"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 bestand"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} bestanden"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n map"
+msgstr[1] "%n mappen"
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n bestand"
+msgstr[1] "%n bestanden"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index cdb43a7072a..eba0796878e 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: Len <lenny@weijl.org>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -36,14 +36,10 @@ msgid "Users"
msgstr "Gebruikers"
#: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
msgid "Admin"
msgstr "Beheerder"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Upgrade \"%s\" mislukt."
@@ -79,10 +75,6 @@ msgid ""
"administrator."
msgstr "Download de bestanden in kleinere brokken, appart of vraag uw administrator."
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "kon niet worden vastgesteld"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "De applicatie is niet actief"
@@ -212,50 +204,46 @@ msgid "seconds ago"
msgstr "seconden geleden"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 minuut geleden"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n minuut geleden"
+msgstr[1] "%n minuten geleden"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minuten geleden"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n uur geleden"
+msgstr[1] "%n uur geleden"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 uur geleden"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d uren geleden"
-
-#: template/functions.php:85
msgid "today"
msgstr "vandaag"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "gisteren"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d dagen geleden"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] "%n dag terug"
+msgstr[1] "%n dagen geleden"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "vorige maand"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d maanden geleden"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n maand geleden"
+msgstr[1] "%n maanden geleden"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "vorig jaar"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "jaar geleden"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 69ba192c0e4..265529a90a4 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -5,14 +5,15 @@
# Translators:
# André Koot <meneer@tken.net>, 2013
# helonaut, 2013
+# kwillems <kwillems@zonnet.nl>, 2013
# Len <lenny@weijl.org>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
-"Last-Translator: Len <lenny@weijl.org>\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\n"
+"PO-Revision-Date: 2013-08-21 18:40+0000\n"
+"Last-Translator: kwillems <kwillems@zonnet.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"
@@ -123,7 +124,11 @@ msgstr "Fout bij bijwerken app"
msgid "Updated"
msgstr "Bijgewerkt"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren."
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Opslaan"
@@ -144,31 +149,31 @@ msgstr "Kon gebruiker niet verwijderen"
msgid "Groups"
msgstr "Groepen"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Groep beheerder"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Verwijder"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "toevoegen groep"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Er moet een geldige gebruikersnaam worden opgegeven"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Fout bij aanmaken gebruiker"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Er moet een geldig wachtwoord worden opgegeven"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Nederlands"
@@ -183,7 +188,7 @@ msgid ""
"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 "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datamap niet bereikbaar is vanaf het internet of om uw datamap te verplaatsen naar een locatie buiten de document root van de webserver."
#: templates/admin.php:29
msgid "Setup Warning"
@@ -198,7 +203,7 @@ msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omda
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Conntroleer de <a href='%s'>installatie handleiding</a> goed."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -220,7 +225,7 @@ msgid ""
"System locale can't be set to %s. 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 %s."
-msgstr ""
+msgstr "De systeemtaal kan niet worden ingesteld op %s. Hierdoor kunnen er problemen optreden met bepaalde karakters in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren, zodat %s ondersteund wordt."
#: templates/admin.php:75
msgid "Internet connection not working"
@@ -233,112 +238,112 @@ msgid ""
"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."
-msgstr ""
+msgstr "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken."
#: templates/admin.php:92
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Bij laden van elke pagina één taak uitvoeren"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "cron.php is geregistreerd bij een webcron service om cron.php eens per minuut aan te roepen via http."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "Gebruik de systeem cron service om het bestand cron.php eens per minuut aan te roepen."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Delen"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Activeren Share API"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Apps toestaan de Share API te gebruiken"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Toestaan links"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Toestaan dat gebruikers objecten met links delen met anderen"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Sta publieke uploads toe"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "Sta gebruikers toe anderen in hun publiek gedeelde mappen bestanden te uploaden"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Toestaan opnieuw delen"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Toestaan dat gebruikers met iedereen delen"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Instellen dat gebruikers alleen met leden binnen hun groepen delen"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Beveiliging"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Afdwingen HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Dwingt de clients om een versleutelde verbinding te maken met %s"
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Log"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Log niveau"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Meer"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Minder"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versie"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -468,6 +473,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Gebruik dit adres <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">toegang tot uw bestanden via WebDAV</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Versleuteling"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr "De encryptie-appplicatie is niet meer aanwezig, decodeer al uw bestanden"
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr "Inlog-wachtwoord"
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr "Decodeer alle bestanden"
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Inlognaam"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index a0aed2817dd..121b8643e5e 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -4,14 +4,15 @@
#
# Translators:
# André Koot <meneer@tken.net>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013
# Len <lenny@weijl.org>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: Len <lenny@weijl.org>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -92,7 +93,7 @@ msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behavior. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "<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."
#: templates/settings.php:12
msgid ""
@@ -156,198 +157,185 @@ msgstr "Gebruikers Login Filter"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Definiëerd de toe te passen filter indien er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam in de login actie."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "gebruik %%uid placeholder, bijv. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Gebruikers Lijst Filter"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definiëerd de toe te passen filter voor het ophalen van gebruikers."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "zonder een placeholder, bijv. \"objectClass=person\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Groep Filter"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definiëerd de toe te passen filter voor het ophalen van groepen."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "zonder een placeholder, bijv. \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Verbindingsinstellingen"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Configuratie actief"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Als dit niet is ingeschakeld wordt deze configuratie overgeslagen."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Poort"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Backup (Replica) Host"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Opgeven optionele backup host. Het moet een replica van de hoofd LDAP/AD server."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Backup (Replica) Poort"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Deactiveren hoofdserver"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr "Maak alleen een verbinding met de replica server."
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Gebruik TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Gebruik het niet voor LDAPS verbindingen, dat gaat niet lukken."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Niet-hoofdlettergevoelige LDAP server (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Schakel SSL certificaat validatie uit."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar de %s server."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Niet aangeraden, gebruik alleen voor test doeleinden."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Cache time-to-live"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "in seconden. Een verandering maakt de cache leeg."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Mapinstellingen"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Gebruikers Schermnaam Veld"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de gebruiker."
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Basis Gebruikers Structuur"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Een User Base DN per regel"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Attributen voor gebruikerszoekopdrachten"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Optioneel; één attribuut per regel"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Groep Schermnaam Veld"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de groepen."
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Basis Groupen Structuur"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Een Group Base DN per regel"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Attributen voor groepszoekopdrachten"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Groepslid associatie"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Speciale attributen"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Quota veld"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Quota standaard"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "in bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "E-mailveld"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Gebruikers Home map naamgevingsregel"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Interne gebruikersnaam"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,17 +349,17 @@ msgid ""
"behavior as before ownCloud 5 enter the user display name attribute in the "
"following field. Leave it empty for default behavior. Changes will have "
"effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Standaard wordt de interne gebruikersnaam aangemaakt op basis van het UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan​​: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een ​​gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle *DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van vóór ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op gekoppelde (toegevoegde) LDAP-gebruikers."
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Interne gebruikersnaam attribuut:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Negeren UUID detectie"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,17 +368,17 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behavior. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Standaard herkent ownCloud het UUID-attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen."
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "UUID Attribuut:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Gebruikersnaam-LDAP gebruikers vertaling"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,20 +390,20 @@ msgid ""
" is not configuration sensitive, it affects all LDAP configurations! Never "
"clear the mappings in a production environment, only in a testing or "
"experimental stage."
-msgstr ""
+msgstr "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de ownCloud gebruikersnaam aan een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne naam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving."
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Leegmaken Groepsnaam-LDAP groep vertaling"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Test configuratie"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Help"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index ac20d293001..d7afc5bf410 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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -139,59 +139,59 @@ msgstr "November"
msgid "December"
msgstr "Desember"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Innstillingar"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "sekund sidan"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 minutt sidan"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minutt sidan"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 time sidan"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} timar sidan"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "i dag"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "i går"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} dagar sidan"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "førre månad"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} månadar sidan"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "månadar sidan"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "i fjor"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "år sidan"
@@ -199,23 +199,19 @@ msgstr "år sidan"
msgid "Choose"
msgstr "Vel"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Greitt"
@@ -379,9 +375,10 @@ msgstr "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https:/
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Oppdateringa er fullført. Sender deg vidare til ownCloud no."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Nullstilling av ownCloud-passord"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -580,6 +577,10 @@ msgstr "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer."
msgid "Log out"
msgstr "Logg ut"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatisk innlogging avvist!"
@@ -617,14 +618,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "førre"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "neste"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 0639f7d02a7..fe27f782683 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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -96,12 +96,12 @@ msgstr "Ikkje nok lagringsplass tilgjengeleg"
msgid "Upload cancelled."
msgstr "Opplasting avbroten."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "Nettadressa kan ikkje vera tom."
@@ -109,8 +109,8 @@ msgstr "Nettadressa kan ikkje vera tom."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Feil"
@@ -122,15 +122,11 @@ msgstr "Del"
msgid "Delete permanently"
msgstr "Slett for godt"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Slett"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Endra namn"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Under vegs"
@@ -158,15 +154,13 @@ msgstr "bytte ut {new_name} med {old_name}"
msgid "undo"
msgstr "angre"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "utfør sletting"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 fil lastar opp"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "filer lastar opp"
@@ -192,43 +186,45 @@ msgstr "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!"
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Lagringa di er nesten full ({usedSpacePercent} %)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Namn"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Storleik"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Endra"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 mappe"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} mapper"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 fil"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -311,6 +307,10 @@ msgstr "Last ned"
msgid "Unshare"
msgstr "Udel"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Slett"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "For stor opplasting"
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index 467bce62761..f1295711ff8 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+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"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 4b2ff875d13..53090ff185e 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index 0cb3e6ce5c7..c10ee6cd507 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -52,21 +52,17 @@ msgstr "Namn"
msgid "Deleted"
msgstr "Sletta"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 mappe"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} mapper"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index bcd30436ade..cb71c6e589f 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Brukarar"
#: app.php:409
-msgid "Apps"
-msgstr "Program"
-
-#: app.php:417
msgid "Admin"
msgstr "Administrer"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -211,50 +203,46 @@ msgid "seconds ago"
msgstr "sekund sidan"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 minutt sidan"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 time sidan"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template/functions.php:85
msgid "today"
msgstr "i dag"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "i går"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "førre månad"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "i fjor"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "år sidan"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index b3df4c9a0b7..ca6c39e33cb 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -122,7 +122,11 @@ msgstr "Feil ved oppdatering av app"
msgid "Updated"
msgstr "Oppdatert"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Lagrar …"
@@ -167,7 +171,7 @@ msgstr "Feil ved oppretting av brukar"
msgid "A valid password must be provided"
msgstr "Du må oppgje eit gyldig passord"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Nynorsk"
@@ -238,106 +242,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Utfør éi oppgåve for kvar sidelasting"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Deling"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Slå på API-et for deling"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "La app-ar bruka API-et til deling"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Tillat lenkjer"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "La brukarar dela ting offentleg med lenkjer"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Tillat vidaredeling"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "La brukarar vidaredela delte ting"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "La brukarar dela med kven som helst"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "La brukarar dela berre med brukarar i deira grupper"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Tryggleik"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Krev HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Logg"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Log nivå"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Meir"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Utgåve"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Innloggingsnamn"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 5a412930089..8ded31122df 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Hjelp"
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 87e172a775e..0fee2d59130 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,59 @@ msgstr "Novembre"
msgid "December"
msgstr "Decembre"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Configuracion"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "segonda a"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 minuta a"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "uèi"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "ièr"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "mes passat"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "meses a"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "an passat"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "ans a"
@@ -197,23 +197,19 @@ msgstr "ans a"
msgid "Choose"
msgstr "Causís"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Annula"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Òc"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "D'accòrdi"
@@ -377,9 +373,10 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "senhal d'ownCloud tornat botar"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr "Sortida"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "dariièr"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "venent"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index b07cc10ec9f..89aa3f3477c 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr "Amontcargar anullat."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Error"
@@ -120,15 +120,11 @@ msgstr "Parteja"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Escafa"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Torna nomenar"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Al esperar"
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr "defar"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
-
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 fichièr al amontcargar"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "fichièrs al amontcargar"
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nom"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Talha"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr "Avalcarga"
msgid "Unshare"
msgstr "Pas partejador"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Escafa"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Amontcargament tròp gròs"
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index 6d4d0593d97..eba3e13368c 100644
--- a/l10n/oc/files_encryption.po
+++ b/l10n/oc/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+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"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index 48225563d0e..253801f6c9f 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index c2942ba474d..1f47311fecd 100644
--- a/l10n/oc/files_trashbin.po
+++ b/l10n/oc/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr "Nom"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 95eaa629e86..cfa24f83de8 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Usancièrs"
#: app.php:409
-msgid "Apps"
-msgstr "Apps"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr "segonda a"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 minuta a"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minutas a"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr ""
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template/functions.php:85
msgid "today"
msgstr "uèi"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "ièr"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d jorns a"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "mes passat"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "an passat"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "ans a"
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 37881368c6c..39b43f27c7f 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Enregistra..."
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Executa un prètfach amb cada pagina cargada"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Al partejar"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Activa API partejada"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Jornal"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Mai d'aquò"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index e247b034647..b4c7072825e 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index c445879c1d8..1917f75d114 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -139,59 +139,63 @@ msgstr "Listopad"
msgid "December"
msgstr "Grudzień"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Ustawienia"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "sekund temu"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 minutę temu"
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minut temu"
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 godzinę temu"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} godzin temu"
-
-#: js/js.js:758
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:815
msgid "today"
msgstr "dziś"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "wczoraj"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} dni temu"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "w zeszłym miesiącu"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} miesięcy temu"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "miesięcy temu"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "w zeszłym roku"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "lat temu"
@@ -199,23 +203,19 @@ msgstr "lat temu"
msgid "Choose"
msgstr "Wybierz"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Błąd podczas ładowania pliku wybranego szablonu"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Tak"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nie"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "OK"
@@ -379,9 +379,10 @@ msgstr "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a hr
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "restart hasła ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -580,6 +581,10 @@ msgstr "%s jest dostępna. Dowiedz się więcej na temat aktualizacji."
msgid "Log out"
msgstr "Wyloguj"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Więcej aplikacji"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatyczne logowanie odrzucone!"
@@ -617,14 +622,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Cześć,<br><br>Informuję cię że %s udostępnia ci »%s«.\n<br><a href=\"%s\">Zobacz</a><br><br>Pozdrawiam!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "wstecz"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "naprzód"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 252c18bd3c4..4afe550b713 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -96,12 +96,12 @@ msgstr "Za mało miejsca"
msgid "Upload cancelled."
msgstr "Wczytywanie anulowane."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL nie może być pusty."
@@ -109,8 +109,8 @@ msgstr "URL nie może być pusty."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Błąd"
@@ -122,15 +122,11 @@ msgstr "Udostępnij"
msgid "Delete permanently"
msgstr "Trwale usuń"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Usuń"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Zmień nazwę"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Oczekujące"
@@ -158,15 +154,14 @@ msgstr "zastąpiono {new_name} przez {old_name}"
msgid "undo"
msgstr "cofnij"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "wykonaj operację usunięcia"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 plik wczytywany"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "pliki wczytane"
@@ -192,43 +187,47 @@ msgstr "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchro
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Twój magazyn jest prawie pełny ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nieprawidłowa nazwa folderu. Korzystanie z nazwy „Shared” jest zarezerwowane dla ownCloud"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nazwa"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Rozmiar"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Modyfikacja"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 folder"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "Ilość folderów: {count}"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 plik"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "Ilość plików: {count}"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/app.php:73
#, php-format
@@ -311,6 +310,10 @@ msgstr "Pobierz"
msgid "Unshare"
msgstr "Zatrzymaj współdzielenie"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Usuń"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Ładowany plik jest za duży"
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index 6a5f9f21dcf..a232ad39134 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@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"
@@ -60,22 +60,22 @@ msgid ""
"ownCloud system (e.g. your corporate directory). You can update your private"
" key password in your personal settings to recover access to your encrypted "
"files."
-msgstr ""
+msgstr "Klucz prywatny nie jest ważny! Prawdopodobnie Twoje hasło zostało zmienione poza systemem ownCloud (np. w katalogu firmy). Aby odzyskać dostęp do zaszyfrowanych plików można zaktualizować hasło klucza prywatnego w ustawieniach osobistych."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
-msgstr ""
+msgstr "Brak wymagań."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone."
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:"
#: js/settings-admin.js:11
msgid "Saving..."
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 1a6992cd4b6..8241e75f710 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index eec8378c1bc..fd82c9bdd6d 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/files_trashbin.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-08-01 01:55-0400\n"
-"PO-Revision-Date: 2013-07-31 07:37+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -52,21 +52,19 @@ msgstr "Nazwa"
msgid "Deleted"
msgstr "Usunięte"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 folder"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "Ilość folderów: {count}"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 plik"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "Ilość plików: {count}"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 54c16bb62d7..ea1272f2a8e 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Użytkownicy"
#: app.php:409
-msgid "Apps"
-msgstr "Aplikacje"
-
-#: app.php:417
msgid "Admin"
msgstr "Administrator"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Błąd przy aktualizacji \"%s\"."
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr "Pobierz pliki w mniejszy kawałkach, oddzielnie lub poproś administratora o zwiększenie limitu."
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "nie może zostać znaleziony"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Aplikacja nie jest włączona"
@@ -211,50 +203,50 @@ msgid "seconds ago"
msgstr "sekund temu"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 minutę temu"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minut temu"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 godzinę temu"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d godzin temu"
-
-#: template/functions.php:85
msgid "today"
msgstr "dziś"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "wczoraj"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d dni temu"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "w zeszłym miesiącu"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d miesiecy temu"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "w zeszłym roku"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "lat temu"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 2771def0e4c..6f634a0dc1b 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -122,7 +122,11 @@ msgstr "Błąd podczas aktualizacji aplikacji"
msgid "Updated"
msgstr "Zaktualizowano"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Zapisywanie..."
@@ -143,31 +147,31 @@ msgstr "Nie można usunąć użytkownika"
msgid "Groups"
msgstr "Grupy"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Administrator grupy"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Usuń"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "dodaj grupę"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Należy podać prawidłową nazwę użytkownika"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Błąd podczas tworzenia użytkownika"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Należy podać prawidłowe hasło"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "polski"
@@ -197,7 +201,7 @@ msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożl
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Proszę sprawdź ponownie <a href=\"%s\">przewodnik instalacji</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -238,106 +242,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Wykonuj jedno zadanie wraz z każdą wczytaną stroną"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Udostępnianie"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Włącz API udostępniania"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Zezwalaj aplikacjom na korzystanie z API udostępniania"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Zezwalaj na odnośniki"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Pozwól na publiczne wczytywanie"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Zezwalaj na ponowne udostępnianie"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Zezwalaj użytkownikom na współdzielenie z kimkolwiek"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Bezpieczeństwo"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Wymuś HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Logi"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Poziom logów"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Więcej"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Mniej"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Wersja"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Szyfrowanie"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Login"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 59a900ea6cf..f2571b2fb2a 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -156,198 +156,185 @@ msgstr "Filtr logowania użytkownika"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Definiuje filtr do zastosowania, gdy podejmowana jest próba logowania. %%uid zastępuje nazwę użytkownika w działaniu logowania."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "Użyj %%uid zastępczy, np. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Lista filtrów użytkownika"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definiuje filtry do zastosowania, podczas pobierania użytkowników."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "bez żadnych symboli zastępczych np. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Grupa filtrów"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definiuje filtry do zastosowania, podczas pobierania grup."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Konfiguracja połączeń"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Konfiguracja archiwum"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Gdy niezaznaczone, ta konfiguracja zostanie pominięta."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Kopia zapasowa (repliki) host"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Dać opcjonalnie hosta kopii zapasowej . To musi być repliką głównego serwera LDAP/AD."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Kopia zapasowa (repliki) Port"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Wyłącz serwer główny"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Użyj TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Nie używaj go dodatkowo dla połączeń protokołu LDAPS, zakończy się niepowodzeniem."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Wielkość liter serwera LDAP (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Wyłączyć sprawdzanie poprawności certyfikatu SSL."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Niezalecane, użyj tylko testowo."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Przechowuj czas życia"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "w sekundach. Zmiana opróżnia pamięć podręczną."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Ustawienia katalogów"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Pole wyświetlanej nazwy użytkownika"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Drzewo bazy użytkowników"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Jeden użytkownik Bazy DN na linię"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Szukaj atrybutów"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Opcjonalnie; jeden atrybut w wierszu"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Pole wyświetlanej nazwy grupy"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Drzewo bazy grup"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Jedna grupa bazy DN na linię"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Grupa atrybutów wyszukaj"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Członek grupy stowarzyszenia"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Specjalne atrybuty"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Pole przydziału"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Przydział domyślny"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "w bajtach"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Pole email"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Reguły nazewnictwa folderu domowego użytkownika"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Wewnętrzna nazwa użytkownika"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -363,15 +350,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Wewnętrzny atrybut nazwy uzżytkownika:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Zastąp wykrywanie UUID"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -382,15 +369,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "Atrybuty UUID:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Mapowanie użytkownika LDAP"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -404,18 +391,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Czyść Mapowanie użytkownika LDAP"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Czyść Mapowanie nazwy grupy LDAP"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Konfiguracja testowa"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Pomoc"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 217fdc591b2..703b1feb263 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -139,59 +139,59 @@ msgstr "novembro"
msgid "December"
msgstr "dezembro"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "segundos atrás"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 minuto atrás"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minutos atrás"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 hora atrás"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} horas atrás"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "hoje"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} dias atrás"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "último mês"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} meses atrás"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "último ano"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "anos atrás"
@@ -199,23 +199,19 @@ msgstr "anos atrás"
msgid "Choose"
msgstr "Escolha"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Template selecionador Erro ao carregar arquivo"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Não"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ok"
@@ -379,9 +375,10 @@ msgstr "A atualização falhou. Por favor, relate este problema para a <a href=\
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A atualização teve êxito. Você será redirecionado ao ownCloud agora."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Redefinir senha ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "%s redefinir senha"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -580,6 +577,10 @@ msgstr "%s está disponível. Obtenha mais informações sobre como atualizar."
msgid "Log out"
msgstr "Sair"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Mais aplicativos"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Entrada Automática no Sistema Rejeitada!"
@@ -617,14 +618,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Olá,<br><br>apenas para você saber que %s compartilhou %s com você.<br><a href=\"%s\">Veja: </a><br><br>Abraços!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "anterior"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "próximo"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 3dfe41bd6bd..d9250a024c1 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -97,12 +97,12 @@ msgstr "Espaço de armazenamento insuficiente"
msgid "Upload cancelled."
msgstr "Envio cancelado."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL não pode ficar em branco"
@@ -110,8 +110,8 @@ msgstr "URL não pode ficar em branco"
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Erro"
@@ -123,15 +123,11 @@ msgstr "Compartilhar"
msgid "Delete permanently"
msgstr "Excluir permanentemente"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Excluir"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Renomear"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Pendente"
@@ -159,15 +155,13 @@ msgstr "Substituído {old_name} por {new_name} "
msgid "undo"
msgstr "desfazer"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "realizar operação de exclusão"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "enviando 1 arquivo"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "enviando arquivos"
@@ -193,43 +187,45 @@ msgstr "Seu armazenamento está cheio, arquivos não podem mais ser atualizados
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes."
-#: js/files.js:344
+#: js/files.js:358
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:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nome"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Tamanho"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 pasta"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} pastas"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 arquivo"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} arquivos"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -312,6 +308,10 @@ msgstr "Baixar"
msgid "Unshare"
msgstr "Descompartilhar"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Excluir"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Upload muito grande"
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 557bd7d0809..43542c8f6f6 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-05 23:20+0000\n"
-"Last-Translator: wcavassin <cavassin@gmail.com>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.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"
@@ -64,18 +64,18 @@ msgid ""
"files."
msgstr "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora do sistema ownCloud (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Requisitos não encontrados."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitada e configurada corretamente. Por enquanto, o aplicativo de criptografia foi desativado."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado."
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr "Seguintes usuários não estão configurados para criptografia:"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 453ca120b6f..511813205a7 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index 8bac48b567d..3464db7a911 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/files_trashbin.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-07-31 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 09:50+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -52,21 +52,17 @@ msgstr "Nome"
msgid "Deleted"
msgstr "Excluído"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 pasta"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} pastas"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 arquivo"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} arquivos"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index 63261adbfd8..80a90875c3a 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Usuários"
#: app.php:409
-msgid "Apps"
-msgstr "Aplicações"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Falha na atualização de \"%s\"."
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr "Baixe os arquivos em pedaços menores, separadamente ou solicite educadamente ao seu administrador."
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "não pôde ser determinado"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Aplicação não está habilitada"
@@ -211,50 +203,46 @@ msgid "seconds ago"
msgstr "segundos atrás"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 minuto atrás"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minutos atrás"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 hora atrás"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d horas atrás"
-
-#: template/functions.php:85
msgid "today"
msgstr "hoje"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "ontem"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d dias atrás"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "último mês"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d meses atrás"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "último ano"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "anos atrás"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index a14d1d4ac35..674d3237b72 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 00:50+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -122,7 +122,11 @@ msgstr "Erro ao atualizar aplicativo"
msgid "Updated"
msgstr "Atualizado"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo."
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Salvando..."
@@ -143,31 +147,31 @@ msgstr "Impossível remover usuário"
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Grupo Administrativo"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Excluir"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "adicionar grupo"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Forneça um nome de usuário válido"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Erro ao criar usuário"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Forneça uma senha válida"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Português (Brasil)"
@@ -238,106 +242,106 @@ msgstr "Este servidor não tem conexão com a internet. Isso significa que algum
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Execute uma tarefa com cada página carregada"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php está registrado em um serviço webcron chamar cron.php uma vez por minuto usando http."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "Utilizar sistema de serviços cron para chamar o arquivo cron.php uma vez por minuto."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Compartilhamento"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Habilitar API de Compartilhamento"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Permitir que aplicativos usem a API de Compartilhamento"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Permitir links"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Permitir que usuários compartilhem itens com o público usando links"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Permitir envio público"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Permitir que usuários deem permissão a outros para enviarem arquivios para suas pastas compartilhadas publicamente"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Permitir recompartilhamento"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Permitir que usuários compartilhem novamente itens compartilhados com eles"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Permitir que usuários compartilhem com qualquer um"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Permitir que usuários compartilhem somente com usuários em seus grupos"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Segurança"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Forçar HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Obrigar os clientes que se conectem a %s através de uma conexão criptografada."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Registro"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Nível de registro"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Mais"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versão"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Use esse endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acessar seus arquivos via WebDAV</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Criptografia"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr "O aplicativo de encriptação não está mais ativo, decripti todos os seus arquivos"
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr "Senha de login"
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr "Decripti todos os Arquivos"
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Nome de Login"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 34ce87b54d4..8e83ab7e75d 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: tuliouel\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -156,198 +156,185 @@ msgstr "Filtro de Login de Usuário"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Define o filtro pra aplicar ao efetuar uma tentativa de login. %%uuid substitui o nome de usuário na ação de login."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "use %%uid placeholder, ex. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtro de Lista de Usuário"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Define filtro a ser aplicado ao obter usuários."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "sem nenhum espaço reservado, ex. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Filtro de Grupo"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Define o filtro a aplicar ao obter grupos."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "sem nenhum espaço reservado, ex. \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Configurações de Conexão"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Configuração ativa"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Quando não marcada, esta configuração será ignorada."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Porta"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Servidor de Backup (Réplica)"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Defina um servidor de backup opcional. Ele deverá ser uma réplica do servidor LDAP/AD principal."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Porta do Backup (Réplica)"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Desativar Servidor Principal"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr "Conectar-se somente ao servidor de réplica."
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Não use adicionalmente para conexões LDAPS, pois falhará."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP sensível à caixa alta (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Desligar validação de certificado SSL."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Se a conexão só funciona com esta opção, importe o certificado SSL do servidor LDAP no seu servidor %s."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Não recomendado, use somente para testes."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Cache Time-To-Live"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "em segundos. Uma mudança esvaziará o cache."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Configurações de Diretório"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Campo Nome de Exibição de Usuário"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr "O atributo LDAP para usar para gerar o nome de exibição do usuário."
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Árvore de Usuário Base"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Um usuário-base DN por linha"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Atributos de Busca de Usuário"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Opcional; um atributo por linha"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Campo Nome de Exibição de Grupo"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr "O atributo LDAP para usar para gerar o nome de apresentação do grupo."
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Árvore de Grupo Base"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Um grupo-base DN por linha"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Atributos de Busca de Grupo"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Associação Grupo-Membro"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Atributos Especiais"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Campo de Cota"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Cota Padrão"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "em bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Campo de Email"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Regra para Nome da Pasta Pessoal do Usuário"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Nome de usuário interno"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -363,15 +350,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é único e que caracteres não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_.@- ]. Outros caracteres são substituídos por seus correspondentes em ASCII ou simplesmente serão omitidos. Em caso de colisão um número será adicionado/aumentado. O nome de usuário interno é usado para identificar um usuário internamente. É também o nome padrão da pasta \"home\" do usuário. É também parte de URLs remotas, por exemplo, para todos as instâncias *DAV. Com esta definição, o comportamento padrão pode ser sobrescrito. Para alcançar um comportamento semelhante ao de antes do ownCloud 5, forneça o atributo do nome de exibição do usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários LDAP recém mapeados (adicionados)."
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Atributo Interno de Nome de Usuário:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Substituir detecção UUID"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -382,15 +369,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Por padrão, o atributo UUID é detectado automaticamente. O atributo UUID é usado para identificar, sem dúvidas, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificado acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser lido tanto para usuários como para grupos, e que seja único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários e grupos LDAP recém mapeados (adicionados)."
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "Atributo UUID:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Usuário-LDAP Mapeamento de Usuário"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -404,18 +391,18 @@ msgid ""
"experimental stage."
msgstr "Nomes de usuários sãi usados para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Adicionalmente, o DN fica em cache, assim como para reduzir a interação LDAP, mas não é utilizado para a identificação. Se o DN muda, as mudanças serão encontradas. O nome de usuário interno é utilizado em todo lugar. Limpar os mapeamentos não influencia a configuração. Limpar os mapeamentos deixará rastros em todo lugar. Limpar os mapeamentos não influencia a configuração, mas afeta as configurações LDAP! Somente limpe os mapeamentos em embiente de testes ou em estágio experimental."
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Limpar Mapeamento de Usuário Nome de Usuário-LDAP"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Limpar NomedoGrupo-LDAP Mapeamento do Grupo"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Teste de Configuração"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 9c091b6f800..d1bc08b13f1 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -141,59 +141,59 @@ msgstr "Novembro"
msgid "December"
msgstr "Dezembro"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Configurações"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "Minutos atrás"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "Há 1 minuto"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minutos atrás"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "Há 1 horas"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "Há {hours} horas atrás"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "hoje"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "ontem"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} dias atrás"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "ultímo mês"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "Há {months} meses atrás"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "meses atrás"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "ano passado"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "anos atrás"
@@ -201,23 +201,19 @@ msgstr "anos atrás"
msgid "Choose"
msgstr "Escolha"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Erro ao carregar arquivo do separador modelo"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Não"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ok"
@@ -381,9 +377,10 @@ msgstr "A actualização falhou. Por favor reporte este incidente seguindo este
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Reposição da password ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -582,6 +579,10 @@ msgstr "%s está disponível. Tenha mais informações como actualizar."
msgid "Log out"
msgstr "Sair"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Login automático rejeitado!"
@@ -619,14 +620,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Olá,<br><br>Apenas para lhe informar que %s partilhou »%s« consigo.<br><a href=\"%s\">Consulte-o aqui!</a><br><br>Cumprimentos!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "anterior"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "seguinte"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 96b89f3afa3..3534f1cc596 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -96,12 +96,12 @@ msgstr "Espaço em disco insuficiente!"
msgid "Upload cancelled."
msgstr "Envio cancelado."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "O URL não pode estar vazio."
@@ -109,8 +109,8 @@ msgstr "O URL não pode estar vazio."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Erro"
@@ -122,15 +122,11 @@ msgstr "Partilhar"
msgid "Delete permanently"
msgstr "Eliminar permanentemente"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Eliminar"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Renomear"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Pendente"
@@ -158,15 +154,13 @@ msgstr "substituido {new_name} por {old_name}"
msgid "undo"
msgstr "desfazer"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "Executar a tarefa de apagar"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "A enviar 1 ficheiro"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "A enviar os ficheiros"
@@ -192,43 +186,45 @@ msgstr "O seu armazenamento está cheio, os ficheiros não podem ser sincronizad
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
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:344
+#: js/files.js:358
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:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nome"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Tamanho"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 pasta"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} pastas"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 ficheiro"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} ficheiros"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -311,6 +307,10 @@ msgstr "Transferir"
msgid "Unshare"
msgstr "Deixar de partilhar"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Eliminar"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Upload muito grande"
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 7ab5107cbf8..dd0f5f9b927 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -64,18 +64,18 @@ msgid ""
"files."
msgstr "Chave privada não é válida! Provavelmente senha foi alterada fora do sistema ownCloud (exemplo, o diretório corporativo). Pode atualizar password da chave privada em configurações personalizadas para recuperar o acesso aos seus arquivos encriptados."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Faltam alguns requisitos."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Por favor, certifique-se que PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está ativada e corretamente configurada. Por agora, a encripitação está desativado."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index ef9f8e11a77..200f818e9f3 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Helder Meneses <helder.meneses@gmail.com>, 2013
# moliveira <manuel.oliveira@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\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"
@@ -32,27 +33,27 @@ msgstr "Submeter"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Desculpe, mas este link parece não estar a funcionar."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "As razões poderão ser:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "O item foi removido"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "O link expirou"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "A partilha está desativada"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Para mais informações, por favor questione a pessoa que lhe enviou este link"
#: templates/public.php:15
#, php-format
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index b64a08b08e8..e23fb508d18 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/files_trashbin.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-08-03 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 14:30+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -52,21 +52,17 @@ msgstr "Nome"
msgid "Deleted"
msgstr "Apagado"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 pasta"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} pastas"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 ficheiro"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} ficheiros"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index df6290845f8..c1a7fac6ec2 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Utilizadores"
#: app.php:409
-msgid "Apps"
-msgstr "Aplicações"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "A actualização \"%s\" falhou."
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr "Descarregue os ficheiros em partes menores, separados ou peça gentilmente ao seu administrador."
-#: helper.php:235
-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"
@@ -211,50 +203,46 @@ msgid "seconds ago"
msgstr "Minutos atrás"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "Há 1 minuto"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "há %d minutos"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "Há 1 horas"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "Há %d horas"
-
-#: template/functions.php:85
msgid "today"
msgstr "hoje"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "ontem"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "há %d dias"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "ultímo mês"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "Há %d meses atrás"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "ano passado"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "anos atrás"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 8c05bf433ca..a22e4fc18bb 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -124,7 +124,11 @@ msgstr "Erro enquanto actualizava a aplicação"
msgid "Updated"
msgstr "Actualizado"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "A guardar..."
@@ -145,31 +149,31 @@ msgstr "Não foi possível remover o utilizador"
msgid "Groups"
msgstr "Grupos"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Grupo Administrador"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Eliminar"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "Adicionar grupo"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Um nome de utilizador válido deve ser fornecido"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Erro a criar utilizador"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Uma password válida deve ser fornecida"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -240,106 +244,106 @@ msgstr "Este servidor ownCloud não tem uma ligação de internet a funcionar. I
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Executar uma tarefa com cada página carregada"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php está registado num serviço webcron para chamar a página cron.php por http uma vez por minuto."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "Use o serviço cron do sistema para chamar o ficheiro cron.php uma vez por minuto."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Partilha"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Activar a API de partilha"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Permitir que os utilizadores usem a API de partilha"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Permitir links"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Permitir que os utilizadores partilhem itens com o público utilizando um link."
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Permitir Envios Públicos"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Permitir aos utilizadores que possam definir outros utilizadores para carregar ficheiros para as suas pastas publicas"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Permitir repartilha"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Permitir que os utilizadores partilhem itens partilhados com eles"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Permitir que os utilizadores partilhem com todos"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Segurança"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Forçar HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forçar os clientes a ligar a %s através de uma ligação encriptada"
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL"
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Registo"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Nível do registo"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Mais"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versão"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -469,6 +473,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Use este endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">aceder aos seus ficheiros via WebDav</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Encriptação"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Nome de utilizador"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 4fbf0d1bc24..435fb626098 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -157,198 +157,185 @@ msgstr "Filtro de login de utilizador"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "Use a variável %%uid , exemplo: \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Utilizar filtro"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Defina o filtro a aplicar, ao recuperar utilizadores."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Sem variável. Exemplo: \"objectClass=pessoa\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Filtrar por grupo"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Defina o filtro a aplicar, ao recuperar grupos."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Definições de ligação"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Configuração activa"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Se não estiver marcada, esta definição não será tida em conta."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Porto"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Servidor de Backup (Réplica)"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Forneça um servidor (anfitrião) de backup. Deve ser uma réplica do servidor principal de LDAP/AD "
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Porta do servidor de backup (Replica)"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Desactivar servidor principal"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Não utilize para adicionar ligações LDAP, irá falhar!"
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP (Windows) não sensível a maiúsculas."
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Desligar a validação de certificado SSL."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Não recomendado, utilizado apenas para testes!"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Cache do tempo de vida dos objetos no servidor"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "em segundos. Uma alteração esvazia a cache."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Definições de directorias"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Mostrador do nome de utilizador."
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Base da árvore de utilizadores."
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Uma base de utilizador DN por linha"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Utilizar atributos de pesquisa"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Opcional; Um atributo por linha"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Mostrador do nome do grupo."
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Base da árvore de grupos."
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Uma base de grupo DN por linha"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Atributos de pesquisa de grupo"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Associar utilizador ao grupo."
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Atributos especiais"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Quota"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Quota padrão"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "em bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Campo de email"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Regra da pasta inicial do utilizador"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Nome de utilizador interno"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -364,15 +351,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Atributo do nome de utilizador interno"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Passar a detecção do UUID"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -383,15 +370,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "Atributo UUID:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Mapeamento do utilizador LDAP"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -405,18 +392,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Limpar mapeamento do utilizador-LDAP"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Limpar o mapeamento do nome de grupo LDAP"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Testar a configuração"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 5696b2a9efd..94a85870e9b 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: corneliu.e <corneliueva@yahoo.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -141,59 +141,63 @@ msgstr "Noiembrie"
msgid "December"
msgstr "Decembrie"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Setări"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "secunde în urmă"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 minut în urmă"
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minute in urmă"
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "Acum o oră"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} ore în urmă"
-
-#: js/js.js:758
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:815
msgid "today"
msgstr "astăzi"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "ieri"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} zile in urmă"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "ultima lună"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} luni în urmă"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "luni în urmă"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "ultimul an"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "ani în urmă"
@@ -201,23 +205,19 @@ msgstr "ani în urmă"
msgid "Choose"
msgstr "Alege"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Anulare"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Eroare la încărcarea șablonului selectorului de fișiere"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nu"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ok"
@@ -381,9 +381,10 @@ msgstr "Actualizarea a eșuat! Raportați problema către <a href=\"https://gith
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Actualizare reușită. Ești redirecționat către ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Resetarea parolei ownCloud "
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -582,6 +583,10 @@ msgstr "%s este disponibil. Vezi mai multe informații despre procesul de actual
msgid "Log out"
msgstr "Ieșire"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Autentificare automată respinsă!"
@@ -619,14 +624,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Salutare, <br><br>Vă aduc la cunoștință că %s a partajat %s cu tine.<br><a href=\"%s\">Accesează-l!</a><br><br>Numai bine!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "precedentul"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "următorul"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 2e124639962..7f0ae89b77f 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -97,12 +97,12 @@ msgstr "Nu este suficient spațiu disponibil"
msgid "Upload cancelled."
msgstr "Încărcare anulată."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "Adresa URL nu poate fi goală."
@@ -110,8 +110,8 @@ msgstr "Adresa URL nu poate fi goală."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Eroare"
@@ -123,15 +123,11 @@ msgstr "Partajează"
msgid "Delete permanently"
msgstr "Stergere permanenta"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Șterge"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Redenumire"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "În așteptare"
@@ -159,15 +155,14 @@ msgstr "{new_name} inlocuit cu {old_name}"
msgid "undo"
msgstr "Anulează ultima acțiune"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "efectueaza operatiunea de stergere"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "un fișier se încarcă"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "fișiere se încarcă"
@@ -193,43 +188,47 @@ msgstr "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Spatiul de stocare este aproape plin ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Invalid folder name. Usage of 'Shared' is reserved by Ownclou"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Nume"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Dimensiune"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 folder"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} foldare"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 fisier"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} fisiere"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/app.php:73
#, php-format
@@ -312,6 +311,10 @@ msgstr "Descarcă"
msgid "Unshare"
msgstr "Anulare partajare"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Șterge"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Fișierul încărcat este prea mare"
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index db393386ef1..65bcf49b446 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index bf1518c49c3..34575f9a246 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index 0f8aa36ac4a..59197c9f4fd 100644
--- a/l10n/ro/files_trashbin.po
+++ b/l10n/ro/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,19 @@ msgstr "Nume"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 folder"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} foldare"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 fisier"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} fisiere"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 42f5f30ea38..d09f1365448 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# I Robot <owncloud-bot@tmit.eu>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +35,10 @@ msgid "Users"
msgstr "Utilizatori"
#: app.php:409
-msgid "Apps"
-msgstr "Aplicații"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +74,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "nu poate fi determinat"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Aplicația nu este activată"
@@ -203,57 +196,57 @@ msgstr "Serverul de web nu este încă setat corespunzător pentru a permite sin
#: setup.php:185
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</ a>."
+msgstr "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>."
#: template/functions.php:80
msgid "seconds ago"
msgstr "secunde în urmă"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 minut în urmă"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minute în urmă"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "Acum o ora"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d ore in urma"
-
-#: template/functions.php:85
msgid "today"
msgstr "astăzi"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "ieri"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d zile în urmă"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "ultima lună"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d luni in urma"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "ultimul an"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "ani în urmă"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index c26932adf90..601eba0a05c 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -121,7 +121,11 @@ msgstr "Eroare în timpul actualizării aplicaţiei"
msgid "Updated"
msgstr "Actualizat"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Se salvează..."
@@ -142,31 +146,31 @@ msgstr "Imposibil de eliminat utilizatorul"
msgid "Groups"
msgstr "Grupuri"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Grupul Admin "
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Șterge"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "adăugaţi grupul"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Trebuie să furnizaţi un nume de utilizator valid"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Eroare la crearea utilizatorului"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Trebuie să furnizaţi o parolă validă"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "_language_name_"
@@ -237,106 +241,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Execută o sarcină la fiecare pagină încărcată"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Partajare"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Activare API partajare"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Permite aplicațiilor să folosească API-ul de partajare"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Pemite legături"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Permite utilizatorilor să partajeze fișiere în mod public prin legături"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Permite repartajarea"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Permite utilizatorilor să repartajeze fișiere partajate cu ei"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Permite utilizatorilor să partajeze cu oricine"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Permite utilizatorilor să partajeze doar cu utilizatori din același grup"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Securitate"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Jurnal de activitate"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Nivel jurnal"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Mai mult"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Mai puțin"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Versiunea"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Încriptare"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 678d29975a3..db4843a8a90 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "Filtrare după Nume Utilizator"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "folosiți substituentul %%uid , d.e. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtrarea după lista utilizatorilor"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definește filtrele care trebui aplicate, când se peiau utilzatorii."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "fără substituenți, d.e. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Fitrare Grup"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definește filtrele care se aplică, când se preiau grupurile."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "fără substituenți, d.e. \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Portul"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Utilizează TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Server LDAP insensibil la majuscule (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Oprește validarea certificatelor SSL "
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nu este recomandat, a se utiliza doar pentru testare."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "în secunde. O schimbare curăță memoria tampon."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Câmpul cu numele vizibil al utilizatorului"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Arborele de bază al Utilizatorilor"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Un User Base DN pe linie"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Câmpul cu numele grupului"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Arborele de bază al Grupurilor"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Un Group Base DN pe linie"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Asocierea Grup-Membru"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "în octeți"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Ajutor"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 8410ab88252..0eea0c71445 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -6,6 +6,7 @@
# alfsoft <alfsoft@gmail.com>, 2013
# lord93 <lordakryl@gmail.com>, 2013
# foool <andrglad@mail.ru>, 2013
+# eurekafag <rkfg@rkfg.me>, 2013
# Victor Bravo <>, 2013
# Vyacheslav Muranov <s@neola.ru>, 2013
# Den4md <denstarr@mail.md>, 2013
@@ -14,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Den4md <denstarr@mail.md>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -144,59 +145,63 @@ msgstr "Ноябрь"
msgid "December"
msgstr "Декабрь"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Конфигурация"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "несколько секунд назад"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 минуту назад"
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} минут назад"
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "час назад"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} часов назад"
-
-#: js/js.js:758
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n минуту назад"
+msgstr[1] "%n минуты назад"
+msgstr[2] "%n минут назад"
+
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n час назад"
+msgstr[1] "%n часа назад"
+msgstr[2] "%n часов назад"
+
+#: js/js.js:815
msgid "today"
msgstr "сегодня"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} дней назад"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "%n день назад"
+msgstr[1] "%n дня назад"
+msgstr[2] "%n дней назад"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "в прошлом месяце"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} месяцев назад"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n месяц назад"
+msgstr[1] "%n месяца назад"
+msgstr[2] "%n месяцев назад"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "несколько месяцев назад"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "в прошлом году"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "несколько лет назад"
@@ -204,23 +209,19 @@ msgstr "несколько лет назад"
msgid "Choose"
msgstr "Выбрать"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Отменить"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Ошибка при загрузке файла выбора шаблона"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Нет"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ок"
@@ -384,9 +385,10 @@ msgstr "При обновлении произошла ошибка. Пожал
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud..."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Сброс пароля "
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "%s сброс пароля"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -585,6 +587,10 @@ msgstr "%s доступно. Получить дополнительную ин
msgid "Log out"
msgstr "Выйти"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Ещё приложения"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Автоматический вход в систему отключен!"
@@ -622,14 +628,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Приветствую,<br><br>просто даю знать, что %s поделился »%s« с вами.<br><a href=\"%s\">Посмотреть!</a><br><br>Удачи!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "пред"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "след"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 74675f578d1..a34e9fe5a4c 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -4,6 +4,7 @@
#
# Translators:
# lord93 <lordakryl@gmail.com>, 2013
+# eurekafag <rkfg@rkfg.me>, 2013
# Victor Bravo <>, 2013
# hackproof <hackproof.ai@gmail.com>, 2013
# Friktor <antonshramko@yandex.ru>, 2013
@@ -11,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -98,12 +99,12 @@ msgstr "Недостаточно свободного места"
msgid "Upload cancelled."
msgstr "Загрузка отменена."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "Ссылка не может быть пустой."
@@ -111,8 +112,8 @@ msgstr "Ссылка не может быть пустой."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Ошибка"
@@ -124,15 +125,11 @@ msgstr "Открыть доступ"
msgid "Delete permanently"
msgstr "Удалено навсегда"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Удалить"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Переименовать"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Ожидание"
@@ -160,15 +157,14 @@ msgstr "заменено {new_name} на {old_name}"
msgid "undo"
msgstr "отмена"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "выполнить операцию удаления"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "Закачка %n файла"
+msgstr[1] "Закачка %n файлов"
+msgstr[2] "Закачка %n файлов"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "загружается 1 файл"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "файлы загружаются"
@@ -194,43 +190,47 @@ msgstr "Ваше дисковое пространство полностью з
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ваше хранилище почти заполнено ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Загрузка началась. Это может потребовать много времени, если файл большого размера."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Имя"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Размер"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Изменён"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 папка"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} папок"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 файл"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n папка"
+msgstr[1] "%n папки"
+msgstr[2] "%n папок"
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} файлов"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n файл"
+msgstr[1] "%n файла"
+msgstr[2] "%n файлов"
#: lib/app.php:73
#, php-format
@@ -313,6 +313,10 @@ msgstr "Скачать"
msgid "Unshare"
msgstr "Закрыть общий доступ"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Удалить"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Файл слишком велик"
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index a7b8d2431fe..b3f6c241cf6 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -7,14 +7,15 @@
# alfsoft <alfsoft@gmail.com>, 2013
# lord93 <lordakryl@gmail.com>, 2013
# jekader <jekader@gmail.com>, 2013
+# eurekafag <rkfg@rkfg.me>, 2013
# Victor Bravo <>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
+"Last-Translator: eurekafag <rkfg@rkfg.me>\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"
@@ -66,20 +67,20 @@ msgid ""
"files."
msgstr "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне системы OwnCloud (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. "
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Требования отсутствуют."
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Пожалуйста, убедитесь, что PHP 5.3.3 или новее установлен и что расширение OpenSSL PHP включен и настроен. В настоящее время, шифрование для приложения было отключено."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr "Пожалуйста, убедитесь, что версия PHP 5.3.3 или новее, а также, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования отключено."
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Для следующих пользователей шифрование не настроено:"
#: js/settings-admin.js:11
msgid "Saving..."
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 244bdea5e0b..5553e3a10ad 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: Den4md <denstarr@mail.md>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index 7dbe2f005c3..da4605cba1b 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/files_trashbin.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-08-02 01:56-0400\n"
-"PO-Revision-Date: 2013-08-01 18:00+0000\n"
-"Last-Translator: Den4md <denstarr@mail.md>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-17 10:40+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"
@@ -52,21 +52,19 @@ msgstr "Имя"
msgid "Deleted"
msgstr "Удалён"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 папка"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} папок"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 файл"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} файлов"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] "%n папок"
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] "%n файлов"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 5280cba75ed..a2908e78ace 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -4,14 +4,15 @@
#
# Translators:
# Alexander Shashkevych <alex@stunpix.com>, 2013
+# eurekafag <rkfg@rkfg.me>, 2013
# Friktor <antonshramko@yandex.ru>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
-"Last-Translator: Alexander Shashkevych <alex@stunpix.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -36,14 +37,10 @@ msgid "Users"
msgstr "Пользователи"
#: app.php:409
-msgid "Apps"
-msgstr "Приложения"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Не смог обновить \"%s\"."
@@ -79,10 +76,6 @@ msgid ""
"administrator."
msgstr "Загрузите файл маленьшими порциями, раздельно или вежливо попросите Вашего администратора."
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "Невозможно установить"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Приложение не разрешено"
@@ -212,50 +205,50 @@ msgid "seconds ago"
msgstr "несколько секунд назад"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 минуту назад"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n минута назад"
+msgstr[1] "%n минуты назад"
+msgstr[2] "%n минут назад"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d минут назад"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n час назад"
+msgstr[1] "%n часа назад"
+msgstr[2] "%n часов назад"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "час назад"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d часов назад"
-
-#: template/functions.php:85
msgid "today"
msgstr "сегодня"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "вчера"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d дней назад"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] "%n день назад"
+msgstr[1] "%n дня назад"
+msgstr[2] "%n дней назад"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "в прошлом месяце"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d месяцев назад"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n месяц назад"
+msgstr[1] "%n месяца назад"
+msgstr[2] "%n месяцев назад"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "в прошлом году"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "несколько лет назад"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 4879d2b0d4a..64559aacebc 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -6,16 +6,16 @@
# Alexander Shashkevych <alex@stunpix.com>, 2013
# alfsoft <alfsoft@gmail.com>, 2013
# lord93 <lordakryl@gmail.com>, 2013
-# eurekafag <eurekafag@eureka7.ru>, 2013
+# eurekafag <rkfg@rkfg.me>, 2013
# hackproof <hackproof.ai@gmail.com>, 2013
# Friktor <antonshramko@yandex.ru>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
-"Last-Translator: Alexander Shashkevych <alex@stunpix.com>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -126,7 +126,11 @@ msgstr "Ошибка при обновлении приложения"
msgid "Updated"
msgstr "Обновлено"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Сохранение..."
@@ -147,31 +151,31 @@ msgstr "Невозможно удалить пользователя"
msgid "Groups"
msgstr "Группы"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Группа Администраторы"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Удалить"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "добавить группу"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Укажите правильное имя пользователя"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Ошибка создания пользователя"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Укажите валидный пароль"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Русский "
@@ -242,106 +246,106 @@ msgstr "Этот сервер не имеет подключения к сети
msgid "Cron"
msgstr "Планировщик задач по расписанию"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Выполнять одно задание с каждой загруженной страницей"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php зарегистрирован в сервисе webcron, чтобы cron.php вызывался раз в минуту используя http."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "Использовать системный сервис cron для вызова cron.php раз в минуту."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Общий доступ"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Включить API общего доступа"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Позволить приложениям использовать API общего доступа"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Разрешить ссылки"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Разрешить пользователям открывать в общий доступ элементы с публичной ссылкой"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Разрешить открытые загрузки"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Разрешить пользователям позволять другим загружать в их открытые папки"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Разрешить переоткрытие общего доступа"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Разрешить пользователя делать общий доступ любому"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Разрешить пользователям делать общий доступ только для пользователей их групп"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Безопасность"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Принудить к HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Принудить клиентов подключаться к %s через шифрованное соединение."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить принудительное SSL."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Лог"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Уровень лога"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Больше"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Меньше"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Версия"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -471,6 +475,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Используйте этот адрес чтобы получить доступ к вашим файлам через WebDav - <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Шифрование"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Имя пользователя"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index cdd1f344bff..f47972aa0b7 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: Alexander Shashkevych <alex@stunpix.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -157,198 +157,185 @@ msgstr "Фильтр входа пользователей"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "используйте заполнитель %%uid, например: \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Фильтр списка пользователей"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Определяет фильтр для применения при получении пользователей."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "без заполнителя, например: \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Фильтр группы"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Определяет фильтр для применения при получении группы."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "без заполнения, например \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Настройки подключения"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Конфигурация активна"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Когда галочка снята, эта конфигурация будет пропущена."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Адрес резервного сервера"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Порт резервного сервера"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Отключение главного сервера"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Использовать TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Не используйте совместно с безопасными подключениями (LDAPS), это не сработает."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Нечувствительный к регистру сервер LDAP (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Отключить проверку сертификата SSL."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Не рекомендуется, используйте только для тестирования."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Кэш времени жизни"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "в секундах. Изменение очистит кэш."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Настройки каталога"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Поле отображаемого имени пользователя"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "База пользовательского дерева"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "По одной базовому DN пользователей в строке."
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Поисковые атрибуты пользователя"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Опционально; один атрибут на линию"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Поле отображаемого имени группы"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "База группового дерева"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "По одной базовому DN групп в строке."
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Атрибуты поиска для группы"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Ассоциация Группа-Участник"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Специальные атрибуты"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Поле квота"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Квота по умолчанию"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "в байтах"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Поле адресса эллектронной почты"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Правило именования Домашней Папки Пользователя"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Внутреннее имя пользователя"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -364,15 +351,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Аттрибут для внутреннего имени:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Переопределить нахождение UUID"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -383,15 +370,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "Аттрибут для UUID:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Соответствия Имя-Пользователь LDAP"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -405,18 +392,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Очистить соответствия Имя-Пользователь LDAP"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Очистить соответствия Группа-Группа LDAP"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Тестовая конфигурация"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Помощь"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
deleted file mode 100644
index 06111cdf7c6..00000000000
--- a/l10n/ru_RU/core.po
+++ /dev/null
@@ -1,617 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-04 02:29+0200\n"
-"PO-Revision-Date: 2013-06-03 00:32+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"
-"Content-Transfer-Encoding: 8bit\n"
-"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/share.php:97
-#, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr ""
-
-#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
-msgid "Category type not provided."
-msgstr ""
-
-#: ajax/vcategories/add.php:30
-msgid "No category to add?"
-msgstr ""
-
-#: ajax/vcategories/add.php:37
-#, php-format
-msgid "This category already exists: %s"
-msgstr ""
-
-#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
-#: ajax/vcategories/favorites.php:24
-#: ajax/vcategories/removeFromFavorites.php:26
-msgid "Object type not provided."
-msgstr ""
-
-#: ajax/vcategories/addToFavorites.php:30
-#: ajax/vcategories/removeFromFavorites.php:30
-#, php-format
-msgid "%s ID not provided."
-msgstr ""
-
-#: ajax/vcategories/addToFavorites.php:35
-#, php-format
-msgid "Error adding %s to favorites."
-msgstr ""
-
-#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
-msgid "No categories selected for deletion."
-msgstr ""
-
-#: ajax/vcategories/removeFromFavorites.php:35
-#, php-format
-msgid "Error removing %s from favorites."
-msgstr ""
-
-#: js/config.php:34
-msgid "Sunday"
-msgstr ""
-
-#: js/config.php:35
-msgid "Monday"
-msgstr ""
-
-#: js/config.php:36
-msgid "Tuesday"
-msgstr ""
-
-#: js/config.php:37
-msgid "Wednesday"
-msgstr ""
-
-#: js/config.php:38
-msgid "Thursday"
-msgstr ""
-
-#: js/config.php:39
-msgid "Friday"
-msgstr ""
-
-#: js/config.php:40
-msgid "Saturday"
-msgstr ""
-
-#: js/config.php:45
-msgid "January"
-msgstr ""
-
-#: js/config.php:46
-msgid "February"
-msgstr ""
-
-#: js/config.php:47
-msgid "March"
-msgstr ""
-
-#: js/config.php:48
-msgid "April"
-msgstr ""
-
-#: js/config.php:49
-msgid "May"
-msgstr ""
-
-#: js/config.php:50
-msgid "June"
-msgstr ""
-
-#: js/config.php:51
-msgid "July"
-msgstr ""
-
-#: js/config.php:52
-msgid "August"
-msgstr ""
-
-#: js/config.php:53
-msgid "September"
-msgstr ""
-
-#: js/config.php:54
-msgid "October"
-msgstr ""
-
-#: js/config.php:55
-msgid "November"
-msgstr ""
-
-#: js/config.php:56
-msgid "December"
-msgstr ""
-
-#: js/js.js:286
-msgid "Settings"
-msgstr "Настройки"
-
-#: js/js.js:718
-msgid "seconds ago"
-msgstr ""
-
-#: js/js.js:719
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:720
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:721
-msgid "1 hour ago"
-msgstr ""
-
-#: js/js.js:722
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:723
-msgid "today"
-msgstr ""
-
-#: js/js.js:724
-msgid "yesterday"
-msgstr ""
-
-#: js/js.js:725
-msgid "{days} days ago"
-msgstr ""
-
-#: js/js.js:726
-msgid "last month"
-msgstr ""
-
-#: js/js.js:727
-msgid "{months} months ago"
-msgstr ""
-
-#: js/js.js:728
-msgid "months ago"
-msgstr ""
-
-#: js/js.js:729
-msgid "last year"
-msgstr ""
-
-#: js/js.js:730
-msgid "years ago"
-msgstr ""
-
-#: js/oc-dialogs.js:117
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Отмена"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
-msgid "Error loading file picker template"
-msgstr ""
-
-#: js/oc-dialogs.js:164
-msgid "Yes"
-msgstr ""
-
-#: js/oc-dialogs.js:172
-msgid "No"
-msgstr ""
-
-#: js/oc-dialogs.js:185
-msgid "Ok"
-msgstr ""
-
-#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
-#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
-msgid "The object type is not specified."
-msgstr ""
-
-#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
-#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
-msgid "Error"
-msgstr "Ошибка"
-
-#: js/oc-vcategories.js:179
-msgid "The app name is not specified."
-msgstr ""
-
-#: js/oc-vcategories.js:194
-msgid "The required file {file} is not installed!"
-msgstr ""
-
-#: js/share.js:30 js/share.js:45 js/share.js:87
-msgid "Shared"
-msgstr ""
-
-#: js/share.js:90
-msgid "Share"
-msgstr "Сделать общим"
-
-#: js/share.js:125 js/share.js:617
-msgid "Error while sharing"
-msgstr ""
-
-#: js/share.js:136
-msgid "Error while unsharing"
-msgstr ""
-
-#: js/share.js:143
-msgid "Error while changing permissions"
-msgstr ""
-
-#: js/share.js:152
-msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
-
-#: js/share.js:154
-msgid "Shared with you by {owner}"
-msgstr ""
-
-#: js/share.js:159
-msgid "Share with"
-msgstr ""
-
-#: js/share.js:164
-msgid "Share with link"
-msgstr ""
-
-#: js/share.js:167
-msgid "Password protect"
-msgstr ""
-
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
-msgid "Password"
-msgstr ""
-
-#: js/share.js:173
-msgid "Email link to person"
-msgstr ""
-
-#: js/share.js:174
-msgid "Send"
-msgstr ""
-
-#: js/share.js:178
-msgid "Set expiration date"
-msgstr ""
-
-#: js/share.js:179
-msgid "Expiration date"
-msgstr ""
-
-#: js/share.js:211
-msgid "Share via email:"
-msgstr ""
-
-#: js/share.js:213
-msgid "No people found"
-msgstr ""
-
-#: js/share.js:251
-msgid "Resharing is not allowed"
-msgstr ""
-
-#: js/share.js:287
-msgid "Shared in {item} with {user}"
-msgstr ""
-
-#: js/share.js:308
-msgid "Unshare"
-msgstr ""
-
-#: js/share.js:320
-msgid "can edit"
-msgstr ""
-
-#: js/share.js:322
-msgid "access control"
-msgstr ""
-
-#: js/share.js:325
-msgid "create"
-msgstr ""
-
-#: js/share.js:328
-msgid "update"
-msgstr ""
-
-#: js/share.js:331
-msgid "delete"
-msgstr ""
-
-#: js/share.js:334
-msgid "share"
-msgstr ""
-
-#: js/share.js:368 js/share.js:564
-msgid "Password protected"
-msgstr ""
-
-#: js/share.js:577
-msgid "Error unsetting expiration date"
-msgstr ""
-
-#: js/share.js:589
-msgid "Error setting expiration date"
-msgstr ""
-
-#: js/share.js:604
-msgid "Sending ..."
-msgstr ""
-
-#: js/share.js:615
-msgid "Email sent"
-msgstr ""
-
-#: js/update.js:14
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr ""
-
-#: js/update.js:18
-msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
-
-#: lostpassword/controller.php:48
-msgid "ownCloud password reset"
-msgstr ""
-
-#: lostpassword/templates/email.php:2
-msgid "Use the following link to reset your password: {link}"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:4
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:12
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
-msgid "You will receive a link to reset your password via Email."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
-#: templates/login.php:19
-msgid "Username"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:21
-msgid "Request reset"
-msgstr ""
-
-#: lostpassword/templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr ""
-
-#: lostpassword/templates/resetpassword.php:5
-msgid "To login page"
-msgstr ""
-
-#: lostpassword/templates/resetpassword.php:8
-msgid "New password"
-msgstr ""
-
-#: lostpassword/templates/resetpassword.php:11
-msgid "Reset password"
-msgstr ""
-
-#: strings.php:5
-msgid "Personal"
-msgstr ""
-
-#: strings.php:6
-msgid "Users"
-msgstr ""
-
-#: strings.php:7
-msgid "Apps"
-msgstr ""
-
-#: strings.php:8
-msgid "Admin"
-msgstr ""
-
-#: strings.php:9
-msgid "Help"
-msgstr ""
-
-#: templates/403.php:12
-msgid "Access forbidden"
-msgstr ""
-
-#: templates/404.php:12
-msgid "Cloud not found"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
-msgstr ""
-
-#: templates/edit_categories_dialog.php:16
-msgid "Add"
-msgstr "Добавить"
-
-#: templates/installation.php:24 templates/installation.php:31
-#: templates/installation.php:38
-msgid "Security Warning"
-msgstr ""
-
-#: templates/installation.php:25
-msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
-
-#: templates/installation.php:26
-msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
-
-#: templates/installation.php:32
-msgid ""
-"No secure random number generator is available, please enable the PHP "
-"OpenSSL extension."
-msgstr ""
-
-#: templates/installation.php:33
-msgid ""
-"Without a secure random number generator an attacker may be able to predict "
-"password reset tokens and take over your account."
-msgstr ""
-
-#: templates/installation.php:39
-msgid ""
-"Your data directory and files are probably accessible from the internet "
-"because the .htaccess file does not work."
-msgstr ""
-
-#: templates/installation.php:40
-msgid ""
-"For information how to properly configure your server, please see the <a "
-"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
-"target=\"_blank\">documentation</a>."
-msgstr ""
-
-#: templates/installation.php:44
-msgid "Create an <strong>admin account</strong>"
-msgstr ""
-
-#: templates/installation.php:62
-msgid "Advanced"
-msgstr ""
-
-#: templates/installation.php:64
-msgid "Data folder"
-msgstr ""
-
-#: templates/installation.php:74
-msgid "Configure the database"
-msgstr ""
-
-#: templates/installation.php:79 templates/installation.php:91
-#: templates/installation.php:102 templates/installation.php:113
-#: templates/installation.php:125
-msgid "will be used"
-msgstr ""
-
-#: templates/installation.php:137
-msgid "Database user"
-msgstr ""
-
-#: templates/installation.php:144
-msgid "Database password"
-msgstr ""
-
-#: templates/installation.php:149
-msgid "Database name"
-msgstr ""
-
-#: templates/installation.php:159
-msgid "Database tablespace"
-msgstr ""
-
-#: templates/installation.php:166
-msgid "Database host"
-msgstr ""
-
-#: templates/installation.php:172
-msgid "Finish setup"
-msgstr ""
-
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:37
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:62
-msgid "Log out"
-msgstr ""
-
-#: templates/login.php:9
-msgid "Automatic logon rejected!"
-msgstr ""
-
-#: templates/login.php:10
-msgid ""
-"If you did not change your password recently, your account may be "
-"compromised!"
-msgstr ""
-
-#: templates/login.php:12
-msgid "Please change your password to secure your account again."
-msgstr ""
-
-#: templates/login.php:34
-msgid "Lost your password?"
-msgstr ""
-
-#: templates/login.php:39
-msgid "remember"
-msgstr ""
-
-#: templates/login.php:41
-msgid "Log in"
-msgstr ""
-
-#: templates/login.php:47
-msgid "Alternative Logins"
-msgstr ""
-
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
-#: templates/update.php:3
-#, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
deleted file mode 100644
index 097c3e00ba5..00000000000
--- a/l10n/ru_RU/files.po
+++ /dev/null
@@ -1,322 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-04-26 08:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
-"Content-Transfer-Encoding: 8bit\n"
-"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/move.php:17
-#, php-format
-msgid "Could not move %s - File with this name already exists"
-msgstr ""
-
-#: ajax/move.php:27 ajax/move.php:30
-#, php-format
-msgid "Could not move %s"
-msgstr ""
-
-#: ajax/upload.php:19
-msgid "No file was uploaded. Unknown error"
-msgstr "Файл не был загружен. Неизвестная ошибка"
-
-#: ajax/upload.php:26
-msgid "There is no error, the file uploaded with success"
-msgstr "Ошибки нет, файл успешно загружен"
-
-#: ajax/upload.php:27
-msgid ""
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
-
-#: ajax/upload.php:29
-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:30
-msgid "The uploaded file was only partially uploaded"
-msgstr "Загружаемый файл был загружен лишь частично"
-
-#: ajax/upload.php:31
-msgid "No file was uploaded"
-msgstr "Файл не был загружен"
-
-#: ajax/upload.php:32
-msgid "Missing a temporary folder"
-msgstr "Отсутствие временной папки"
-
-#: ajax/upload.php:33
-msgid "Failed to write to disk"
-msgstr "Не удалось записать на диск"
-
-#: ajax/upload.php:51
-msgid "Not enough storage available"
-msgstr "Недостаточно места в хранилище"
-
-#: ajax/upload.php:83
-msgid "Invalid directory."
-msgstr ""
-
-#: appinfo/app.php:12
-msgid "Files"
-msgstr ""
-
-#: js/fileactions.js:116
-msgid "Share"
-msgstr "Сделать общим"
-
-#: js/fileactions.js:126
-msgid "Delete permanently"
-msgstr ""
-
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
-msgid "Delete"
-msgstr "Удалить"
-
-#: js/fileactions.js:194
-msgid "Rename"
-msgstr ""
-
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
-msgid "Pending"
-msgstr ""
-
-#: js/filelist.js:259 js/filelist.js:261
-msgid "{new_name} already exists"
-msgstr ""
-
-#: js/filelist.js:259 js/filelist.js:261
-msgid "replace"
-msgstr ""
-
-#: js/filelist.js:259
-msgid "suggest name"
-msgstr ""
-
-#: js/filelist.js:259 js/filelist.js:261
-msgid "cancel"
-msgstr ""
-
-#: js/filelist.js:306
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:306
-msgid "undo"
-msgstr ""
-
-#: js/filelist.js:331
-msgid "perform delete operation"
-msgstr ""
-
-#: js/filelist.js:413
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:416 js/filelist.js:470
-msgid "files uploading"
-msgstr ""
-
-#: js/files.js:52
-msgid "'.' is an invalid file name."
-msgstr ""
-
-#: js/files.js:56
-msgid "File name cannot be empty."
-msgstr ""
-
-#: js/files.js:64
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:78
-msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
-
-#: js/files.js:82
-msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
-
-#: js/files.js:231
-msgid ""
-"Your download is being prepared. This might take some time if the files are "
-"big."
-msgstr ""
-
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr ""
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr ""
-
-#: js/files.js:491
-msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
-
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
-msgid "Error"
-msgstr "Ошибка"
-
-#: js/files.js:877 templates/index.php:69
-msgid "Name"
-msgstr "Имя"
-
-#: js/files.js:878 templates/index.php:80
-msgid "Size"
-msgstr ""
-
-#: js/files.js:879 templates/index.php:82
-msgid "Modified"
-msgstr ""
-
-#: js/files.js:898
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:900
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:908
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:910
-msgid "{count} files"
-msgstr ""
-
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
-
-#: lib/app.php:73
-msgid "Unable to rename file"
-msgstr ""
-
-#: lib/helper.php:11 templates/index.php:18
-msgid "Upload"
-msgstr ""
-
-#: templates/admin.php:5
-msgid "File handling"
-msgstr ""
-
-#: templates/admin.php:7
-msgid "Maximum upload size"
-msgstr ""
-
-#: templates/admin.php:10
-msgid "max. possible: "
-msgstr ""
-
-#: templates/admin.php:15
-msgid "Needed for multi-file and folder downloads."
-msgstr ""
-
-#: templates/admin.php:17
-msgid "Enable ZIP-download"
-msgstr ""
-
-#: templates/admin.php:20
-msgid "0 is unlimited"
-msgstr ""
-
-#: templates/admin.php:22
-msgid "Maximum input size for ZIP files"
-msgstr ""
-
-#: templates/admin.php:26
-msgid "Save"
-msgstr "Сохранить"
-
-#: templates/index.php:7
-msgid "New"
-msgstr ""
-
-#: templates/index.php:10
-msgid "Text file"
-msgstr ""
-
-#: templates/index.php:12
-msgid "Folder"
-msgstr ""
-
-#: templates/index.php:14
-msgid "From link"
-msgstr ""
-
-#: templates/index.php:42
-msgid "Deleted files"
-msgstr ""
-
-#: templates/index.php:48
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/index.php:54
-msgid "You don’t have write permissions here."
-msgstr ""
-
-#: templates/index.php:61
-msgid "Nothing in here. Upload something!"
-msgstr ""
-
-#: templates/index.php:75
-msgid "Download"
-msgstr "Загрузка"
-
-#: templates/index.php:87 templates/index.php:88
-msgid "Unshare"
-msgstr ""
-
-#: templates/index.php:107
-msgid "Upload too large"
-msgstr ""
-
-#: templates/index.php:109
-msgid ""
-"The files you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: templates/index.php:114
-msgid "Files are being scanned, please wait."
-msgstr ""
-
-#: templates/index.php:117
-msgid "Current scanning"
-msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ru_RU/files_encryption.po b/l10n/ru_RU/files_encryption.po
deleted file mode 100644
index 4690ff89165..00000000000
--- a/l10n/ru_RU/files_encryption.po
+++ /dev/null
@@ -1,103 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+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"
-"Content-Transfer-Encoding: 8bit\n"
-"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/adminrecovery.php:29
-msgid "Recovery key successfully enabled"
-msgstr ""
-
-#: ajax/adminrecovery.php:34
-msgid ""
-"Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
-
-#: ajax/adminrecovery.php:48
-msgid "Recovery key successfully disabled"
-msgstr ""
-
-#: ajax/adminrecovery.php:53
-msgid ""
-"Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
-
-#: ajax/changeRecoveryPassword.php:49
-msgid "Password successfully changed."
-msgstr ""
-
-#: ajax/changeRecoveryPassword.php:51
-msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
-
-#: js/settings-admin.js:11
-msgid "Saving..."
-msgstr "Сохранение"
-
-#: templates/settings-admin.php:5 templates/settings-personal.php:4
-msgid "Encryption"
-msgstr ""
-
-#: templates/settings-admin.php:9
-msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr ""
-
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
-msgstr ""
-
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
-msgid "Enabled"
-msgstr ""
-
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
-msgid "Disabled"
-msgstr ""
-
-#: templates/settings-admin.php:32
-msgid "Change encryption passwords recovery key:"
-msgstr ""
-
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
-msgstr ""
-
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
-msgstr ""
-
-#: templates/settings-admin.php:51
-msgid "Change Password"
-msgstr ""
-
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr ""
-
-#: templates/settings-personal.php:11
-msgid ""
-"Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr ""
-
-#: templates/settings-personal.php:27
-msgid "File recovery settings updated"
-msgstr ""
-
-#: templates/settings-personal.php:28
-msgid "Could not update file recovery"
-msgstr ""
diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po
deleted file mode 100644
index 96563330fbc..00000000000
--- a/l10n/ru_RU/files_external.po
+++ /dev/null
@@ -1,123 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
-"Content-Transfer-Encoding: 8bit\n"
-"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/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
-msgid "Access granted"
-msgstr ""
-
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
-msgid "Error configuring Dropbox storage"
-msgstr ""
-
-#: js/dropbox.js:65 js/google.js:66
-msgid "Grant access"
-msgstr ""
-
-#: js/dropbox.js:101
-msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
-
-#: js/google.js:36 js/google.js:93
-msgid "Error configuring Google Drive storage"
-msgstr ""
-
-#: lib/config.php:431
-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 ""
-
-#: lib/config.php:434
-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 ""
-
-#: lib/config.php:437
-msgid ""
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
-"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
-"your system administrator to install it."
-msgstr ""
-
-#: templates/settings.php:3
-msgid "External Storage"
-msgstr ""
-
-#: templates/settings.php:9 templates/settings.php:28
-msgid "Folder name"
-msgstr ""
-
-#: templates/settings.php:10
-msgid "External storage"
-msgstr ""
-
-#: templates/settings.php:11
-msgid "Configuration"
-msgstr ""
-
-#: templates/settings.php:12
-msgid "Options"
-msgstr ""
-
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr ""
-
-#: templates/settings.php:33
-msgid "Add storage"
-msgstr ""
-
-#: templates/settings.php:90
-msgid "None set"
-msgstr ""
-
-#: templates/settings.php:91
-msgid "All Users"
-msgstr ""
-
-#: templates/settings.php:92
-msgid "Groups"
-msgstr "Группы"
-
-#: templates/settings.php:100
-msgid "Users"
-msgstr ""
-
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
-msgid "Delete"
-msgstr "Удалить"
-
-#: templates/settings.php:129
-msgid "Enable User External Storage"
-msgstr ""
-
-#: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr ""
-
-#: templates/settings.php:141
-msgid "SSL root certificates"
-msgstr ""
-
-#: templates/settings.php:159
-msgid "Import Root Certificate"
-msgstr ""
diff --git a/l10n/ru_RU/files_sharing.po b/l10n/ru_RU/files_sharing.po
deleted file mode 100644
index 2c8af92a3a6..00000000000
--- a/l10n/ru_RU/files_sharing.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
-"Content-Transfer-Encoding: 8bit\n"
-"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/authenticate.php:4
-msgid "Password"
-msgstr ""
-
-#: templates/authenticate.php:6
-msgid "Submit"
-msgstr ""
-
-#: templates/public.php:10
-#, php-format
-msgid "%s shared the folder %s with you"
-msgstr ""
-
-#: templates/public.php:13
-#, php-format
-msgid "%s shared the file %s with you"
-msgstr ""
-
-#: templates/public.php:19 templates/public.php:43
-msgid "Download"
-msgstr "Загрузка"
-
-#: templates/public.php:40
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po
deleted file mode 100644
index 958cf6f2dd6..00000000000
--- a/l10n/ru_RU/files_trashbin.po
+++ /dev/null
@@ -1,84 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
-"Content-Transfer-Encoding: 8bit\n"
-"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:42
-#, php-format
-msgid "Couldn't delete %s permanently"
-msgstr ""
-
-#: ajax/undelete.php:42
-#, php-format
-msgid "Couldn't restore %s"
-msgstr ""
-
-#: js/trash.js:7 js/trash.js:97
-msgid "perform restore operation"
-msgstr ""
-
-#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
-msgid "Error"
-msgstr "Ошибка"
-
-#: js/trash.js:34
-msgid "delete file permanently"
-msgstr ""
-
-#: js/trash.js:123
-msgid "Delete permanently"
-msgstr ""
-
-#: js/trash.js:176 templates/index.php:17
-msgid "Name"
-msgstr "Имя"
-
-#: js/trash.js:177 templates/index.php:27
-msgid "Deleted"
-msgstr ""
-
-#: js/trash.js:186
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:188
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:196
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:198
-msgid "{count} files"
-msgstr ""
-
-#: templates/index.php:9
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
-
-#: templates/index.php:20 templates/index.php:22
-msgid "Restore"
-msgstr ""
-
-#: templates/index.php:30 templates/index.php:31
-msgid "Delete"
-msgstr "Удалить"
-
-#: templates/part.breadcrumb.php:9
-msgid "Deleted Files"
-msgstr ""
diff --git a/l10n/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po
deleted file mode 100644
index 39fe47d2edf..00000000000
--- a/l10n/ru_RU/files_versions.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
-"Content-Transfer-Encoding: 8bit\n"
-"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/rollbackVersion.php:15
-#, php-format
-msgid "Could not revert: %s"
-msgstr ""
-
-#: history.php:40
-msgid "success"
-msgstr ""
-
-#: history.php:42
-#, php-format
-msgid "File %s was reverted to version %s"
-msgstr ""
-
-#: history.php:49
-msgid "failure"
-msgstr ""
-
-#: history.php:51
-#, php-format
-msgid "File %s could not be reverted to version %s"
-msgstr ""
-
-#: history.php:69
-msgid "No old versions available"
-msgstr ""
-
-#: history.php:74
-msgid "No path specified"
-msgstr ""
-
-#: js/versions.js:6
-msgid "Versions"
-msgstr ""
-
-#: templates/history.php:20
-msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po
deleted file mode 100644
index 1172cc70fe7..00000000000
--- a/l10n/ru_RU/lib.po
+++ /dev/null
@@ -1,245 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-04 02:29+0200\n"
-"PO-Revision-Date: 2013-06-03 00:32+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"
-"Content-Transfer-Encoding: 8bit\n"
-"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:357
-msgid "Help"
-msgstr ""
-
-#: app.php:370
-msgid "Personal"
-msgstr ""
-
-#: app.php:381
-msgid "Settings"
-msgstr "Настройки"
-
-#: app.php:393
-msgid "Users"
-msgstr ""
-
-#: app.php:406
-msgid "Apps"
-msgstr ""
-
-#: app.php:414
-msgid "Admin"
-msgstr ""
-
-#: files.php:210
-msgid "ZIP download is turned off."
-msgstr ""
-
-#: files.php:211
-msgid "Files need to be downloaded one by one."
-msgstr ""
-
-#: files.php:212 files.php:245
-msgid "Back to Files"
-msgstr ""
-
-#: files.php:242
-msgid "Selected files too large to generate zip file."
-msgstr ""
-
-#: helper.php:236
-msgid "couldn't be determined"
-msgstr ""
-
-#: json.php:28
-msgid "Application is not enabled"
-msgstr ""
-
-#: json.php:39 json.php:62 json.php:73
-msgid "Authentication error"
-msgstr ""
-
-#: json.php:51
-msgid "Token expired. Please reload page."
-msgstr ""
-
-#: search/provider/file.php:17 search/provider/file.php:35
-msgid "Files"
-msgstr ""
-
-#: search/provider/file.php:26 search/provider/file.php:33
-msgid "Text"
-msgstr "Текст"
-
-#: search/provider/file.php:29
-msgid "Images"
-msgstr ""
-
-#: setup.php:34
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:37
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:55
-#, php-format
-msgid "%s enter the database username."
-msgstr ""
-
-#: setup.php:58
-#, php-format
-msgid "%s enter the database name."
-msgstr ""
-
-#: setup.php:61
-#, php-format
-msgid "%s you may not use dots in the database name"
-msgstr ""
-
-#: setup.php:64
-#, php-format
-msgid "%s set the database host."
-msgstr ""
-
-#: setup.php:132 setup.php:329 setup.php:374
-msgid "PostgreSQL username and/or password not valid"
-msgstr ""
-
-#: setup.php:133 setup.php:238
-msgid "You need to enter either an existing account or the administrator."
-msgstr ""
-
-#: setup.php:155
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup.php:237
-msgid "MySQL username and/or password not valid"
-msgstr ""
-
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
-#, php-format
-msgid "DB Error: \"%s\""
-msgstr ""
-
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
-#, php-format
-msgid "Offending command was: \"%s\""
-msgstr ""
-
-#: setup.php:308
-#, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
-
-#: setup.php:309
-msgid "Drop this user from MySQL"
-msgstr ""
-
-#: setup.php:314
-#, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
-
-#: setup.php:315
-msgid "Drop this user from MySQL."
-msgstr ""
-
-#: setup.php:466 setup.php:533
-msgid "Oracle username and/or password not valid"
-msgstr ""
-
-#: setup.php:592 setup.php:624
-#, php-format
-msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
-
-#: setup.php:644
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
-
-#: setup.php:867
-msgid ""
-"Your web server is not yet properly setup to allow files synchronization "
-"because the WebDAV interface seems to be broken."
-msgstr ""
-
-#: setup.php:868
-#, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
-
-#: template.php:113
-msgid "seconds ago"
-msgstr ""
-
-#: template.php:114
-msgid "1 minute ago"
-msgstr ""
-
-#: template.php:115
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:116
-msgid "1 hour ago"
-msgstr ""
-
-#: template.php:117
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template.php:118
-msgid "today"
-msgstr ""
-
-#: template.php:119
-msgid "yesterday"
-msgstr ""
-
-#: template.php:120
-#, php-format
-msgid "%d days ago"
-msgstr ""
-
-#: template.php:121
-msgid "last month"
-msgstr ""
-
-#: template.php:122
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template.php:123
-msgid "last year"
-msgstr ""
-
-#: template.php:124
-msgid "years ago"
-msgstr ""
-
-#: vcategories.php:188 vcategories.php:249
-#, php-format
-msgid "Could not find category \"%s\""
-msgstr ""
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
deleted file mode 100644
index 34972e5304e..00000000000
--- a/l10n/ru_RU/settings.po
+++ /dev/null
@@ -1,496 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+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"
-"Content-Transfer-Encoding: 8bit\n"
-"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/apps/ocs.php:20
-msgid "Unable to load list from App Store"
-msgstr ""
-
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20
-msgid "Authentication error"
-msgstr ""
-
-#: ajax/changedisplayname.php:31
-msgid "Your display name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
-msgid "Unable to change display name"
-msgstr ""
-
-#: ajax/creategroup.php:10
-msgid "Group already exists"
-msgstr ""
-
-#: ajax/creategroup.php:19
-msgid "Unable to add group"
-msgstr ""
-
-#: ajax/enableapp.php:11
-msgid "Could not enable app. "
-msgstr ""
-
-#: ajax/lostpassword.php:12
-msgid "Email saved"
-msgstr ""
-
-#: ajax/lostpassword.php:14
-msgid "Invalid email"
-msgstr ""
-
-#: ajax/removegroup.php:13
-msgid "Unable to delete group"
-msgstr ""
-
-#: ajax/removeuser.php:24
-msgid "Unable to delete user"
-msgstr ""
-
-#: ajax/setlanguage.php:15
-msgid "Language changed"
-msgstr ""
-
-#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
-msgid "Invalid request"
-msgstr ""
-
-#: ajax/togglegroups.php:12
-msgid "Admins can't remove themself from the admin group"
-msgstr ""
-
-#: ajax/togglegroups.php:30
-#, php-format
-msgid "Unable to add user to group %s"
-msgstr ""
-
-#: ajax/togglegroups.php:36
-#, php-format
-msgid "Unable to remove user from group %s"
-msgstr ""
-
-#: ajax/updateapp.php:14
-msgid "Couldn't update app."
-msgstr ""
-
-#: js/apps.js:30
-msgid "Update to {appversion}"
-msgstr ""
-
-#: js/apps.js:36 js/apps.js:76
-msgid "Disable"
-msgstr ""
-
-#: js/apps.js:36 js/apps.js:64 js/apps.js:83
-msgid "Enable"
-msgstr ""
-
-#: js/apps.js:55
-msgid "Please wait...."
-msgstr ""
-
-#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
-msgid "Error"
-msgstr "Ошибка"
-
-#: js/apps.js:90
-msgid "Updating...."
-msgstr ""
-
-#: js/apps.js:93
-msgid "Error while updating app"
-msgstr ""
-
-#: js/apps.js:96
-msgid "Updated"
-msgstr ""
-
-#: js/personal.js:118
-msgid "Saving..."
-msgstr "Сохранение"
-
-#: js/users.js:47
-msgid "deleted"
-msgstr "удалено"
-
-#: js/users.js:47
-msgid "undo"
-msgstr ""
-
-#: js/users.js:79
-msgid "Unable to remove user"
-msgstr ""
-
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
-msgid "Groups"
-msgstr "Группы"
-
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
-msgid "Group Admin"
-msgstr ""
-
-#: js/users.js:115 templates/users.php:160
-msgid "Delete"
-msgstr "Удалить"
-
-#: js/users.js:269
-msgid "add group"
-msgstr ""
-
-#: js/users.js:428
-msgid "A valid username must be provided"
-msgstr ""
-
-#: js/users.js:429 js/users.js:435 js/users.js:450
-msgid "Error creating user"
-msgstr ""
-
-#: js/users.js:434
-msgid "A valid password must be provided"
-msgstr ""
-
-#: personal.php:35 personal.php:36
-msgid "__language_name__"
-msgstr ""
-
-#: templates/admin.php:15
-msgid "Security Warning"
-msgstr ""
-
-#: templates/admin.php:18
-msgid ""
-"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."
-msgstr ""
-
-#: templates/admin.php:29
-msgid "Setup Warning"
-msgstr ""
-
-#: templates/admin.php:32
-msgid ""
-"Your web server is not yet properly setup to allow files synchronization "
-"because the WebDAV interface seems to be broken."
-msgstr ""
-
-#: templates/admin.php:33
-#, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
-
-#: templates/admin.php:44
-msgid "Module 'fileinfo' missing"
-msgstr ""
-
-#: templates/admin.php:47
-msgid ""
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
-"module to get best results with mime-type detection."
-msgstr ""
-
-#: templates/admin.php:58
-msgid "Locale not working"
-msgstr ""
-
-#: templates/admin.php:63
-#, php-format
-msgid ""
-"This ownCloud server can't set system locale to %s. 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 %s."
-msgstr ""
-
-#: templates/admin.php:75
-msgid "Internet connection not working"
-msgstr ""
-
-#: templates/admin.php:78
-msgid ""
-"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."
-msgstr ""
-
-#: templates/admin.php:92
-msgid "Cron"
-msgstr ""
-
-#: templates/admin.php:101
-msgid "Execute one task with each page loaded"
-msgstr ""
-
-#: templates/admin.php:111
-msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr ""
-
-#: templates/admin.php:121
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr ""
-
-#: templates/admin.php:128
-msgid "Sharing"
-msgstr ""
-
-#: templates/admin.php:134
-msgid "Enable Share API"
-msgstr ""
-
-#: templates/admin.php:135
-msgid "Allow apps to use the Share API"
-msgstr ""
-
-#: templates/admin.php:142
-msgid "Allow links"
-msgstr ""
-
-#: templates/admin.php:143
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:150
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:151
-msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:158
-msgid "Allow users to share with anyone"
-msgstr ""
-
-#: templates/admin.php:161
-msgid "Allow users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:168
-msgid "Security"
-msgstr ""
-
-#: templates/admin.php:181
-msgid "Enforce HTTPS"
-msgstr ""
-
-#: templates/admin.php:182
-msgid ""
-"Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
-
-#: templates/admin.php:185
-msgid ""
-"Please connect to this ownCloud instance via HTTPS to enable or disable the "
-"SSL enforcement."
-msgstr ""
-
-#: templates/admin.php:195
-msgid "Log"
-msgstr ""
-
-#: templates/admin.php:196
-msgid "Log level"
-msgstr ""
-
-#: templates/admin.php:227
-msgid "More"
-msgstr ""
-
-#: templates/admin.php:228
-msgid "Less"
-msgstr ""
-
-#: templates/admin.php:235 templates/personal.php:111
-msgid "Version"
-msgstr ""
-
-#: templates/admin.php:237 templates/personal.php:114
-msgid ""
-"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>."
-msgstr ""
-
-#: templates/apps.php:11
-msgid "Add your App"
-msgstr ""
-
-#: templates/apps.php:12
-msgid "More Apps"
-msgstr ""
-
-#: templates/apps.php:28
-msgid "Select an App"
-msgstr ""
-
-#: templates/apps.php:34
-msgid "See application page at apps.owncloud.com"
-msgstr ""
-
-#: templates/apps.php:36
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
-
-#: templates/apps.php:38
-msgid "Update"
-msgstr ""
-
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr ""
-
-#: templates/help.php:6
-msgid "Administrator Documentation"
-msgstr ""
-
-#: templates/help.php:9
-msgid "Online Documentation"
-msgstr ""
-
-#: templates/help.php:11
-msgid "Forum"
-msgstr ""
-
-#: templates/help.php:14
-msgid "Bugtracker"
-msgstr ""
-
-#: templates/help.php:17
-msgid "Commercial Support"
-msgstr ""
-
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
-msgid "Get the apps to sync your files"
-msgstr ""
-
-#: templates/personal.php:26
-msgid "Show First Run Wizard again"
-msgstr ""
-
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
-msgid "Password"
-msgstr ""
-
-#: templates/personal.php:38
-msgid "Your password was changed"
-msgstr ""
-
-#: templates/personal.php:39
-msgid "Unable to change your password"
-msgstr ""
-
-#: templates/personal.php:40
-msgid "Current password"
-msgstr ""
-
-#: templates/personal.php:42
-msgid "New password"
-msgstr ""
-
-#: templates/personal.php:44
-msgid "Change password"
-msgstr ""
-
-#: templates/personal.php:56 templates/users.php:81
-msgid "Display Name"
-msgstr ""
-
-#: templates/personal.php:71
-msgid "Email"
-msgstr "Email"
-
-#: templates/personal.php:73
-msgid "Your email address"
-msgstr ""
-
-#: templates/personal.php:74
-msgid "Fill in an email address to enable password recovery"
-msgstr ""
-
-#: templates/personal.php:83 templates/personal.php:84
-msgid "Language"
-msgstr ""
-
-#: templates/personal.php:95
-msgid "Help translate"
-msgstr ""
-
-#: templates/personal.php:100
-msgid "WebDAV"
-msgstr ""
-
-#: templates/personal.php:102
-msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
-
-#: templates/users.php:21 templates/users.php:80
-msgid "Login Name"
-msgstr ""
-
-#: templates/users.php:30
-msgid "Create"
-msgstr ""
-
-#: templates/users.php:34
-msgid "Admin Recovery Password"
-msgstr ""
-
-#: templates/users.php:38
-msgid "Default Storage"
-msgstr ""
-
-#: templates/users.php:44 templates/users.php:138
-msgid "Unlimited"
-msgstr ""
-
-#: templates/users.php:62 templates/users.php:153
-msgid "Other"
-msgstr "Другое"
-
-#: templates/users.php:87
-msgid "Storage"
-msgstr ""
-
-#: templates/users.php:98
-msgid "change display name"
-msgstr ""
-
-#: templates/users.php:102
-msgid "set new password"
-msgstr ""
-
-#: templates/users.php:133
-msgid "Default"
-msgstr ""
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
deleted file mode 100644
index 42a5e0fe723..00000000000
--- a/l10n/ru_RU/user_ldap.po
+++ /dev/null
@@ -1,419 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
-"Content-Transfer-Encoding: 8bit\n"
-"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/clearMappings.php:34
-msgid "Failed to clear the mappings."
-msgstr ""
-
-#: ajax/deleteConfiguration.php:34
-msgid "Failed to delete the server configuration"
-msgstr ""
-
-#: ajax/testConfiguration.php:36
-msgid "The configuration is valid and the connection could be established!"
-msgstr ""
-
-#: ajax/testConfiguration.php:39
-msgid ""
-"The configuration is valid, but the Bind failed. Please check the server "
-"settings and credentials."
-msgstr ""
-
-#: ajax/testConfiguration.php:43
-msgid ""
-"The configuration is invalid. Please look in the ownCloud log for further "
-"details."
-msgstr ""
-
-#: js/settings.js:66
-msgid "Deletion failed"
-msgstr ""
-
-#: js/settings.js:82
-msgid "Take over settings from recent server configuration?"
-msgstr ""
-
-#: js/settings.js:83
-msgid "Keep settings?"
-msgstr ""
-
-#: js/settings.js:97
-msgid "Cannot add server configuration"
-msgstr ""
-
-#: js/settings.js:111
-msgid "mappings cleared"
-msgstr ""
-
-#: js/settings.js:112
-msgid "Success"
-msgstr "Успех"
-
-#: js/settings.js:117
-msgid "Error"
-msgstr "Ошибка"
-
-#: js/settings.js:141
-msgid "Connection test succeeded"
-msgstr ""
-
-#: js/settings.js:146
-msgid "Connection test failed"
-msgstr ""
-
-#: js/settings.js:156
-msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
-
-#: js/settings.js:157
-msgid "Confirm Deletion"
-msgstr ""
-
-#: templates/settings.php:9
-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 ""
-
-#: templates/settings.php:12
-msgid ""
-"<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:16
-msgid "Server configuration"
-msgstr ""
-
-#: templates/settings.php:32
-msgid "Add Server Configuration"
-msgstr ""
-
-#: templates/settings.php:37
-msgid "Host"
-msgstr ""
-
-#: templates/settings.php:39
-msgid ""
-"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
-
-#: templates/settings.php:40
-msgid "Base DN"
-msgstr ""
-
-#: templates/settings.php:41
-msgid "One Base DN per line"
-msgstr ""
-
-#: templates/settings.php:42
-msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
-
-#: templates/settings.php:44
-msgid "User DN"
-msgstr ""
-
-#: templates/settings.php:46
-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 ""
-
-#: templates/settings.php:47
-msgid "Password"
-msgstr ""
-
-#: templates/settings.php:50
-msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
-
-#: templates/settings.php:51
-msgid "User Login Filter"
-msgstr ""
-
-#: templates/settings.php:54
-#, php-format
-msgid ""
-"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr ""
-
-#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
-msgid "User List Filter"
-msgstr ""
-
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
-
-#: templates/settings.php:61
-msgid "Group Filter"
-msgstr ""
-
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
-
-#: templates/settings.php:69
-msgid "Connection Settings"
-msgstr ""
-
-#: templates/settings.php:71
-msgid "Configuration Active"
-msgstr ""
-
-#: templates/settings.php:71
-msgid "When unchecked, this configuration will be skipped."
-msgstr ""
-
-#: templates/settings.php:72
-msgid "Port"
-msgstr ""
-
-#: templates/settings.php:73
-msgid "Backup (Replica) Host"
-msgstr ""
-
-#: templates/settings.php:73
-msgid ""
-"Give an optional backup host. It must be a replica of the main LDAP/AD "
-"server."
-msgstr ""
-
-#: templates/settings.php:74
-msgid "Backup (Replica) Port"
-msgstr ""
-
-#: templates/settings.php:75
-msgid "Disable Main Server"
-msgstr ""
-
-#: templates/settings.php:75
-msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
-
-#: templates/settings.php:76
-msgid "Use TLS"
-msgstr ""
-
-#: templates/settings.php:76
-msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
-
-#: templates/settings.php:77
-msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Turn off SSL certificate validation."
-msgstr ""
-
-#: templates/settings.php:78
-msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr ""
-
-#: templates/settings.php:79
-msgid "Cache Time-To-Live"
-msgstr ""
-
-#: templates/settings.php:79
-msgid "in seconds. A change empties the cache."
-msgstr ""
-
-#: templates/settings.php:81
-msgid "Directory Settings"
-msgstr ""
-
-#: templates/settings.php:83
-msgid "User Display Name Field"
-msgstr ""
-
-#: templates/settings.php:83
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
-
-#: templates/settings.php:84
-msgid "Base User Tree"
-msgstr ""
-
-#: templates/settings.php:84
-msgid "One User Base DN per line"
-msgstr ""
-
-#: templates/settings.php:85
-msgid "User Search Attributes"
-msgstr ""
-
-#: templates/settings.php:85 templates/settings.php:88
-msgid "Optional; one attribute per line"
-msgstr ""
-
-#: templates/settings.php:86
-msgid "Group Display Name Field"
-msgstr ""
-
-#: templates/settings.php:86
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
-
-#: templates/settings.php:87
-msgid "Base Group Tree"
-msgstr ""
-
-#: templates/settings.php:87
-msgid "One Group Base DN per line"
-msgstr ""
-
-#: templates/settings.php:88
-msgid "Group Search Attributes"
-msgstr ""
-
-#: templates/settings.php:89
-msgid "Group-Member association"
-msgstr ""
-
-#: templates/settings.php:91
-msgid "Special Attributes"
-msgstr ""
-
-#: templates/settings.php:93
-msgid "Quota Field"
-msgstr ""
-
-#: templates/settings.php:94
-msgid "Quota Default"
-msgstr ""
-
-#: templates/settings.php:94
-msgid "in bytes"
-msgstr ""
-
-#: templates/settings.php:95
-msgid "Email Field"
-msgstr ""
-
-#: templates/settings.php:96
-msgid "User Home Folder Naming Rule"
-msgstr ""
-
-#: templates/settings.php:96
-msgid ""
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
-"attribute."
-msgstr ""
-
-#: templates/settings.php:101
-msgid "Internal Username"
-msgstr ""
-
-#: templates/settings.php:102
-msgid ""
-"By default the internal username will be created from the UUID attribute. It"
-" makes sure that the username is unique and characters do not need to be "
-"converted. The internal username has the restriction that only these "
-"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
-"with their ASCII correspondence or simply omitted. On collisions a number "
-"will be added/increased. The internal username is used to identify a user "
-"internally. It is also the default name for the user home folder in "
-"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
-"services. With this setting, the default behaviour can be overriden. To "
-"achieve a similar behaviour as before ownCloud 5 enter the user display name"
-" attribute in the following field. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users."
-msgstr ""
-
-#: templates/settings.php:103
-msgid "Internal Username Attribute:"
-msgstr ""
-
-#: templates/settings.php:104
-msgid "Override UUID detection"
-msgstr ""
-
-#: templates/settings.php:105
-msgid ""
-"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
-"used to doubtlessly identify LDAP users and groups. Also, the internal "
-"username will be created based on the UUID, if not specified otherwise "
-"above. You can override the setting and pass an attribute of your choice. "
-"You must make sure that the attribute of your choice can be fetched for both"
-" users and groups and it is unique. Leave it empty for default behaviour. "
-"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
-
-#: templates/settings.php:106
-msgid "UUID Attribute:"
-msgstr ""
-
-#: templates/settings.php:107
-msgid "Username-LDAP User Mapping"
-msgstr ""
-
-#: templates/settings.php:108
-msgid ""
-"ownCloud uses usernames to store and assign (meta) data. In order to "
-"precisely identify and recognize users, each LDAP user will have a internal "
-"username. This requires a mapping from ownCloud username to LDAP user. The "
-"created username is mapped to the UUID of the LDAP user. Additionally the DN"
-" is cached as well to reduce LDAP interaction, but it is not used for "
-"identification. If the DN changes, the changes will be found by ownCloud. "
-"The internal ownCloud name is used all over in ownCloud. Clearing the "
-"Mappings will have leftovers everywhere. Clearing the Mappings is not "
-"configuration sensitive, it affects all LDAP configurations! Do never clear "
-"the mappings in a production environment. Only clear mappings in a testing "
-"or experimental stage."
-msgstr ""
-
-#: templates/settings.php:109
-msgid "Clear Username-LDAP User Mapping"
-msgstr ""
-
-#: templates/settings.php:109
-msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
-
-#: templates/settings.php:111
-msgid "Test Configuration"
-msgstr ""
-
-#: templates/settings.php:111
-msgid "Help"
-msgstr ""
diff --git a/l10n/ru_RU/user_webdavauth.po b/l10n/ru_RU/user_webdavauth.po
deleted file mode 100644
index b2e91524574..00000000000
--- a/l10n/ru_RU/user_webdavauth.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# AnnaSch <cdewqazxsqwe@gmail.com>, 2013
-# AnnaSch <cdewqazxsqwe@gmail.com>, 2012
-# skoptev <skoptev@ukr.net>, 2012
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
-"Content-Transfer-Encoding: 8bit\n"
-"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 ""
-
-#: templates/settings.php:7
-msgid ""
-"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 3e30001f0b6..1f04852c7aa 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,59 @@ msgstr "නොවැම්බර්"
msgid "December"
msgstr "දෙසැම්බර්"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "සිටුවම්"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "තත්පරයන්ට පෙර"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 මිනිත්තුවකට පෙර"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "අද"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "ඊයේ"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "පෙර මාසයේ"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "මාස කීපයකට පෙර"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "පෙර අවුරුද්දේ"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
@@ -197,23 +197,19 @@ msgstr "අවුරුදු කීපයකට පෙර"
msgid "Choose"
msgstr "තෝරන්න"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "එපා"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "ඔව්"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "එපා"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "හරි"
@@ -377,9 +373,10 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud මුරපදය ප්‍රත්‍යාරම්භ කරන්න"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr "නික්මීම"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "පෙර"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "ඊළඟ"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 56596df684b..b0ac13562ad 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත"
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "යොමුව හිස් විය නොහැක"
@@ -107,8 +107,8 @@ msgstr "යොමුව හිස් විය නොහැක"
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "දෝෂයක්"
@@ -120,15 +120,11 @@ msgstr "බෙදා හදා ගන්න"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "මකා දමන්න"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "නැවත නම් කරන්න"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr ""
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr "නිෂ්ප්‍රභ කරන්න"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
-
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 ගොනුවක් උඩගත කෙරේ"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "නම"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "ප්‍රමාණය"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "වෙනස් කළ"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 ෆොල්ඩරයක්"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 ගොනුවක්"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr "බාන්න"
msgid "Unshare"
msgstr "නොබෙදු"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "මකා දමන්න"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "උඩුගත කිරීම විශාල වැඩිය"
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index e44e8bf1218..380ffe03e8c 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index 83f086d0d7c..b281c905bc2 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index fd0c9a26f0a..ef616c5a548 100644
--- a/l10n/si_LK/files_trashbin.po
+++ b/l10n/si_LK/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr "නම"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 ෆොල්ඩරයක්"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 ගොනුවක්"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index 59d4f49d1ff..8bd7dedc627 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "පරිශීලකයන්"
#: app.php:409
-msgid "Apps"
-msgstr "යෙදුම්"
-
-#: app.php:417
msgid "Admin"
msgstr "පරිපාලක"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr "යෙදුම සක්‍රිය කර නොමැත"
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr "තත්පරයන්ට පෙර"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 මිනිත්තුවකට පෙර"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d මිනිත්තුවන්ට පෙර"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr ""
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template/functions.php:85
msgid "today"
msgstr "අද"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "ඊයේ"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d දිනකට පෙර"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "පෙර මාසයේ"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "පෙර අවුරුද්දේ"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "අවුරුදු කීපයකට පෙර"
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 2dd2b455958..d80c3808036 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "සුරැකෙමින් පවතී..."
@@ -141,31 +145,31 @@ msgstr ""
msgid "Groups"
msgstr "කණ්ඩායම්"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "කාණ්ඩ පරිපාලක"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "මකා දමන්න"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr ""
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr ""
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "හුවමාරු කිරීම"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "යොමු සලසන්න"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "යළි යළිත් හුවමාරුවට අවසර දෙමි"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "හුවමාරු කළ හුවමාරුවට අවසර දෙමි"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "ඕනෑම අයෙකු හා හුවමාරුවට අවසර දෙමි"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "තම කණ්ඩායමේ අයෙකු හා පමණක් හුවමාරුවට අවසර දෙමි"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "ලඝුව"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "වැඩි"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "අඩු"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "ගුප්ත කේතනය"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index a1f7b850787..d45dc541340 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "පරිශීලක පිවිසුම් පෙරහන"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "පරිශීලක ලැයිස්තු පෙරහන"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "කණ්ඩායම් පෙරහන"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "කණ්ඩායම් සොයා ලබාගන්නා විට, යොදන පෙරහන නියම කරයි"
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "තොට"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "TLS භාවිතා කරන්න"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "නිර්දේශ කළ නොහැක. පරීක්ෂණ සඳහා පමණක් භාවිත කරන්න"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "උදව්"
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 2c7327788a3..d3d50d2c755 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -137,59 +137,63 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr ""
-#: js/js.js:715
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:716
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:717
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:718
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:719
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:720
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:721
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:722
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:723
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:724
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:725
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:726
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:727
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +201,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -226,7 +226,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:631 js/share.js:643
+#: js/share.js:643 js/share.js:655
msgid "Error"
msgstr ""
@@ -246,7 +246,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:671
+#: js/share.js:131 js/share.js:683
msgid "Error while sharing"
msgstr ""
@@ -346,23 +346,23 @@ msgstr ""
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:618
+#: js/share.js:398 js/share.js:630
msgid "Password protected"
msgstr ""
-#: js/share.js:631
+#: js/share.js:643
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:643
+#: js/share.js:655
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:658
+#: js/share.js:670
msgid "Sending ..."
msgstr ""
-#: js/share.js:669
+#: js/share.js:681
msgid "Email sent"
msgstr ""
@@ -377,8 +377,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -461,7 +462,7 @@ msgstr ""
msgid "Access forbidden"
msgstr ""
-#: templates/404.php:12
+#: templates/404.php:15
msgid "Cloud not found"
msgstr ""
@@ -578,6 +579,10 @@ msgstr ""
msgid "Log out"
msgstr ""
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +620,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index 7972570bed6..df3871ecaa7 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/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-07-22 01:54-0400\n"
-"PO-Revision-Date: 2013-07-22 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,11 +120,7 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
@@ -156,15 +152,14 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
-
-#: js/filelist.js:457
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/filelist.js:460 js/filelist.js:518
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +185,47 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/app.php:73
#, php-format
@@ -285,45 +284,49 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Deleted files"
msgstr ""
-#: templates/index.php:48
+#: templates/index.php:46
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:54
+#: templates/index.php:52
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:61
+#: templates/index.php:59
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:73
msgid "Download"
msgstr ""
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
msgid "Unshare"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:105
msgid "Upload too large"
msgstr ""
-#: templates/index.php:109
+#: templates/index.php:107
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:114
+#: templates/index.php:112
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:117
+#: templates/index.php:115
msgid "Current scanning"
msgstr ""
diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po
index 534e069a0aa..796557674c4 100644
--- a/l10n/sk/files_encryption.po
+++ b/l10n/sk/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po
index 07aa2e17a0b..322a3dbd56e 100644
--- a/l10n/sk/files_trashbin.po
+++ b/l10n/sk/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,19 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index 9d5bd19be2d..00f4b5abfa4 100644
--- a/l10n/sk/lib.po
+++ b/l10n/sk/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: 2013-07-24 01:55-0400\n"
-"PO-Revision-Date: 2013-07-24 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -34,19 +34,15 @@ msgid "Users"
msgstr ""
#: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
msgid "Admin"
msgstr ""
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: defaults.php:33
+#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,54 +202,54 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
-#: template.php:296
+#: template.php:297
msgid "Caused by:"
msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index bb053c28194..44c3a024c0e 100644
--- a/l10n/sk/settings.po
+++ b/l10n/sk/settings.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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index 96f620bab61..0c3d5db2fe9 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/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: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index ee4ed3e4b59..c0bc9aaaa61 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 19:10+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
@@ -138,83 +138,83 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Nastavenia"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "pred sekundami"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "pred minútou"
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "pred {minutes} minútami"
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "Pred 1 hodinou"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "Pred {hours} hodinami."
-
-#: js/js.js:758
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "pred %n minútou"
+msgstr[1] "pred %n minútami"
+msgstr[2] "pred %n minútami"
+
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "pred %n hodinou"
+msgstr[1] "pred %n hodinami"
+msgstr[2] "pred %n hodinami"
+
+#: js/js.js:815
msgid "today"
msgstr "dnes"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "včera"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "pred {days} dňami"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "pred %n dňom"
+msgstr[1] "pred %n dňami"
+msgstr[2] "pred %n dňami"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "minulý mesiac"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "Pred {months} mesiacmi."
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "pred %n mesiacom"
+msgstr[1] "pred %n mesiacmi"
+msgstr[2] "pred %n mesiacmi"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "pred mesiacmi"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "minulý rok"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "pred rokmi"
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
msgid "Choose"
msgstr "Výber"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
msgid "Error loading file picker template"
msgstr "Chyba pri načítaní šablóny výberu súborov"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:168
msgid "Yes"
msgstr "Áno"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:178
msgid "No"
msgstr "Nie"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:195
msgid "Ok"
msgstr "Ok"
@@ -378,9 +378,10 @@ msgstr "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https:/
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Obnovenie hesla pre ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "reset hesla %s"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -497,7 +498,7 @@ msgstr "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Aktualizujte prosím vašu inštanciu PHP pre bezpečné používanie %s."
#: templates/installation.php:32
msgid ""
@@ -522,7 +523,7 @@ msgstr "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo sú
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -579,6 +580,10 @@ msgstr "%s je dostupná. Získajte viac informácií k postupu aktualizáce."
msgid "Log out"
msgstr "Odhlásiť"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Viac aplikácií"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatické prihlásenie bolo zamietnuté!"
@@ -616,14 +621,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Ahoj,<br><br>chcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: <br><a href=\"%s\">zde</a>.<br><br>Vďaka"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "späť"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "ďalej"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 89af6a30dd4..62660788d83 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-20 20:20+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
@@ -95,21 +95,21 @@ msgstr "Nie je k dispozícii dostatok miesta"
msgid "Upload cancelled."
msgstr "Odosielanie zrušené."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:234 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL nemôže byť prázdne."
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:239 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Chyba"
@@ -121,15 +121,11 @@ msgstr "Zdieľať"
msgid "Delete permanently"
msgstr "Zmazať trvalo"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Zmazať"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Premenovať"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Prebieha"
@@ -157,15 +153,14 @@ msgstr "prepísaný {new_name} súborom {old_name}"
msgid "undo"
msgstr "vrátiť"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "vykonať zmazanie"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "Nahrávam %n súbor"
+msgstr[1] "Nahrávam %n súbory"
+msgstr[2] "Nahrávam %n súborov"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 súbor sa posiela "
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "nahrávanie súborov"
@@ -191,43 +186,47 @@ msgstr "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchroniz
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Vaše úložisko je takmer plné ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov."
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len pre Owncloud"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Názov"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Veľkosť"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Upravené"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 priečinok"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n priečinok"
+msgstr[1] "%n priečinky"
+msgstr[2] "%n priečinkov"
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} priečinkov"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 súbor"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} súborov"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n súbor"
+msgstr[1] "%n súbory"
+msgstr[2] "%n súborov"
#: lib/app.php:73
#, php-format
@@ -310,6 +309,10 @@ msgstr "Sťahovanie"
msgid "Unshare"
msgstr "Zrušiť zdieľanie"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Zmazať"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Nahrávanie je príliš veľké"
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index 18ec2cbea2a..40a9ba181d6 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -62,18 +62,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 18458f84c40..1a88ff07b4c 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mhh <marian.hvolka@stuba.sk>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
@@ -19,7 +20,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "Heslo je chybné. Skúste to znova."
#: templates/authenticate.php:7
msgid "Password"
@@ -31,27 +32,27 @@ msgstr "Odoslať"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "To je nepríjemné, ale tento odkaz už nie je funkčný."
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "Možné dôvody:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "položka bola presunutá"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "linke vypršala platnosť"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "zdieľanie je zakázané"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz."
#: templates/public.php:15
#, php-format
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index 95e5b085a19..488bcade2e1 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mhh <marian.hvolka@stuba.sk>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 19:20+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
@@ -51,25 +52,23 @@ msgstr "Názov"
msgid "Deleted"
msgstr "Zmazané"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 priečinok"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n priečinok"
+msgstr[1] "%n priečinky"
+msgstr[2] "%n priečinkov"
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} priečinkov"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 súbor"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} súborov"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n súbor"
+msgstr[1] "%n súbory"
+msgstr[2] "%n súborov"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
-msgstr ""
+msgstr "obnovené"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
index b480a7c3ce5..afbd44c4156 100644
--- a/l10n/sk_SK/files_versions.po
+++ b/l10n/sk_SK/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# mhh <marian.hvolka@stuba.sk>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-07 19:40+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
@@ -28,15 +29,15 @@ msgstr "Verzie"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "Zlyhalo obnovenie súboru {file} na verziu {timestamp}."
#: js/versions.js:79
msgid "More versions..."
-msgstr ""
+msgstr "Viac verzií..."
#: js/versions.js:116
msgid "No other versions available"
-msgstr ""
+msgstr "Žiadne ďalšie verzie nie sú dostupné"
#: js/versions.js:149
msgid "Restore"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index aa82aa3ee29..21bd46ddf1a 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 16:50+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"
@@ -35,17 +35,13 @@ msgid "Users"
msgstr "Používatelia"
#: app.php:409
-msgid "Apps"
-msgstr "Aplikácie"
-
-#: app.php:417
msgid "Admin"
msgstr "Administrátor"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "Zlyhala aktualizácia \"%s\"."
#: defaults.php:35
msgid "web services under your control"
@@ -54,7 +50,7 @@ msgstr "webové služby pod Vašou kontrolou"
#: files.php:66 files.php:98
#, php-format
msgid "cannot open \"%s\""
-msgstr ""
+msgstr "nemožno otvoriť \"%s\""
#: files.php:226
msgid "ZIP download is turned off."
@@ -76,11 +72,7 @@ msgstr "Zvolené súbory sú príliš veľké na vygenerovanie zip súboru."
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
-msgstr ""
-
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "nedá sa zistiť"
+msgstr "Stiahnite súbory po menších častiach, samostatne, alebo sa obráťte na správcu."
#: json.php:28
msgid "Application is not enabled"
@@ -211,56 +203,56 @@ msgid "seconds ago"
msgstr "pred sekundami"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "pred minútou"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] "pred %n minútami"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "pred %d minútami"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] "pred %n hodinami"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "Pred 1 hodinou"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "Pred %d hodinami."
-
-#: template/functions.php:85
msgid "today"
msgstr "dnes"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "včera"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "pred %d dňami"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] "pred %n dňami"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "minulý mesiac"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "Pred %d mesiacmi."
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] "pred %n mesiacmi"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "minulý rok"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "pred rokmi"
#: template.php:297
msgid "Caused by:"
-msgstr ""
+msgstr "Príčina:"
#: vcategories.php:188 vcategories.php:249
#, php-format
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index b72f378e141..d20e60bd691 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-20 19:40+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
@@ -121,7 +121,11 @@ msgstr "chyba pri aktualizácii aplikácie"
msgid "Updated"
msgstr "Aktualizované"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať."
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Ukladám..."
@@ -142,31 +146,31 @@ msgstr "Nemožno odobrať používateľa"
msgid "Groups"
msgstr "Skupiny"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Správca skupiny"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Zmazať"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "pridať skupinu"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Musíte zadať platné používateľské meno"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Chyba pri vytváraní používateľa"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Musíte zadať platné heslo"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Slovensky"
@@ -181,7 +185,7 @@ msgid ""
"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 "Váš priečinok s dátami aj vaše súbory sú pravdepodobne prístupné z internetu. Súbor .htaccess nefunguje. Odporúčame nakonfigurovať webový server tak, aby priečinok s dátami nebol naďalej prístupný, alebo presunúť priečinok s dátami mimo priestor sprístupňovaný webovým serverom."
#: templates/admin.php:29
msgid "Setup Warning"
@@ -196,7 +200,7 @@ msgstr "Váš webový server nie je správne nastavený na synchronizáciu, pret
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Skontrolujte prosím znovu <a href=\"%s\">inštalačnú príručku</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -218,7 +222,7 @@ msgid ""
"System locale can't be set to %s. 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 %s."
-msgstr ""
+msgstr "Systémové nastavenie lokalizácie nemohlo byť nastavené na %s. To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov. Odporúčame nainštalovať do vášho systému balíčky potrebné pre podporu %s."
#: templates/admin.php:75
msgid "Internet connection not working"
@@ -231,112 +235,112 @@ msgid ""
"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."
-msgstr ""
+msgstr "Server nemá funkčné pripojenie k internetu. Niektoré moduly ako napr. externé úložisko, oznámenie o dostupných aktualizáciách alebo inštalácia aplikácií tretích strán nebudú fungovať. Prístup k súborom z iných miest a odosielanie oznamovacích emailov tiež nemusí fungovať. Ak chcete využívať všetky vlastnosti ownCloudu, odporúčame povoliť pripojenie k internetu tomuto serveru."
#: templates/admin.php:92
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Vykonať jednu úlohu s každým načítaní stránky"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "cron.php je registrovaný v službe webcron na zavolanie stránky cron.php raz za minútu cez HTTP."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "Použiť systémovú službu cron na spustenie súboru cron.php raz za minútu."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Zdieľanie"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Povoliť API zdieľania"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Povoliť aplikáciám používať API na zdieľanie"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Povoliť odkazy"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Povoliť používateľom zdieľať položky pre verejnosť cez odkazy"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
-msgstr ""
+msgstr "Povoliť verejné nahrávanie súborov"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "Povoliť používateľom umožniť iným používateľom nahrávať do ich zdieľaného priečinka"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Povoliť zdieľanie ďalej"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Povoliť používateľom ďalej zdieľať zdieľané položky"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Povoliť používateľom zdieľať s kýmkoľvek"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Povoliť používateľom zdieľať len s používateľmi v ich skupinách"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Zabezpečenie"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Vynútiť HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Vynúti pripájanie klientov k %s šifrovaným pripojením."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Záznam"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Úroveň záznamu"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Viac"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Menej"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Verzia"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Použite túto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prístup k súborom cez WebDAV</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Šifrovanie"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr "Prihlasovacie heslo"
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr "Dešifrovať všetky súbory"
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Prihlasovacie meno"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 856ca50856b..0c495d4dbcc 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -91,7 +91,7 @@ msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behavior. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "<b>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenať neočakávané správanie. Požiadajte prosím vášho systémového administrátora pre zakázanie jedného z nich."
#: templates/settings.php:12
msgid ""
@@ -155,198 +155,185 @@ msgstr "Filter prihlásenia používateľov"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "použite zástupný vzor %%uid, napr. \\\"uid=%%uid\\\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filter zoznamov používateľov"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definuje použitý filter, pre získanie používateľov."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "bez zástupných znakov, napr. \"objectClass=person\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Filter skupiny"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definuje použitý filter, pre získanie skupín."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "bez zástupných znakov, napr. \"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Nastavenie pripojenia"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Nastavenia sú aktívne "
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Ak nie je zaškrtnuté, nastavenie bude preskočené."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Záložný server (kópia) hosť"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Zadajte záložný LDAP/AD. Musí to byť kópia hlavného LDAP/AD servera."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Záložný server (kópia) port"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Zakázať hlavný server"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Pripojiť sa len k záložnému serveru."
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Použi TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Nepoužívajte pre pripojenie LDAPS, zlyhá."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server nerozlišuje veľkosť znakov (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Vypnúť overovanie SSL certifikátu."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Nie je doporučované, len pre testovacie účely."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Životnosť objektov v cache"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Nastavenie priečinka"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Pole pre zobrazenia mena používateľa"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "Atribút LDAP použitý na vygenerovanie zobrazovaného mena používateľa. "
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Základný používateľský strom"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Jedna používateľská základná DN na riadok"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Atribúty vyhľadávania používateľov"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Voliteľné, jeden atribút na jeden riadok"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Pole pre zobrazenie mena skupiny"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "Atribút LDAP použitý na vygenerovanie zobrazovaného mena skupiny."
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Základný skupinový strom"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Jedna skupinová základná DN na riadok"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Atribúty vyhľadávania skupín"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Priradenie člena skupiny"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Špeciálne atribúty"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Pole kvóty"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Predvolená kvóta"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "v bajtoch"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Pole email"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Pravidlo pre nastavenie mena používateľského priečinka dát"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Interné používateľské meno"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -360,17 +347,17 @@ msgid ""
"behavior as before ownCloud 5 enter the user display name attribute in the "
"following field. Leave it empty for default behavior. Changes will have "
"effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách používateľských mien bude číslo pridané / odobrané. Interné používateľské meno sa používa na internú identifikáciu používateľa. Je tiež predvoleným názvom používateľského domovského priečinka v ownCloud. Je tiež súčasťou URL pre vzdialený prístup, napríklad pre všetky služby * DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred verziou ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo namapovaných (pridaných) LDAP používateľov."
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Atribút interného používateľského mena:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Prepísať UUID detekciu"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -379,17 +366,17 @@ msgid ""
"You must make sure that the attribute of your choice can be fetched for both"
" users and groups and it is unique. Leave it empty for default behavior. "
"Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID atribút je použitý na jedinečnú identifikáciu používateľov a skupín z LDAP. Naviac je na základe UUID vytvorené tiež interné použivateľské meno, ak nie je nastavené inak. Môžete predvolené nastavenie prepísať a použiť atribút ktorý si sami zvolíte. Musíte sa ale ubezpečiť, že atribút ktorý vyberiete bude uvedený pri použivateľoch, aj pri skupinách a je jedinečný. Ponechajte prázdne pre predvolené správanie. Zmena bude mať vplyv len na novo namapovaných (pridaných) používateľov a skupiny z LDAP."
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "UUID atribút:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Mapovanie názvov LDAP používateľských mien"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -401,20 +388,20 @@ msgid ""
" is not configuration sensitive, it affects all LDAP configurations! Never "
"clear the mappings in a production environment, only in a testing or "
"experimental stage."
-msgstr ""
+msgstr "Použivateľské mená sa používajú pre uchovávanie a priraďovanie (meta)dát. Pre správnu identifikáciu a rozpoznanie používateľov bude mať každý používateľ z LDAP interné používateľské meno. To je nevyhnutné pre namapovanie používateľských mien na používateľov v LDAP. Vytvorené používateľské meno je namapované na UUID používateľa v LDAP. Naviac je cachovaná DN pre obmedzenie interakcie s LDAP, ale nie je používaná pre identifikáciu. Ak sa DN zmení, bude to správne rozpoznané. Interné používateľské meno sa používa všade. Vyčistenie namapování vymaže zvyšky všade. Vyčistenie naviac nie je špecifické, bude mať vplyv na všetky LDAP konfigurácie! Nikdy nečistite namapovanie v produkčnom prostredí, len v testovacej alebo experimentálnej fáze."
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Zrušiť mapovanie LDAP používateľských mien"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Zrušiť mapovanie názvov LDAP skupín"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Test nastavenia"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Pomoc"
diff --git a/l10n/sk_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index 4ffa7e8e358..b3e32008582 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-07 19:50+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
@@ -25,11 +25,11 @@ msgstr "WebDAV overenie"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "Adresa: "
#: templates/settings.php:7
msgid ""
"The user credentials will be sent to this address. 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 ""
+msgstr "Používateľské prihlasovacie údaje budú odoslané na túto adresu. Tento plugin skontroluje odpoveď servera a interpretuje návratový kód HTTP 401 a 403 ako neplatné prihlasovacie údaje a akýkoľvek iný ako platné prihlasovacie údaje."
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 482ea1caf7e..52899493b69 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: barbarak <barbarak@arnes.si>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -139,59 +139,67 @@ msgstr "november"
msgid "December"
msgstr "december"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Nastavitve"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "pred nekaj sekundami"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "pred minuto"
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "pred {minutes} minutami"
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "Pred 1 uro"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "pred {hours} urami"
-
-#: js/js.js:758
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/js.js:815
msgid "today"
msgstr "danes"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "včeraj"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "pred {days} dnevi"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "zadnji mesec"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "pred {months} meseci"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "mesecev nazaj"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "lansko leto"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "let nazaj"
@@ -199,23 +207,19 @@ msgstr "let nazaj"
msgid "Choose"
msgstr "Izbor"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Prekliči"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Napaka pri nalaganju predloge za izbor dokumenta"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "V redu"
@@ -379,9 +383,10 @@ msgstr "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu <a href=\
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Ponastavitev gesla za oblak ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -580,6 +585,10 @@ msgstr "%s je na voljo. Pridobite več podrobnosti za posodobitev."
msgid "Log out"
msgstr "Odjava"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Samodejno prijavljanje je zavrnjeno!"
@@ -617,14 +626,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Pozdravljen/a,<br><br>sporočam, da je %s delil »%s« s teboj.<br><a href=\"%s\">Poglej vsebine!</a><br><br>Lep pozdrav!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "nazaj"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "naprej"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index d543c3ad123..693f82abed7 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -95,12 +95,12 @@ msgstr "Na voljo ni dovolj prostora."
msgid "Upload cancelled."
msgstr "Pošiljanje je preklicano."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "Naslov URL ne sme biti prazna vrednost."
@@ -108,8 +108,8 @@ msgstr "Naslov URL ne sme biti prazna vrednost."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ime mape je neveljavno. Uporaba oznake \"Souporaba\" je rezervirana za ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Napaka"
@@ -121,15 +121,11 @@ msgstr "Souporaba"
msgid "Delete permanently"
msgstr "Izbriši dokončno"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Izbriši"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Preimenuj"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "V čakanju ..."
@@ -157,15 +153,15 @@ msgstr "preimenovano ime {new_name} z imenom {old_name}"
msgid "undo"
msgstr "razveljavi"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "izvedi opravilo brisanja"
-
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "Pošiljanje 1 datoteke"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "poteka pošiljanje datotek"
@@ -191,43 +187,49 @@ msgstr "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in us
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud."
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Ime"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Velikost"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Spremenjeno"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 mapa"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} map"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 datoteka"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} datotek"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: lib/app.php:73
#, php-format
@@ -310,6 +312,10 @@ msgstr "Prejmi"
msgid "Unshare"
msgstr "Prekliči souporabo"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Izbriši"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Prekoračenje omejitve velikosti"
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index ebfcc9ce530..dce60f89a05 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
+"Last-Translator: barbarak <barbarak@arnes.si>\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"
@@ -62,20 +62,20 @@ msgid ""
"files."
msgstr "Vaš zasebni ključ ni veljaven. Morda je bilo vaše geslo spremenjeno zunaj sistema ownCloud (npr. v skupnem imeniku). Svoj zasebni ključ, ki vam bo omogočil dostop do šifriranih dokumentov, lahko posodobite v osebnih nastavitvah."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Manjkajoče zahteve"
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Preverite, da imate na strežniku nameščen PHP 5.3.3 ali novejši in da je omogočen in pravilno nastavljen PHP OpenSSL . Zaenkrat je šifriranje onemogočeno."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr "Preverite, da imate na strežniku nameščen paket PHP 5.3.3 ali novejši in da je omogočen in pravilno nastavljen PHP OpenSSL . Zaenkrat je šifriranje onemogočeno."
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Naslednji uporabniki še nimajo nastavljenega šifriranja:"
#: js/settings-admin.js:11
msgid "Saving..."
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 47e1076f579..4ee20dcd09f 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 69047236339..866885ca0cb 100644
--- a/l10n/sl/files_trashbin.po
+++ b/l10n/sl/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,21 @@ msgstr "Ime"
msgid "Deleted"
msgstr "Izbrisano"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 mapa"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} map"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 datoteka"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} datotek"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index ce4d7021090..a1879f4bce7 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "Uporabniki"
#: app.php:409
-msgid "Apps"
-msgstr "Programi"
-
-#: app.php:417
msgid "Admin"
msgstr "Skrbništvo"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "ni mogoče določiti"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Program ni omogočen"
@@ -211,50 +203,54 @@ msgid "seconds ago"
msgstr "pred nekaj sekundami"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "pred minuto"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "pred %d minutami"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "Pred 1 uro"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "Pred %d urami"
-
-#: template/functions.php:85
msgid "today"
msgstr "danes"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "včeraj"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "pred %d dnevi"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "zadnji mesec"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "Pred %d meseci"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "lansko leto"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "let nazaj"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 71dd13c7f03..9b0ecf0db04 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -122,7 +122,11 @@ msgstr "Prišlo je do napake med posodabljanjem programa."
msgid "Updated"
msgstr "Posodobljeno"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Poteka shranjevanje ..."
@@ -143,31 +147,31 @@ msgstr "Uporabnika ni mogoče odstraniti"
msgid "Groups"
msgstr "Skupine"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Skrbnik skupine"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Izbriši"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "dodaj skupino"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Navedeno mora biti veljavno uporabniško ime"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Napaka ustvarjanja uporabnika"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Navedeno mora biti veljavno geslo"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Slovenščina"
@@ -238,106 +242,106 @@ msgstr ""
msgid "Cron"
msgstr "Periodično opravilo"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Izvedi eno nalogo z vsako naloženo stranjo."
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Souporaba"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Omogoči API souporabe"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Dovoli programom uporabo vmesnika API souporabe"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Dovoli povezave"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Uporabnikom dovoli souporabo predmetov z javnimi povezavami"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Dovoli nadaljnjo souporabo"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Uporabnikom dovoli nadaljnjo souporabo predmetov"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Uporabnikom dovoli souporabo s komerkoli"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Varnost"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Zahtevaj uporabo HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Dnevnik"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Raven beleženja"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Več"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Manj"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Različica"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -467,6 +471,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Šifriranje"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Prijavno ime"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index d0c3f5765d9..cc6fa550f76 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -155,198 +155,185 @@ msgstr "Filter prijav uporabnikov"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime v postopku prijave."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "Uporabite vsebnik %%uid, npr. \"uid=%%uid\"."
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filter seznama uporabnikov"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Določi filter za uporabo med pridobivanjem uporabnikov."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Brez kateregakoli vsebnika, npr. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Filter skupin"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Določi filter za uporabo med pridobivanjem skupin."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Nastavitve povezave"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Dejavna nastavitev"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Neizbrana možnost preskoči nastavitev."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Vrata"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Varnostna kopija (replika) podatkov gostitelja"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natančna replika strežnika LDAP/AD."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Varnostna kopija (replika) podatka vrat"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Onemogoči glavni strežnik"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Uporabi TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Strežnika ni priporočljivo uporabljati za povezave LDAPS. Povezava bo spodletela."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Strežnik LDAP ne upošteva velikosti črk (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Onemogoči določanje veljavnosti potrdila SSL."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Predpomni podatke TTL"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "v sekundah. Sprememba izprazni predpomnilnik."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Nastavitve mape"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Polje za uporabnikovo prikazano ime"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Osnovno uporabniško drevo"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Eno osnovno uporabniško ime DN na vrstico"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Uporabi atribute iskanja"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Izbirno; en atribut na vrstico"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Polje za prikazano ime skupine"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Osnovno drevo skupine"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Eno osnovno ime skupine DN na vrstico"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Atributi iskanja skupine"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Povezava član-skupina"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Posebni atributi"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Polje količinske omejitve"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Privzeta količinska omejitev"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "v bajtih"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Polje elektronske pošte"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Pravila poimenovanja uporabniške osebne mape"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Interno uporabniško ime"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Atribut Interno uporabniško ime"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Prezri zaznavo UUID"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "Atribut UUID"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Preslikava uporabniško ime - LDAP-uporabnik"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Izbriši preslikavo Uporabniškega imena in LDAP-uporabnika"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Izbriši preslikavo Skupine in LDAP-skupine"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Preizkusne nastavitve"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Pomoč"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index f8552e44936..178c2c97e10 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Odeen <rapid_odeen@zoho.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -139,59 +139,59 @@ msgstr "Nëntor"
msgid "December"
msgstr "Dhjetor"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Parametra"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "sekonda më parë"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 minutë më parë"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minuta më parë"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 orë më parë"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} orë më parë"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "sot"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "dje"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} ditë më parë"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "muajin e shkuar"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} muaj më parë"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "muaj më parë"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "vitin e shkuar"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "vite më parë"
@@ -199,23 +199,19 @@ msgstr "vite më parë"
msgid "Choose"
msgstr "Zgjidh"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Anulo"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Veprim i gabuar gjatë ngarkimit të modelit të zgjedhësit të skedarëve"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Po"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Jo"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Në rregull"
@@ -379,9 +375,10 @@ msgstr "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"htt
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Rivendosja e kodit të ownCloud-it"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -580,6 +577,10 @@ msgstr ""
msgid "Log out"
msgstr "Dalje"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Hyrja automatike u refuzua!"
@@ -617,14 +618,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "mbrapa"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "para"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 488945798b5..ace7c037e64 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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr "Nuk ka hapësirë memorizimi e mjaftueshme"
msgid "Upload cancelled."
msgstr "Ngarkimi u anulua."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL-i nuk mund të jetë bosh."
@@ -107,8 +107,8 @@ msgstr "URL-i nuk mund të jetë bosh."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Veprim i gabuar"
@@ -120,15 +120,11 @@ msgstr "Nda"
msgid "Delete permanently"
msgstr "Elimino përfundimisht"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Elimino"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Riemërto"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Pezulluar"
@@ -156,15 +152,13 @@ msgstr "U zëvëndësua {new_name} me {old_name}"
msgid "undo"
msgstr "anulo"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "ekzekuto operacionin e eliminimit"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "Po ngarkohet 1 skedar"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "po ngarkoj skedarët"
@@ -190,43 +184,45 @@ msgstr "Hapësira juaj e memorizimit është plot, nuk mund të ngarkoni apo sin
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i."
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Emri"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Dimensioni"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Modifikuar"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 dosje"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} dosje"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 skedar"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} skedarë"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr "Shkarko"
msgid "Unshare"
msgstr "Hiq ndarjen"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Elimino"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Ngarkimi është shumë i madh"
diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po
index 3aeb9523477..ccb7cbaa926 100644
--- a/l10n/sq/files_encryption.po
+++ b/l10n/sq/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+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"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index 64007bf9f08..4e5d0ed5b8d 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index 2d0add80fb3..cd243657ba0 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr "Emri"
msgid "Deleted"
msgstr "Eliminuar"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 dosje"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} dosje"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 skedar"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} skedarë"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 2a56dcbd7fb..e5602b240e1 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Përdoruesit"
#: app.php:409
-msgid "Apps"
-msgstr "App"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "nuk u vendos dot"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Programi nuk është i aktivizuar."
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr "sekonda më parë"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 minutë më parë"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minuta më parë"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 orë më parë"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d orë më parë"
-
-#: template/functions.php:85
msgid "today"
msgstr "sot"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "dje"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d ditë më parë"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "muajin e shkuar"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d muaj më parë"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "vitin e shkuar"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "vite më parë"
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 975c838ad78..22bfb9d5de0 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 2ed99287af3..f8f129da269 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Ndihmë"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index d387b83ccf4..66d80402804 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,63 @@ msgstr "Новембар"
msgid "December"
msgstr "Децембар"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Поставке"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "пре неколико секунди"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "пре 1 минут"
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "пре {minutes} минута"
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "Пре једног сата"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "Пре {hours} сата (сати)"
-
-#: js/js.js:758
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:815
msgid "today"
msgstr "данас"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "јуче"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "пре {days} дана"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "прошлог месеца"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "Пре {months} месеца (месеци)"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "месеци раније"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "прошле године"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "година раније"
@@ -197,23 +201,19 @@ msgstr "година раније"
msgid "Choose"
msgstr "Одабери"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Откажи"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "У реду"
@@ -377,9 +377,10 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Поништавање лозинке за ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +579,10 @@ msgstr ""
msgid "Log out"
msgstr "Одјава"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Аутоматска пријава је одбијена!"
@@ -615,14 +620,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "претходно"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "следеће"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index d85ad49986d..55f54da7a6f 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr "Нема довољно простора"
msgid "Upload cancelled."
msgstr "Отпремање је прекинуто."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "Адреса не може бити празна."
@@ -107,8 +107,8 @@ msgstr "Адреса не може бити празна."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Грешка"
@@ -120,15 +120,11 @@ msgstr "Дели"
msgid "Delete permanently"
msgstr "Обриши за стално"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Обриши"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Преименуј"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "На чекању"
@@ -156,15 +152,14 @@ msgstr "замењено {new_name} са {old_name}"
msgid "undo"
msgstr "опозови"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "обриши"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "Отпремам 1 датотеку"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "датотеке се отпремају"
@@ -190,43 +185,47 @@ msgstr "Ваше складиште је пуно. Датотеке више н
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ваше складиште је скоро па пуно ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Неисправно име фасцикле. Фасцикла „Shared“ је резервисана за ownCloud."
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Име"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Величина"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Измењено"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 фасцикла"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} фасцикле/и"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 датотека"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} датотеке/а"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +308,10 @@ msgstr "Преузми"
msgid "Unshare"
msgstr "Укини дељење"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Обриши"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Датотека је превелика"
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index 04ed7d5cf20..04b3da34ccd 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 5fe336ebf12..0b670840b60 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index fff0dd24278..9fed460b7d4 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,19 @@ msgstr "Име"
msgid "Deleted"
msgstr "Обрисано"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 фасцикла"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} фасцикле/и"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 датотека"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} датотеке/а"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 3f9b8db253a..0ae0fe074fc 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Корисници"
#: app.php:409
-msgid "Apps"
-msgstr "Апликације"
-
-#: app.php:417
msgid "Admin"
msgstr "Администратор"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "није одређено"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Апликација није омогућена"
@@ -210,50 +202,50 @@ msgid "seconds ago"
msgstr "пре неколико секунди"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "пре 1 минут"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "пре %d минута"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "Пре једног сата"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "пре %d сата/и"
-
-#: template/functions.php:85
msgid "today"
msgstr "данас"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "јуче"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "пре %d дана"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "прошлог месеца"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "пре %d месеца/и"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "прошле године"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "година раније"
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index d4b836e8a1a..f6e0850c9f0 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -120,7 +120,11 @@ msgstr "Грешка при ажурирању апликације"
msgid "Updated"
msgstr "Ажурирано"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Чување у току..."
@@ -141,31 +145,31 @@ msgstr "Не могу да уклоним корисника"
msgid "Groups"
msgstr "Групе"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Управник групе"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Обриши"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "додај групу"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Морате унети исправно корисничко име"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Грешка при прављењу корисника"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Морате унети исправну лозинку"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Изврши један задатак са сваком учитаном страницом"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Дељење"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Омогући API Share"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Дозвољава апликацијама да користе API Share"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Дозволи везе"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Дозволи корисницима да деле ставке с другима путем веза"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Дозволи поновно дељење"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Дозволи корисницима да поновно деле ставке с другима"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Дозволи корисницима да деле са било ким"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Дозволи корисницима да деле само са корисницима у њиховим групама"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Безбедност"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Наметни HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Бележење"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Ниво бележења"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Више"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Мање"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Верзија"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Шифровање"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Корисничко име"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 31f3cbf8af4..a563a3a7ca5 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "Филтер за пријаву корисника"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Одређује филтер за примењивање при покушају пријаве. %%uid замењује корисничко име."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "користите чувар места %%uid, нпр. „uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Филтер за списак корисника"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Одређује филтер за примењивање при прибављању корисника."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "без икаквог чувара места, нпр. „objectClass=person“."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Филтер групе"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Одређује филтер за примењивање при прибављању група."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "без икаквог чувара места, нпр. „objectClass=posixGroup“."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Користи TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP сервер осетљив на велика и мала слова (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Искључите потврду SSL сертификата."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Не препоручује се; користите само за тестирање."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "у секундама. Промена испражњава кеш меморију."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Име приказа корисника"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Основно стабло корисника"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Име приказа групе"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Основна стабло група"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Придруживање чланова у групу"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "у бајтовима"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Помоћ"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 49ce87eb10f..8a0873def51 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,63 @@ msgstr "Novembar"
msgid "December"
msgstr "Decembar"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Podešavanja"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +201,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Otkaži"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -377,8 +377,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -578,6 +579,10 @@ msgstr ""
msgid "Log out"
msgstr "Odjava"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +620,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "prethodno"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "sledeće"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index e30f663a084..a24a15a621e 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,15 +120,11 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Obriši"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr ""
@@ -156,15 +152,14 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +185,47 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Ime"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Veličina"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Zadnja izmena"
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +308,10 @@ msgstr "Preuzmi"
msgid "Unshare"
msgstr ""
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Obriši"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Pošiljka je prevelika"
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index 9fb01330ab9..2f15da5caae 100644
--- a/l10n/sr@latin/files_encryption.po
+++ b/l10n/sr@latin/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+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"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 0b6b7c80421..370cbd5e775 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index fc0635646c5..f1524d3b935 100644
--- a/l10n/sr@latin/files_trashbin.po
+++ b/l10n/sr@latin/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,19 @@ msgstr "Ime"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index 2218d64277c..561b4de4318 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Korisnici"
#: app.php:409
-msgid "Apps"
-msgstr "Programi"
-
-#: app.php:417
msgid "Admin"
msgstr "Adninistracija"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,50 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 95200220f7d..4253999069f 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index cab46e6a8dd..883e7aae577 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Pomoć"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 2d33f19186f..84c312d3d20 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -141,59 +141,59 @@ msgstr "November"
msgid "December"
msgstr "December"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Inställningar"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "sekunder sedan"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 minut sedan"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n minut sedan"
+msgstr[1] "%n minuter sedan"
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} minuter sedan"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n timme sedan"
+msgstr[1] "%n timmar sedan"
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 timme sedan"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} timmar sedan"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "i dag"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "i går"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} dagar sedan"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "%n dag sedan"
+msgstr[1] "%n dagar sedan"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "förra månaden"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} månader sedan"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n månad sedan"
+msgstr[1] "%n månader sedan"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "månader sedan"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "förra året"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "år sedan"
@@ -201,23 +201,19 @@ msgstr "år sedan"
msgid "Choose"
msgstr "Välj"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Fel vid inläsning av filväljarens mall"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Nej"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ok"
@@ -381,9 +377,10 @@ msgstr "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"http
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud lösenordsåterställning"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "%s återställ lösenord"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -582,6 +579,10 @@ msgstr "%s är tillgänglig. Få mer information om hur du går tillväga för a
msgid "Log out"
msgstr "Logga ut"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Fler appar"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Automatisk inloggning inte tillåten!"
@@ -619,14 +620,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Hej där,<br><br>ville bara informera dig om att %s delade »%s« med dig.<br><a href=\"%s\">Titta på den!</a><br><br>Hörs!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "föregående"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "nästa"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index b3140d3acc0..dbc15ef9f33 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 20:40+0000\n"
+"Last-Translator: medialabs\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"
@@ -98,21 +98,21 @@ msgstr "Inte tillräckligt med utrymme tillgängligt"
msgid "Upload cancelled."
msgstr "Uppladdning avbruten."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:234 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL kan inte vara tom."
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:239 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Fel"
@@ -124,15 +124,11 @@ msgstr "Dela"
msgid "Delete permanently"
msgstr "Radera permanent"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Radera"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Byt namn"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Väntar"
@@ -160,15 +156,13 @@ msgstr "ersatt {new_name} med {old_name}"
msgid "undo"
msgstr "ångra"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "utför raderingen"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "Laddar upp %n fil"
+msgstr[1] "Laddar upp %n filer"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 filuppladdning"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "filer laddas upp"
@@ -194,43 +188,45 @@ msgstr "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer."
+
+#: js/files.js:245
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:344
+#: js/files.js:358
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:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Namn"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Storlek"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Ändrad"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 mapp"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n mapp"
+msgstr[1] "%n mappar"
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} mappar"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
#: lib/app.php:73
#, php-format
@@ -313,6 +309,10 @@ msgstr "Ladda ner"
msgid "Unshare"
msgstr "Sluta dela"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Radera"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "För stor uppladdning"
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index bf274e5e5aa..c5524af8443 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.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-08-03 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 10:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -65,18 +65,18 @@ msgid ""
"files."
msgstr "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför ownCloud (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer."
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr "Krav som saknas"
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och rätt inställd. Kryperingsappen är därför tillsvidare inaktiverad."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad."
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr "Följande användare har inte aktiverat kryptering:"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 95e8da89b11..05283db1ee5 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index 2bf5591f7ab..eafab03a7d9 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/files_trashbin.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# medialabs, 2013
# Magnus Höglund <magnus@linux.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-03 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 10:30+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-18 08:40+0000\n"
+"Last-Translator: medialabs\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"
@@ -52,21 +53,17 @@ msgstr "Namn"
msgid "Deleted"
msgstr "Raderad"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 mapp"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} mappar"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 fil"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} filer"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n mapp"
+msgstr[1] "%n mappar"
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index e889ebc259e..ac5e105a4e4 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -36,14 +36,10 @@ msgid "Users"
msgstr "Användare"
#: app.php:409
-msgid "Apps"
-msgstr "Program"
-
-#: app.php:417
msgid "Admin"
msgstr "Admin"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Misslyckades med att uppgradera \"%s\"."
@@ -79,10 +75,6 @@ msgid ""
"administrator."
msgstr "Ladda ner filerna i mindre bitar, separat eller fråga din administratör."
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "kunde inte bestämmas"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Applikationen är inte aktiverad"
@@ -212,50 +204,46 @@ msgid "seconds ago"
msgstr "sekunder sedan"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 minut sedan"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n minut sedan"
+msgstr[1] "%n minuter sedan"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d minuter sedan"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n timme sedan"
+msgstr[1] "%n timmar sedan"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 timme sedan"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d timmar sedan"
-
-#: template/functions.php:85
msgid "today"
msgstr "i dag"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "i går"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d dagar sedan"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] "%n dag sedan"
+msgstr[1] "%n dagar sedan"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "förra månaden"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d månader sedan"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n månad sedan"
+msgstr[1] "%n månader sedan"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "förra året"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "år sedan"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 916754ad16b..b27f9bed237 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 20:40+0000\n"
+"Last-Translator: medialabs\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"
@@ -126,7 +126,11 @@ msgstr "Fel uppstod vid uppdatering av appen"
msgid "Updated"
msgstr "Uppdaterad"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr "Dekrypterar filer... Vänligen vänta, detta kan ta en stund."
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Sparar..."
@@ -147,31 +151,31 @@ msgstr "Kan inte ta bort användare"
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Gruppadministratör"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Radera"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "lägg till grupp"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Ett giltigt användarnamn måste anges"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Fel vid skapande av användare"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Ett giltigt lösenord måste anges"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -242,106 +246,106 @@ msgstr "Servern har ingen fungerande internetanslutning. Detta innebär att en d
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Exekvera en uppgift vid varje sidladdning"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php är registrerad som en webcron-tjänst för att anropa cron.php varje minut över http."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "Använd system-tjänsten cron för att anropa cron.php varje minut."
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Dela"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Aktivera delat API"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Tillåt applikationer att använda delat API"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Tillåt länkar"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Tillåt delning till allmänheten via publika länkar"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "Tillåt offentlig uppladdning"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "Tillåt användare att aktivera\nTillåt användare att göra det möjligt för andra att ladda upp till sina offentligt delade mappar"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Tillåt vidaredelning"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Tillåt användare att dela vidare filer som delats med dem"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Tillåt delning med alla"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Tillåt bara delning med användare i egna grupper"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Säkerhet"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Kräv HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Tvingar klienterna att ansluta till %s via en krypterad anslutning."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Anslut till din %s via HTTPS för att aktivera/deaktivera SSL"
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Logg"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Nivå på loggning"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Mer"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Mindre"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Version"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -471,6 +475,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "Använd denna adress för att <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">komma åt dina filer via WebDAV</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr "Appen för kryptering är inte längre aktiverad, dekryptera alla dina filer"
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr "Inloggningslösenord"
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr "Dekryptera alla filer"
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Inloggningsnamn"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 28b7941b8e7..f29bad549d3 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -157,198 +157,185 @@ msgstr "Filter logga in användare"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "använd platshållare %%uid, t ex \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filter lista användare"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Definierar filter att tillämpa vid listning av användare."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "utan platshållare, t.ex. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Gruppfilter"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definierar filter att tillämpa vid listning av grupper."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "utan platshållare, t.ex. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Uppkopplingsinställningar"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Konfiguration aktiv"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Ifall denna är avbockad så kommer konfigurationen att skippas."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Säkerhetskopierings-värd (Replika)"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Ange en valfri värd för säkerhetskopiering. Den måste vara en replika av den huvudsakliga LDAP/AD-servern"
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Säkerhetskopierins-port (Replika)"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Inaktivera huvudserver"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr "Anslut endast till replikaservern."
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Använd TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Använd inte för LDAPS-anslutningar, det kommer inte att fungera."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-servern är okänslig för gemener och versaler (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Stäng av verifiering av SSL-certifikat."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr "Om anslutningen bara fungerar med detta alternativ, importera LDAP-serverns SSL-certifikat i din% s server."
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Rekommenderas inte, använd bara för test. "
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Cache Time-To-Live"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "i sekunder. En förändring tömmer cache."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Mappinställningar"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Attribut för användarnamn"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr "LDAP-attributet som ska användas för att generera användarens visningsnamn."
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Bas för användare i katalogtjänst"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "En Användare start DN per rad"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Användarsökningsattribut"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Valfritt; ett attribut per rad"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Attribut för gruppnamn"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr "LDAP-attributet som ska användas för att generera gruppens visningsnamn."
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Bas för grupper i katalogtjänst"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "En Grupp start DN per rad"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Gruppsökningsattribut"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Attribut för gruppmedlemmar"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Specialattribut"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Kvotfält"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Datakvot standard"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "E-postfält"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Namnregel för hemkatalog"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "Internt Användarnamn"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -364,15 +351,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr "Som standard skapas det interna användarnamnet från UUID-attributet. Det säkerställer att användarnamnet är unikt och tecken inte behöver konverteras. Det interna användarnamnet har restriktionerna att endast följande tecken är tillåtna: [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelämnas helt. En siffra kommer att läggas till eller ökas på vid en kollision. Det interna användarnamnet används för att identifiera användaren internt. Det är även förvalt som användarens användarnamn i ownCloud. Det är även en port för fjärråtkomst, t.ex. för alla *DAV-tjänster. Med denna inställning kan det förvalda beteendet åsidosättas. För att uppnå ett liknande beteende som innan ownCloud 5, ange attributet för användarens visningsnamn i detta fält. Lämna det tomt för förvalt beteende. Ändringarna kommer endast att påverka nyligen mappade (tillagda) LDAP-användare"
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "Internt Användarnamn Attribut:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "Åsidosätt UUID detektion"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -383,15 +370,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat på detta UUID, om inte annat anges ovan. Du kan åsidosätta inställningen och passera ett attribut som du själv väljer. Du måste se till att attributet som du väljer kan hämtas för både användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att påverka nyligen mappade (tillagda) LDAP-användare och grupper."
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "UUID Attribut:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "Användarnamn-LDAP User Mapping"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -405,18 +392,18 @@ msgid ""
"experimental stage."
msgstr "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning från ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den påverkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast på i testmiljö!"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "Rensa Användarnamn-LDAP User Mapping"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "Rensa Gruppnamn-LDAP Group Mapping"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Testa konfigurationen"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Hjälp"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 78b1d8f4987..e974dc0ec23 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr ""
-#: js/js.js:715
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:716
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:717
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:718
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:719
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:720
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:721
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:722
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:723
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:724
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:725
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:726
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:727
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +197,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr ""
@@ -226,7 +222,7 @@ msgstr ""
#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
#: js/oc-vcategories.js:199 js/share.js:129 js/share.js:142 js/share.js:149
-#: js/share.js:631 js/share.js:643
+#: js/share.js:643 js/share.js:655
msgid "Error"
msgstr ""
@@ -246,7 +242,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: js/share.js:131 js/share.js:671
+#: js/share.js:131 js/share.js:683
msgid "Error while sharing"
msgstr ""
@@ -346,23 +342,23 @@ msgstr ""
msgid "share"
msgstr ""
-#: js/share.js:398 js/share.js:618
+#: js/share.js:398 js/share.js:630
msgid "Password protected"
msgstr ""
-#: js/share.js:631
+#: js/share.js:643
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:643
+#: js/share.js:655
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:658
+#: js/share.js:670
msgid "Sending ..."
msgstr ""
-#: js/share.js:669
+#: js/share.js:681
msgid "Email sent"
msgstr ""
@@ -377,8 +373,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -461,7 +458,7 @@ msgstr ""
msgid "Access forbidden"
msgstr ""
-#: templates/404.php:12
+#: templates/404.php:15
msgid "Cloud not found"
msgstr ""
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr ""
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index 1187272d81b..66f0fff9e78 100644
--- a/l10n/sw_KE/files.po
+++ b/l10n/sw_KE/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-07-22 01:54-0400\n"
-"PO-Revision-Date: 2013-07-22 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,11 +120,7 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
-
-#: js/filelist.js:457
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:460 js/filelist.js:518
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -285,45 +281,49 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Deleted files"
msgstr ""
-#: templates/index.php:48
+#: templates/index.php:46
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:54
+#: templates/index.php:52
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:61
+#: templates/index.php:59
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:73
msgid "Download"
msgstr ""
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
msgid "Unshare"
msgstr ""
-#: templates/index.php:107
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:105
msgid "Upload too large"
msgstr ""
-#: templates/index.php:109
+#: templates/index.php:107
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:114
+#: templates/index.php:112
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:117
+#: templates/index.php:115
msgid "Current scanning"
msgstr ""
diff --git a/l10n/sw_KE/files_encryption.po b/l10n/sw_KE/files_encryption.po
index 2e880b9ae9f..44bd37d47a1 100644
--- a/l10n/sw_KE/files_encryption.po
+++ b/l10n/sw_KE/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po
index 1cce275797a..3edc43234c3 100644
--- a/l10n/sw_KE/files_trashbin.po
+++ b/l10n/sw_KE/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,17 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 5f0afb54aba..4071236d9c2 100644
--- a/l10n/sw_KE/lib.po
+++ b/l10n/sw_KE/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: 2013-07-24 01:55-0400\n"
-"PO-Revision-Date: 2013-07-24 05:55+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -34,19 +34,15 @@ msgid "Users"
msgstr ""
#: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
msgid "Admin"
msgstr ""
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: defaults.php:33
+#: defaults.php:35
msgid "web services under your control"
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,54 +202,50 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
-#: template.php:296
+#: template.php:297
msgid "Caused by:"
msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index 262dc578d1b..ebd60e3215e 100644
--- a/l10n/sw_KE/settings.po
+++ b/l10n/sw_KE/settings.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-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-25 05:57+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index b340fa14d80..e51b2fcb6f1 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/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: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 0b7c460e287..2ef228556c5 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,59 @@ msgstr "கார்த்திகை"
msgid "December"
msgstr "மார்கழி"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "அமைப்புகள்"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "செக்கன்களுக்கு முன்"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 நிமிடத்திற்கு முன் "
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{நிமிடங்கள்} நிமிடங்களுக்கு முன் "
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 மணித்தியாலத்திற்கு முன்"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{மணித்தியாலங்கள்} மணித்தியாலங்களிற்கு முன்"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "இன்று"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "நேற்று"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{நாட்கள்} நாட்களுக்கு முன்"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "கடந்த மாதம்"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{மாதங்கள்} மாதங்களிற்கு முன்"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "மாதங்களுக்கு முன்"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "கடந்த வருடம்"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "வருடங்களுக்கு முன்"
@@ -197,23 +197,19 @@ msgstr "வருடங்களுக்கு முன்"
msgid "Choose"
msgstr "தெரிவுசெய்க "
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "இரத்து செய்க"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "ஆம்"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "இல்லை"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "சரி"
@@ -377,9 +373,10 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud இன் கடவுச்சொல் மீளமைப்பு"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr "விடுபதிகை செய்க"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "தன்னிச்சையான புகுபதிகை நிராகரிப்பட்டது!"
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "முந்தைய"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "அடுத்து"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 943c93ab9be..c724be39755 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL வெறுமையாக இருக்கமுடியாது."
@@ -107,8 +107,8 @@ msgstr "URL வெறுமையாக இருக்கமுடியாத
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "வழு"
@@ -120,15 +120,11 @@ msgstr "பகிர்வு"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "நீக்குக"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "பெயர்மாற்றம்"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "நிலுவையிலுள்ள"
@@ -156,15 +152,13 @@ msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்
msgid "undo"
msgstr "முன் செயல் நீக்கம் "
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 கோப்பு பதிவேற்றப்படுகிறது"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "பெயர்"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "அளவு"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "மாற்றப்பட்டது"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 கோப்புறை"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{எண்ணிக்கை} கோப்புறைகள்"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 கோப்பு"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{எண்ணிக்கை} கோப்புகள்"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr "பதிவிறக்குக"
msgid "Unshare"
msgstr "பகிரப்படாதது"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "நீக்குக"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "பதிவேற்றல் மிகப்பெரியது"
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index 85a61d043e7..6c36776c8a3 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index f5ecc9d83d9..6f439f6a08f 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index 51ca024f652..6cf36b94cde 100644
--- a/l10n/ta_LK/files_trashbin.po
+++ b/l10n/ta_LK/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,17 @@ msgstr "பெயர்"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 கோப்புறை"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{எண்ணிக்கை} கோப்புறைகள்"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 கோப்பு"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{எண்ணிக்கை} கோப்புகள்"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index bf7c398a455..f8f3518b983 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "பயனாளர்"
#: app.php:409
-msgid "Apps"
-msgstr "செயலிகள்"
-
-#: app.php:417
msgid "Admin"
msgstr "நிர்வாகம்"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr "செயலி இயலுமைப்படுத்தப்படவில்லை"
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr "செக்கன்களுக்கு முன்"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 நிமிடத்திற்கு முன் "
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d நிமிடங்களுக்கு முன்"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 மணித்தியாலத்திற்கு முன்"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d மணித்தியாலத்திற்கு முன்"
-
-#: template/functions.php:85
msgid "today"
msgstr "இன்று"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "நேற்று"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d நாட்களுக்கு முன்"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "கடந்த மாதம்"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d மாதத்திற்கு முன்"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "கடந்த வருடம்"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "வருடங்களுக்கு முன்"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index e0551bda04e..100e5e64d7b 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "சேமிக்கப்படுகிறது..."
@@ -141,31 +145,31 @@ msgstr ""
msgid "Groups"
msgstr "குழுக்கள்"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "குழு நிர்வாகி"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "நீக்குக"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr ""
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr ""
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "_மொழி_பெயர்_"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "மேலதிக"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "குறைவான"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "மறைக்குறியீடு"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index dbf4b8ed81f..971037c4056 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "எந்த ஒதுக்கீடும் இல்லாமல், உதாரணம். \"objectClass=posixGroup\"."
-
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "துறை "
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "TLS ஐ பயன்படுத்தவும்"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்"
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "பரிந்துரைக்கப்படவில்லை, சோதனைக்காக மட்டும் பயன்படுத்தவும்."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "பயனாளர் காட்சிப்பெயர் புலம்"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "தள பயனாளர் மரம்"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "குழுவின் காட்சி பெயர் புலம் "
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "தள குழு மரம்"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "குழு உறுப்பினர் சங்கம்"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "bytes களில் "
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "உதவி"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index c033af8536e..97198eda635 100644
--- a/l10n/te/core.po
+++ b/l10n/te/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr "నవంబర్"
msgid "December"
msgstr "డిసెంబర్"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "అమరికలు"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "క్షణాల క్రితం"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 నిమిషం క్రితం"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} నిమిషాల క్రితం"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 గంట క్రితం"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} గంటల క్రితం"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "ఈరోజు"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "నిన్న"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} రోజుల క్రితం"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "పోయిన నెల"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} నెలల క్రితం"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "నెలల క్రితం"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "పోయిన సంవత్సరం"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "సంవత్సరాల క్రితం"
@@ -197,23 +197,19 @@ msgstr "సంవత్సరాల క్రితం"
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "రద్దుచేయి"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "అవును"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "కాదు"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "సరే"
@@ -377,8 +373,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr "నిష్క్రమించు"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/te/files.po b/l10n/te/files.po
index ef08c1f10d3..b9310e4f508 100644
--- a/l10n/te/files.po
+++ b/l10n/te/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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:40+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "పొరపాటు"
@@ -120,15 +120,11 @@ msgstr ""
msgid "Delete permanently"
msgstr "శాశ్వతంగా తొలగించు"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "తొలగించు"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr ""
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "పేరు"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "పరిమాణం"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +305,10 @@ msgstr ""
msgid "Unshare"
msgstr ""
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "తొలగించు"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr ""
diff --git a/l10n/te/files_encryption.po b/l10n/te/files_encryption.po
index 8dbcbdbcb75..c592c5b12d8 100644
--- a/l10n/te/files_encryption.po
+++ b/l10n/te/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -68,9 +68,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index 26a74815d51..b4d02b22558 100644
--- a/l10n/te/files_trashbin.po
+++ b/l10n/te/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,17 @@ msgstr "పేరు"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index 370f405c284..5094e97ebb3 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "వాడుకరులు"
#: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
msgid "Admin"
msgstr ""
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr "క్షణాల క్రితం"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 నిమిషం క్రితం"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 గంట క్రితం"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template/functions.php:85
msgid "today"
msgstr "ఈరోజు"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "నిన్న"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "పోయిన నెల"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "పోయిన సంవత్సరం"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "సంవత్సరాల క్రితం"
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index efbf9806a17..ae043e953e5 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "మరిన్ని"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index 6e7b216db1a..ae1d36e9c59 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "సహాయం"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index d462d168d99..8ce60bb01f4 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\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"
@@ -16,6 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#: ajax/share.php:97
#, php-format
@@ -137,83 +138,79 @@ msgstr ""
msgid "December"
msgstr ""
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr ""
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr ""
-#: js/oc-dialogs.js:117
+#: js/oc-dialogs.js:123
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:210
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:168
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:178
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:195
msgid "Ok"
msgstr ""
@@ -377,8 +374,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -578,6 +576,10 @@ msgstr ""
msgid "Log out"
msgstr ""
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +617,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index f0fd7ff3b78..2b4ba672058 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"POT-Creation-Date: 2013-08-22 10:35-0400\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"
@@ -16,6 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#: ajax/move.php:17
#, php-format
@@ -94,21 +95,21 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:234 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
-#: js/file-upload.js:238 lib/app.php:53
+#: js/file-upload.js:239 lib/app.php:53
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:270 js/file-upload.js:286 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr ""
@@ -120,15 +121,11 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr ""
@@ -156,15 +153,13 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +185,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +306,10 @@ msgstr ""
msgid "Unshare"
msgstr ""
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
#: templates/index.php:105
msgid "Upload too large"
msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index f45ad5e6b50..1cded052b04 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"POT-Creation-Date: 2013-08-22 10:35-0400\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"
@@ -60,18 +60,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now, "
+"the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 6fe36ebdfd2..a607233510d 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\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"
@@ -37,20 +37,20 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:448
+#: lib/config.php:453
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 ""
-#: lib/config.php:451
+#: lib/config.php:457
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 ""
-#: lib/config.php:454
+#: lib/config.php:460
msgid ""
"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 50edd0d6b32..28e61114e94 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\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_trashbin.pot b/l10n/templates/files_trashbin.pot
index 75f82a9b7a5..f53c0f77fba 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\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"
@@ -16,6 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#: ajax/delete.php:42
#, php-format
@@ -51,21 +52,17 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 33e5e2fc5d8..9238c2c7fd1 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\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"
@@ -38,6 +38,6 @@ msgstr ""
msgid "No other versions available"
msgstr ""
-#: js/versions.js:149
+#: js/versions.js:145
msgid "Restore"
msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index a22fb7cdbf2..e8801c9f043 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\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"
@@ -16,6 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#: app.php:360
msgid "Help"
@@ -34,14 +35,10 @@ msgid "Users"
msgstr ""
#: app.php:409
-msgid "Apps"
-msgstr ""
-
-#: app.php:417
msgid "Admin"
msgstr ""
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +74,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +203,46 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 4f776c51576..981d9b2841d 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -141,31 +145,31 @@ msgstr ""
msgid "Groups"
msgstr ""
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr ""
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr ""
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr ""
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,105 +240,105 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
"\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -464,6 +468,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index afdcab2141f..d29a99b6e4b 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\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"
@@ -153,197 +153,184 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this "
+"option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It "
"makes sure that the username is unique and characters do not need to be "
@@ -359,15 +346,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute "
"is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -378,15 +365,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -400,18 +387,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 8270b66c302..6090739e41a 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
+"POT-Creation-Date: 2013-08-22 10:36-0400\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/th_TH/core.po b/l10n/th_TH/core.po
index 2b2eb976a23..61826ac4db1 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,55 @@ msgstr "พฤศจิกายน"
msgid "December"
msgstr "ธันวาคม"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "ตั้งค่า"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "วินาที ก่อนหน้านี้"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 นาทีก่อนหน้านี้"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} นาทีก่อนหน้านี้"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 ชั่วโมงก่อนหน้านี้"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} ชั่วโมงก่อนหน้านี้"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "วันนี้"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "เมื่อวานนี้"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{day} วันก่อนหน้านี้"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "เดือนที่แล้ว"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} เดือนก่อนหน้านี้"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "เดือน ที่ผ่านมา"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "ปีที่แล้ว"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "ปี ที่ผ่านมา"
@@ -197,23 +193,19 @@ msgstr "ปี ที่ผ่านมา"
msgid "Choose"
msgstr "เลือก"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "ยกเลิก"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "ตกลง"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "ไม่ตกลง"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "ตกลง"
@@ -377,9 +369,10 @@ msgstr "การอัพเดทไม่เป็นผลสำเร็จ
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้"
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "รีเซ็ตรหัสผ่าน ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +571,10 @@ msgstr ""
msgid "Log out"
msgstr "ออกจากระบบ"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "การเข้าสู่ระบบอัตโนมัติถูกปฏิเสธแล้ว"
@@ -615,14 +612,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "ก่อนหน้า"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "ถัดไป"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index f14b4cc52fc..00ad518a13b 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -94,12 +94,12 @@ msgstr "มีพื้นที่เหลือไม่เพียงพอ
msgid "Upload cancelled."
msgstr "การอัพโหลดถูกยกเลิก"
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL ไม่สามารถเว้นว่างได้"
@@ -107,8 +107,8 @@ msgstr "URL ไม่สามารถเว้นว่างได้"
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "ข้อผิดพลาด"
@@ -120,15 +120,11 @@ msgstr "แชร์"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "ลบ"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "เปลี่ยนชื่อ"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "อยู่ระหว่างดำเนินการ"
@@ -156,15 +152,12 @@ msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว"
msgid "undo"
msgstr "เลิกทำ"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "ดำเนินการตามคำสั่งลบ"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "กำลังอัพโหลดไฟล์ 1 ไฟล์"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "การอัพโหลดไฟล์"
@@ -190,43 +183,43 @@ msgstr "พื้นที่จัดเก็บข้อมูลของค
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่"
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "ชื่อ"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "ขนาด"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "แก้ไขแล้ว"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 โฟลเดอร์"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} โฟลเดอร์"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 ไฟล์"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} ไฟล์"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +302,10 @@ msgstr "ดาวน์โหลด"
msgid "Unshare"
msgstr "ยกเลิกการแชร์"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "ลบ"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป"
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index 5408793a7ce..84ab71bdb07 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 425f2d18d5c..ba9c49aba20 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index d3154fed496..d4723ca5dc7 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,15 @@ msgstr "ชื่อ"
msgid "Deleted"
msgstr "ลบแล้ว"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 โฟลเดอร์"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} โฟลเดอร์"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 ไฟล์"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} ไฟล์"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index 314f740f6bd..c1f5a0bd746 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "ผู้ใช้งาน"
#: app.php:409
-msgid "Apps"
-msgstr "แอปฯ"
-
-#: app.php:417
msgid "Admin"
msgstr "ผู้ดูแล"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "ไม่สามารถกำหนดได้"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน"
@@ -210,50 +202,42 @@ msgid "seconds ago"
msgstr "วินาที ก่อนหน้านี้"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 นาทีก่อนหน้านี้"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d นาทีที่ผ่านมา"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 ชั่วโมงก่อนหน้านี้"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d ชั่วโมงก่อนหน้านี้"
-
-#: template/functions.php:85
msgid "today"
msgstr "วันนี้"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "เมื่อวานนี้"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d วันที่ผ่านมา"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "เดือนที่แล้ว"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d เดือนมาแล้ว"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "ปีที่แล้ว"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "ปี ที่ผ่านมา"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 749b6eeee0a..a95d52b2b8d 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -120,7 +120,11 @@ msgstr "เกิดข้อผิดพลาดในระหว่างก
msgid "Updated"
msgstr "อัพเดทแล้ว"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "กำลังบันทึกข้อมูล..."
@@ -141,31 +145,31 @@ msgstr ""
msgid "Groups"
msgstr "กลุ่ม"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "ผู้ดูแลกลุ่ม"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "ลบ"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr ""
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr ""
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "ภาษาไทย"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "การแชร์ข้อมูล"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "เปิดใช้งาน API สำหรับคุณสมบัติแชร์ข้อมูล"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "อนุญาตให้ใช้งานลิงก์ได้"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ข้อมูลรายการต่างๆไปให้สาธารณะชนเป็นลิงก์ได้"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "บันทึกการเปลี่ยนแปลง"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "ระดับการเก็บบันทึก log"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "มาก"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "น้อย"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "รุ่น"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "การเข้ารหัส"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "ชื่อที่ใช้สำหรับเข้าสู่ระบบ"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 2e5cecd0649..d1f63c56b87 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "ตัวกรองข้อมูลการเข้าสู่ร
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ"
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\","
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "ตัวกรองข้อมูลกลุ่ม"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม"
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\","
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "ตั้งค่าการเชื่อมต่อ"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "พอร์ต"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "ปิดใช้งานเซิร์ฟเวอร์หลัก"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "ใช้ TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL"
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า"
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "ตั้งค่าไดเร็กทอรี่"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "รายการผู้ใช้งานหลักแบบ Tree"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "หนึ่ง User Base DN ต่อบรรทัด"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "คุณลักษณะการค้นหาชื่อผู้ใช้"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "ตัวเลือกเพิ่มเติม; หนึ่งคุณลักษณะต่อบรรทัด"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "ช่องแสดงชื่อกลุ่มที่ต้องการ"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "รายการกลุ่มหลักแบบ Tree"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "หนึ่ง Group Base DN ต่อบรรทัด"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "คุณลักษณะการค้นหาแบบกลุ่ม"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "คุณลักษณะพิเศษ"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "ในหน่วยไบต์"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "ช่วยเหลือ"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index fe7c9b9d1e2..2605b398b3f 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -4,12 +4,13 @@
#
# Translators:
# ismail yenigül <ismail.yenigul@surgate.com>, 2013
+# tridinebandim, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -25,7 +26,7 @@ msgstr "%s sizinle »%s« paylaşımında bulundu"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
-msgstr "Kategori türü desteklenmemektedir."
+msgstr "Kategori türü girilmedi."
#: ajax/vcategories/add.php:30
msgid "No category to add?"
@@ -138,59 +139,59 @@ msgstr "Kasım"
msgid "December"
msgstr "Aralık"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Ayarlar"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "saniye önce"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 dakika önce"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n dakika önce"
+msgstr[1] "%n dakika önce"
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} dakika önce"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n saat önce"
+msgstr[1] "%n saat önce"
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 saat önce"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} saat önce"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "bugün"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "dün"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} gün önce"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "%n gün önce"
+msgstr[1] "%n gün önce"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "geçen ay"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} ay önce"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n ay önce"
+msgstr[1] "%n ay önce"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "ay önce"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "geçen yıl"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "yıl önce"
@@ -198,23 +199,19 @@ msgstr "yıl önce"
msgid "Choose"
msgstr "seç"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "İptal"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "Seçici şablon dosya yüklemesinde hata"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Evet"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Hayır"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Tamam"
@@ -378,9 +375,10 @@ msgstr "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"h
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Güncelleme başarılı. ownCloud'a yönlendiriliyor."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud parola sıfırlama"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "%s parola sıfırlama"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -497,7 +495,7 @@ msgstr "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)"
#: templates/installation.php:26
#, php-format
msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "%s güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin."
#: templates/installation.php:32
msgid ""
@@ -522,7 +520,7 @@ msgstr "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığ
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Server'ınızı nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">dokümantasyon sayfasını</a> ziyaret edin."
#: templates/installation.php:47
msgid "Create an <strong>admin account</strong>"
@@ -579,6 +577,10 @@ msgstr "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın."
msgid "Log out"
msgstr "Çıkış yap"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "Daha fazla Uygulama"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Otomatik oturum açma reddedildi!"
@@ -616,14 +618,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "Merhaba, <br><br> %s sizinle »%s« paylaşımında bulundu.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>İyi günler!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "önceki"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "sonraki"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index a1719364372..d7be2b4bff6 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -4,12 +4,13 @@
#
# Translators:
# ismail yenigül <ismail.yenigul@surgate.com>, 2013
+# tridinebandim, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -95,12 +96,12 @@ msgstr "Yeterli disk alanı yok"
msgid "Upload cancelled."
msgstr "Yükleme iptal edildi."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL boş olamaz."
@@ -108,8 +109,8 @@ msgstr "URL boş olamaz."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir."
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Hata"
@@ -121,15 +122,11 @@ msgstr "Paylaş"
msgid "Delete permanently"
msgstr "Kalıcı olarak sil"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Sil"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "İsim değiştir."
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Bekliyor"
@@ -157,15 +154,13 @@ msgstr "{new_name} ismi {old_name} ile değiştirildi"
msgid "undo"
msgstr "geri al"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "Silme işlemini gerçekleştir"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "%n dosya yükleniyor"
+msgstr[1] "%n dosya yükleniyor"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 dosya yüklendi"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "Dosyalar yükleniyor"
@@ -191,43 +186,45 @@ msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkron
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
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:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir."
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "İsim"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Boyut"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Değiştirilme"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 dizin"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} dizin"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 dosya"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n dizin"
+msgstr[1] "%n dizin"
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} dosya"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n dosya"
+msgstr[1] "%n dosya"
#: lib/app.php:73
#, php-format
@@ -310,6 +307,10 @@ msgstr "İndir"
msgid "Unshare"
msgstr "Paylaşılmayan"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Sil"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Yükleme çok büyük"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index b14691c6099..9bd94afdb89 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -62,18 +62,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 494628568cc..a2ea28b6b5e 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index d3a5dcf51bd..f46712fc9f4 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# tridinebandim, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"PO-Revision-Date: 2013-08-15 10:20+0000\n"
+"Last-Translator: tridinebandim\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"
@@ -51,25 +52,21 @@ msgstr "İsim"
msgid "Deleted"
msgstr "Silindi"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 dizin"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] "%n dizin"
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} dizin"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 dosya"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} dosya"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] "%n dosya"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
-msgstr ""
+msgstr "geri yüklendi"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 8b7f4d190fe..bcc4af7bb56 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -4,12 +4,13 @@
#
# Translators:
# ismail yenigül <ismail.yenigul@surgate.com>, 2013
+# tridinebandim, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,17 +36,13 @@ msgid "Users"
msgstr "Kullanıcılar"
#: app.php:409
-msgid "Apps"
-msgstr "Uygulamalar"
-
-#: app.php:417
msgid "Admin"
msgstr "Yönetici"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "\"%s\" yükseltme başarısız oldu."
#: defaults.php:35
msgid "web services under your control"
@@ -54,7 +51,7 @@ msgstr "Bilgileriniz güvenli ve şifreli"
#: files.php:66 files.php:98
#, php-format
msgid "cannot open \"%s\""
-msgstr ""
+msgstr "\"%s\" açılamıyor"
#: files.php:226
msgid "ZIP download is turned off."
@@ -76,11 +73,7 @@ msgstr "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür."
msgid ""
"Download the files in smaller chunks, seperately or kindly ask your "
"administrator."
-msgstr ""
-
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "tespit edilemedi"
+msgstr "Dosyaları ayrı ayrı, küçük parçalar halinde indirin ya da yöneticinizden yardım isteyin. "
#: json.php:28
msgid "Application is not enabled"
@@ -211,56 +204,52 @@ msgid "seconds ago"
msgstr "saniye önce"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 dakika önce"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] "%n dakika önce"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d dakika önce"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] "%n saat önce"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 saat önce"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d saat önce"
-
-#: template/functions.php:85
msgid "today"
msgstr "bugün"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "dün"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d gün önce"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] "%n gün önce"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "geçen ay"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d ay önce"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] "%n ay önce"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "geçen yıl"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "yıl önce"
#: template.php:297
msgid "Caused by:"
-msgstr ""
+msgstr "Neden olan:"
#: vcategories.php:188 vcategories.php:249
#, php-format
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index f17b1b51c64..046cf20bcf1 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -4,12 +4,13 @@
#
# Translators:
# ismail yenigül <ismail.yenigul@surgate.com>, 2013
+# tridinebandim, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -121,7 +122,11 @@ msgstr "Uygulama güncellenirken hata"
msgid "Updated"
msgstr "Güncellendi"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Kaydediliyor..."
@@ -142,31 +147,31 @@ msgstr "Kullanıcı kaldırılamıyor"
msgid "Groups"
msgstr "Gruplar"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Yönetici Grubu "
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Sil"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "grup ekle"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Geçerli bir kullanıcı adı mutlaka sağlanmalı"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Kullanıcı oluşturulurken hata"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Geçerli bir parola mutlaka sağlanmalı"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Türkçe"
@@ -181,7 +186,7 @@ msgid ""
"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. .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/admin.php:29
msgid "Setup Warning"
@@ -196,7 +201,7 @@ msgstr "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırı
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Lütfen <a href='%s'>kurulum kılavuzlarını</a> tekrar kontrol edin."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -218,7 +223,7 @@ msgid ""
"System locale can't be set to %s. 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 %s."
-msgstr ""
+msgstr "Sistem yereli %s olarak değiştirilemedi. Bu, dosya adlarındaki bazı karakterlerde sorun olabileceği anlamına gelir. %s desteklemek için gerekli paketleri kurmanızı şiddetle öneririz."
#: templates/admin.php:75
msgid "Internet connection not working"
@@ -231,112 +236,112 @@ msgid ""
"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."
-msgstr ""
+msgstr "Bu sunucunun çalışan bir internet bağlantısı yok. Bu, harici depolama alanı bağlama, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacak demektir. Uzak dosyalara erişim ve e-posta ile bildirim gönderme de çalışmayacaktır. Eğer bu özelliklerin tamamını kullanmak istiyorsanız, sunucu için internet bağlantısını etkinleştirmenizi öneriyoruz."
#: templates/admin.php:92
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Yüklenen her sayfa ile bir görev çalıştır"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "Http üzerinden dakikada bir çalıştırılmak üzere, cron.php bir webcron hizmetine kaydedildi."
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "cron.php dosyasını dakikada bir çağırmak için sistemin cron hizmetini kullan. "
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Paylaşım"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Paylaşım API'sini etkinleştir."
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Uygulamaların paylaşım API'sini kullanmasına izin ver"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Bağlantıları izin ver."
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Kullanıcıların nesneleri paylaşımı için herkese açık bağlantılara izin ver"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
-msgstr ""
+msgstr "Herkes tarafından yüklemeye izin ver"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Paylaşıma izin ver"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Kullanıcıların kendileri ile paylaşılan öğeleri yeniden paylaşmasına izin ver"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Kullanıcıların herşeyi paylaşmalarına izin ver"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Güvenlik"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "HTTPS bağlantısına zorla"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "İstemcileri %s a şifreli bir bağlantı ile bağlanmaya zorlar."
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen ,%s a HTTPS ile bağlanın."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Kayıtlar"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Günlük seviyesi"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Daha fazla"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Az"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Sürüm"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +471,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr " <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">Dosyalarınıza WebDAV üzerinen erişme </a> için bu adresi kullanın"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Şifreleme"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Giriş Adı"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index a86abc49294..b9254262c51 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -156,198 +156,185 @@ msgstr "Kullanıcı Oturum Filtresi"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Filter uyunlamak icin tayin ediyor, ne zaman girişmek isteminiz. % % uid adi kullanici girismeye karsi koymacak. "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Kullanıcı Liste Filtresi"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Filter uyunmak icin tayin ediyor, ne zaman adi kullanici geri aliyor. "
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "bir yer tutucusu olmadan, örneğin \"objectClass=person\""
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Grup Süzgeci"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Filter uyunmak icin tayin ediyor, ne zaman grubalari tekrar aliyor. "
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "siz bir yer tutucu, mes. 'objectClass=posixGroup ('posixGrubu''. "
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Bağlantı ayarları"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Ne zaman iptal, bu uynnlama isletici "
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Port"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Sigorta Kopya Cephe "
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Bir kopya cevre vermek, kopya sunucu onemli olmali. "
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Kopya Port "
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Ana sunucuyu devredışı birak"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "TLS kullan"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Bu LDAPS baglama icin kullamaminiz, basamacak. "
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Dusme sunucu LDAP zor degil. (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "SSL sertifika doğrulamasını kapat."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Önerilmez, sadece test için kullanın."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Cache Time-To-Live "
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Parametrar Listesin Adresinin "
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Temel Kullanıcı Ağacı"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Bir Temel Kullanici DN her dizgi "
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Kategorii Arama Kullanici "
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Grub Ekrane Alani Adi"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Temel Grup Ağacı"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Bir Grubu Tabani DN her dizgi. "
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Kategorii Arama Grubu"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Grup-Üye işbirliği"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "byte cinsinden"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Kullanıcı adı bölümünü boş bırakın (varsayılan). "
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -363,15 +350,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -382,15 +369,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -404,18 +391,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Yardım"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 28b886ec0f0..0451be577d5 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -137,59 +137,55 @@ msgstr "ئوغلاق"
msgid "December"
msgstr "كۆنەك"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "تەڭشەكلەر"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 مىنۇت ئىلگىرى"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 سائەت ئىلگىرى"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "بۈگۈن"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "تۈنۈگۈن"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +193,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "ۋاز كەچ"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "ھەئە"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "ياق"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "جەزملە"
@@ -377,8 +369,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -478,7 +471,7 @@ msgstr ""
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr ""
+msgstr "تۈر تەھرىر"
#: templates/edit_categories_dialog.php:16
msgid "Add"
@@ -578,6 +571,10 @@ msgstr ""
msgid "Log out"
msgstr "تىزىمدىن چىق"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +612,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index d0450008d22..10586fef152 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr "يېتەرلىك بوشلۇق يوق"
msgid "Upload cancelled."
msgstr "يۈكلەشتىن ۋاز كەچتى."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "خاتالىق"
@@ -120,15 +120,11 @@ msgstr "ھەمبەھىر"
msgid "Delete permanently"
msgstr "مەڭگۈلۈك ئۆچۈر"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "ئۆچۈر"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "ئات ئۆزگەرت"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "كۈتۈۋاتىدۇ"
@@ -156,15 +152,12 @@ msgstr ""
msgid "undo"
msgstr "يېنىۋال"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 ھۆججەت يۈكلىنىۋاتىدۇ"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "ھۆججەت يۈكلىنىۋاتىدۇ"
@@ -190,43 +183,43 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "ئاتى"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "چوڭلۇقى"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "ئۆزگەرتكەن"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 قىسقۇچ"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 ھۆججەت"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} ھۆججەت"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +302,10 @@ msgstr "چۈشۈر"
msgid "Unshare"
msgstr "ھەمبەھىرلىمە"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "ئۆچۈر"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "يۈكلەندىغىنى بەك چوڭ"
diff --git a/l10n/ug/files_encryption.po b/l10n/ug/files_encryption.po
index aae8deada3b..d2941695a8d 100644
--- a/l10n/ug/files_encryption.po
+++ b/l10n/ug/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index 54a98b555d4..cf512bccd19 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po
index e8c2f9555ad..df0057cd76b 100644
--- a/l10n/ug/files_trashbin.po
+++ b/l10n/ug/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,15 @@ msgstr "ئاتى"
msgid "Deleted"
msgstr "ئۆچۈرۈلدى"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 قىسقۇچ"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 ھۆججەت"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} ھۆججەت"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index 018931a3d7b..554072cebd9 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "ئىشلەتكۈچىلەر"
#: app.php:409
-msgid "Apps"
-msgstr "ئەپلەر"
-
-#: app.php:417
msgid "Admin"
msgstr ""
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,42 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 مىنۇت ئىلگىرى"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d مىنۇت ئىلگىرى"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 سائەت ئىلگىرى"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d سائەت ئىلگىرى"
-
-#: template/functions.php:85
msgid "today"
msgstr "بۈگۈن"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "تۈنۈگۈن"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d كۈن ئىلگىرى"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr ""
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d ئاي ئىلگىرى"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index 49e5d53ddbe..d9e44036def 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى"
msgid "Updated"
msgstr "يېڭىلاندى"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "ساقلاۋاتىدۇ…"
@@ -141,31 +145,31 @@ msgstr "ئىشلەتكۈچىنى چىقىرىۋېتەلمەيدۇ"
msgid "Groups"
msgstr "گۇرۇپپا"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "گۇرۇپپا باشقۇرغۇچى"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "ئۆچۈر"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "گۇرۇپپا قوش"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr ""
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "ھەمبەھىر"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "بىخەتەرلىك"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "خاتىرە"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "خاتىرە دەرىجىسى"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "تېخىمۇ كۆپ"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "ئاز"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "نەشرى"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "شىفىرلاش"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "تىزىمغا كىرىش ئاتى"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index 49daddeb2a5..fa2c51ddd26 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr "ئىشلەتكۈچى تىزىمغا كىرىش سۈزگۈچى"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "ئىشلەتكۈچى تىزىم سۈزگۈچى"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "گۇرۇپپا سۈزگۈچ"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "باغلىنىش تەڭشىكى"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "سەپلىمە ئاكتىپ"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "ئېغىز"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "TLS ئىشلەت"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "ياردەم"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index e0e8575e753..ae0e108f162 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,63 @@ msgstr "Листопад"
msgid "December"
msgstr "Грудень"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Налаштування"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "секунди тому"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 хвилину тому"
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} хвилин тому"
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 годину тому"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} години тому"
-
-#: js/js.js:758
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/js.js:815
msgid "today"
msgstr "сьогодні"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "вчора"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} днів тому"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "минулого місяця"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} місяців тому"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "місяці тому"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "минулого року"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "роки тому"
@@ -197,23 +201,19 @@ msgstr "роки тому"
msgid "Choose"
msgstr "Обрати"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Відмінити"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Так"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Ні"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Ok"
@@ -377,9 +377,10 @@ msgstr "Оновлення виконалось неуспішно. Будь л
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Оновлення виконалось успішно. Перенаправляємо вас на ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "скидання пароля ownCloud"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +579,10 @@ msgstr ""
msgid "Log out"
msgstr "Вихід"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Автоматичний вхід в систему відхилений!"
@@ -615,14 +620,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "попередній"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "наступний"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index f5c2cd2fb4f..d348a772f94 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# zubr139 <zubr139@ukr.net>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +95,12 @@ msgstr "Місця більше немає"
msgid "Upload cancelled."
msgstr "Завантаження перервано."
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження."
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL не може бути пустим."
@@ -107,8 +108,8 @@ msgstr "URL не може бути пустим."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Помилка"
@@ -120,15 +121,11 @@ msgstr "Поділитися"
msgid "Delete permanently"
msgstr "Видалити назавжди"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Видалити"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Перейменувати"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Очікування"
@@ -156,15 +153,14 @@ msgstr "замінено {new_name} на {old_name}"
msgid "undo"
msgstr "відмінити"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "виконати операцію видалення"
-
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 файл завантажується"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "файли завантажуються"
@@ -190,48 +186,52 @@ msgstr "Ваше сховище переповнене, файли більше
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ваше сховище майже повне ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Невірне ім'я теки. Використання \"Shared\" зарезервовано Owncloud"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Ім'я"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Розмір"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Змінено"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 папка"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} папок"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 файл"
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} файлів"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/app.php:73
#, php-format
msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s не може бути перейменований"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
@@ -309,6 +309,10 @@ msgstr "Завантажити"
msgid "Unshare"
msgstr "Закрити доступ"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Видалити"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Файл занадто великий"
@@ -329,11 +333,11 @@ msgstr "Поточне сканування"
#: templates/part.list.php:74
msgid "directory"
-msgstr ""
+msgstr "каталог"
#: templates/part.list.php:76
msgid "directories"
-msgstr ""
+msgstr "каталоги"
#: templates/part.list.php:85
msgid "file"
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index ec9f68aed19..a75abaf30c8 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index 4c747b05e0f..884b5932450 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index 5bc455917f3..617e1276bfd 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/files_trashbin.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-08-01 01:55-0400\n"
-"PO-Revision-Date: 2013-08-01 03:10+0000\n"
-"Last-Translator: Soul Kim <warlock.rf@gmail.com>\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -52,21 +52,19 @@ msgstr "Ім'я"
msgid "Deleted"
msgstr "Видалено"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 папка"
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} папок"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 файл"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} файлів"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index 89913155b89..ef7e00a8e4b 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Користувачі"
#: app.php:409
-msgid "Apps"
-msgstr "Додатки"
-
-#: app.php:417
msgid "Admin"
msgstr "Адмін"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "не може бути визначено"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Додаток не увімкнений"
@@ -210,50 +202,50 @@ msgid "seconds ago"
msgstr "секунди тому"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 хвилину тому"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d хвилин тому"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 годину тому"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d годин тому"
-
-#: template/functions.php:85
msgid "today"
msgstr "сьогодні"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "вчора"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d днів тому"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "минулого місяця"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d місяців тому"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "минулого року"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "роки тому"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 7bbf6078110..8ccc7cda793 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -120,7 +120,11 @@ msgstr "Помилка при оновленні програми"
msgid "Updated"
msgstr "Оновлено"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Зберігаю..."
@@ -141,31 +145,31 @@ msgstr "Неможливо видалити користувача"
msgid "Groups"
msgstr "Групи"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Адміністратор групи"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Видалити"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "додати групу"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "Потрібно задати вірне ім'я користувача"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "Помилка при створенні користувача"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "Потрібно задати вірний пароль"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Виконати одне завдання для кожної завантаженої сторінки "
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Спільний доступ"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Увімкнути API спільного доступу"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Дозволити програмам використовувати API спільного доступу"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Дозволити посилання"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Дозволити користувачам відкривати спільний доступ до елементів за допомогою посилань"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Дозволити перевідкривати спільний доступ"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Дозволити користувачам знову відкривати спільний доступ до елементів, які вже відкриті для доступу"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Дозволити користувачам відкривати спільний доступ для всіх"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "Безпека"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "Примусове застосування HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Протокол"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "Рівень протоколювання"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "Більше"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "Менше"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Версія"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Шифрування"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Ім'я Логіну"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index fac9e7b6da0..9f05e0918b7 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "Фільтр Користувачів, що під'єднуються"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Фільтр Списку Користувачів"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Визначає фільтр, який застосовується при отриманні користувачів"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "без будь-якого заповнювача, наприклад: \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Фільтр Груп"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Визначає фільтр, який застосовується при отриманні груп."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Налаштування З'єднання"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "Налаштування Активне"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "Якщо \"галочка\" знята, ця конфігурація буде пропущена."
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "Сервер для резервних копій"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Вкажіть додатковий резервний сервер. Він повинен бути копією головного LDAP/AD сервера."
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Порт сервера для резервних копій"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Вимкнути Головний Сервер"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Використовуйте TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Не використовуйте це додатково для під'єднання до LDAP, бо виконано не буде."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Нечутливий до регістру LDAP сервер (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Вимкнути перевірку SSL сертифіката."
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Не рекомендується, використовуйте лише для тестів."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "Час актуальності Кеша"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "в секундах. Зміна очищує кеш."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Налаштування Каталога"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Поле, яке відображає Ім'я Користувача"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Основне Дерево Користувачів"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "Один Користувач Base DN на одній строчці"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "Пошукові Атрибути Користувача"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Додатково; один атрибут на строчку"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Поле, яке відображає Ім'я Групи"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Основне Дерево Груп"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "Одна Група Base DN на одній строчці"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Пошукові Атрибути Групи"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Асоціація Група-Член"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Спеціальні Атрибути"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "Поле Квоти"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "Квота за замовчанням"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "в байтах"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "Поле Ел. пошти"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "Правило іменування домашньої теки користувача"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD."
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "Тестове налаштування"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Допомога"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index 348d910e1fa..54407785c05 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -137,59 +137,59 @@ msgstr "نومبر"
msgid "December"
msgstr "دسمبر"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "سیٹینگز"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr ""
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr ""
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr ""
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr ""
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +197,19 @@ msgstr ""
msgid "Choose"
msgstr "منتخب کریں"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "منسوخ کریں"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "ہاں"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "نہیں"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "اوکے"
@@ -377,9 +373,10 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "اون کلاؤڈ پاسورڈ ری سیٹ"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -578,6 +575,10 @@ msgstr ""
msgid "Log out"
msgstr "لاگ آؤٹ"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr ""
@@ -615,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "پچھلا"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "اگلا"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index d51682f1199..a8832be5ecc 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/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-07-23 01:55-0400\n"
-"PO-Revision-Date: 2013-07-23 05:04+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "ایرر"
@@ -120,11 +120,7 @@ msgstr ""
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
@@ -156,15 +152,13 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
-
-#: js/filelist.js:457
-msgid "1 file uploading"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
-#: js/filelist.js:460 js/filelist.js:518
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +184,45 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:69
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:745 templates/index.php:80
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:82
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/app.php:73
#, php-format
@@ -285,45 +281,49 @@ msgstr ""
msgid "From link"
msgstr ""
-#: templates/index.php:42
+#: templates/index.php:41
msgid "Deleted files"
msgstr ""
-#: templates/index.php:48
+#: templates/index.php:46
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:54
+#: templates/index.php:52
msgid "You don’t have write permissions here."
msgstr ""
-#: templates/index.php:61
+#: templates/index.php:59
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:73
msgid "Download"
msgstr ""
-#: templates/index.php:87 templates/index.php:88
+#: templates/index.php:85 templates/index.php:86
msgid "Unshare"
msgstr "شئیرنگ ختم کریں"
-#: templates/index.php:107
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:105
msgid "Upload too large"
msgstr ""
-#: templates/index.php:109
+#: templates/index.php:107
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:114
+#: templates/index.php:112
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:117
+#: templates/index.php:115
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po
index 52723eb59e0..9bf9cd875cb 100644
--- a/l10n/ur_PK/files_encryption.po
+++ b/l10n/ur_PK/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-09 07:59-0400\n"
+"PO-Revision-Date: 2013-08-09 11:59+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -67,9 +67,9 @@ msgstr ""
#: hooks/hooks.php:45
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
#: hooks/hooks.php:263
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index a3bf807f8dd..7ccb9117fbd 100644
--- a/l10n/ur_PK/files_trashbin.po
+++ b/l10n/ur_PK/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,17 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr ""
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index 4347d7f1fa8..89c294dd06e 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "یوزرز"
#: app.php:409
-msgid "Apps"
-msgstr "ایپز"
-
-#: app.php:417
msgid "Admin"
msgstr "ایڈمن"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,46 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:83
-msgid "1 hour ago"
+msgid "today"
msgstr ""
#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
+msgid "yesterday"
msgstr ""
#: template/functions.php:85
-msgid "today"
-msgstr ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:86
-msgid "yesterday"
+msgid "last month"
msgstr ""
#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
#: template/functions.php:88
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
-
-#: template/functions.php:90
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index 3eef889f525..d324d54bb06 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -165,7 +169,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr ""
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 9b9987041e1..085620de421 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "مدد"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 94151459579..9a6b412143e 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -138,59 +138,55 @@ msgstr "Tháng 11"
msgid "December"
msgstr "Tháng 12"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "Cài đặt"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "vài giây trước"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 phút trước"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} phút trước"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 giờ trước"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} giờ trước"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "hôm nay"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "hôm qua"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} ngày trước"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "tháng trước"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} tháng trước"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "tháng trước"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "năm trước"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "năm trước"
@@ -198,23 +194,19 @@ msgstr "năm trước"
msgid "Choose"
msgstr "Chọn"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "Hủy"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Có"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "Không"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "Đồng ý"
@@ -378,9 +370,10 @@ msgstr "Cập nhật không thành công . Vui lòng thông báo đến <a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud."
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "Khôi phục mật khẩu Owncloud "
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -579,6 +572,10 @@ msgstr "%s còn trống. Xem thêm thông tin cách cập nhật."
msgid "Log out"
msgstr "Đăng xuất"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "Tự động đăng nhập đã bị từ chối !"
@@ -616,14 +613,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "Lùi lại"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "Kế tiếp"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index b274cce4ea9..2d6c28b2d58 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -95,12 +95,12 @@ msgstr "Không đủ chỗ trống cần thiết"
msgid "Upload cancelled."
msgstr "Hủy tải lên"
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
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/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL không được để trống."
@@ -108,8 +108,8 @@ msgstr "URL không được để trống."
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "Lỗi"
@@ -121,15 +121,11 @@ msgstr "Chia sẻ"
msgid "Delete permanently"
msgstr "Xóa vĩnh vễn"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "Xóa"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "Sửa tên"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "Đang chờ"
@@ -157,15 +153,12 @@ msgstr "đã thay thế {new_name} bằng {old_name}"
msgid "undo"
msgstr "lùi lại"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "thực hiện việc xóa"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 tệp tin đang được tải lên"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "tệp tin đang được tải lên"
@@ -191,43 +184,43 @@ msgstr "Your storage is full, files can not be updated or synced anymore!"
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Your storage is almost full ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Your download is being prepared. This might take some time if the files are big."
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "Tên"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "Kích cỡ"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "Thay đổi"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 thư mục"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} thư mục"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 tập tin"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} tập tin"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/app.php:73
#, php-format
@@ -310,6 +303,10 @@ msgstr "Tải về"
msgid "Unshare"
msgstr "Bỏ chia sẻ"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "Xóa"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "Tập tin tải lên quá lớn"
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index ed0dda91042..aeea77799a9 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -62,18 +62,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 47ce6adaf75..9d990191532 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index c727a5b17b5..c0a3d67ec4a 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,15 @@ msgstr "Tên"
msgid "Deleted"
msgstr "Đã xóa"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 thư mục"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} thư mục"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 tập tin"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} tập tin"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 8caf92f1aa9..9d03a4a361d 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "Người dùng"
#: app.php:409
-msgid "Apps"
-msgstr "Ứng dụng"
-
-#: app.php:417
msgid "Admin"
msgstr "Quản trị"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "không thể phát hiện được"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "Ứng dụng không được BẬT"
@@ -210,50 +202,42 @@ msgid "seconds ago"
msgstr "vài giây trước"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 phút trước"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d phút trước"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 giờ trước"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d giờ trước"
-
-#: template/functions.php:85
msgid "today"
msgstr "hôm nay"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "hôm qua"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d ngày trước"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "tháng trước"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d tháng trước"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "năm trước"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "năm trước"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 55da60efbb8..fd639946870 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -120,7 +120,11 @@ msgstr "Lỗi khi cập nhật ứng dụng"
msgid "Updated"
msgstr "Đã cập nhật"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "Đang lưu..."
@@ -141,31 +145,31 @@ msgstr ""
msgid "Groups"
msgstr "Nhóm"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "Nhóm quản trị"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "Xóa"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr ""
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr ""
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__Ngôn ngữ___"
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "Thực thi tác vụ mỗi khi trang được tải"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "Chia sẻ"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "Bật chia sẻ API"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "Cho phép các ứng dụng sử dụng chia sẻ API"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "Cho phép liên kết"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "Cho phép chia sẻ lại"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "Cho phép người dùng chia sẻ với bất cứ ai"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "Log"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "hơn"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "ít"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "Phiên bản"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "Mã hóa"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "Tên đăng nhập"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 8de7ed160e0..350cf0c3a2d 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "Lọc người dùng đăng nhập"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "Xác định các bộ lọc để áp dụng, khi đăng nhập . uid%% thay thế tên người dùng trong các lần đăng nhập."
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "use %%uid placeholder, e.g. \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "Lọc danh sách thành viên"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "Xác định các bộ lọc để áp dụng, khi người dụng sử dụng."
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "Bộ lọc nhóm"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Xác định các bộ lọc để áp dụng, khi nhóm sử dụng."
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = osixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "Connection Settings"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "Cổng"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "Cổng sao lưu (Replica)"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "Tắt máy chủ chính"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "Sử dụng TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Do not use it additionally for LDAPS connections, it will fail."
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "Trường hợp insensitve LDAP máy chủ (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "Tắt xác thực chứng nhận SSL"
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "Không khuyến khích, Chỉ sử dụng để thử nghiệm."
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "trong vài giây. Một sự thay đổi bộ nhớ cache."
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "Directory Settings"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "Hiển thị tên người sử dụng"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Cây người dùng cơ bản"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "User Search Attributes"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "Optional; one attribute per line"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "Hiển thị tên nhóm"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Cây nhóm cơ bản"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "Group Search Attributes"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "Nhóm thành viên Cộng đồng"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "Special Attributes"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "Theo Byte"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD"
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "Giúp đỡ"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 18cddc46b8c..21e175e4ff6 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# aivier <iaivier@126.com>, 2013
# fkj <fengkaijia@gmail.com>, 2013
# Martin Liu <liuzh66@gmail.com>, 2013
# hyy0591 <yangyu.huang@gmail.com>, 2013
@@ -10,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: Martin Liu <liuzh66@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -140,59 +141,55 @@ msgstr "十一月"
msgid "December"
msgstr "十二月"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "设置"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "秒前"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 分钟前"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n 分钟以前"
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} 分钟前"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n 小时以前"
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1小时前"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours}小时前"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "今天"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} 天前"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] "%n 天以前"
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "上个月"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months}月前"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n 个月以前"
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "月前"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "去年"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "年前"
@@ -200,23 +197,19 @@ msgstr "年前"
msgid "Choose"
msgstr "选择"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "取消"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "加载文件选取模板出错"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "否"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "好的"
@@ -380,9 +373,10 @@ msgstr "升级失败。请向<a href=\"https://github.com/owncloud/core/issues\"
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "升级成功。现在为您跳转到ownCloud。"
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "私有云密码重置"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr "%s 密码重置"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -581,6 +575,10 @@ msgstr "%s 是可用的。获取更多关于升级的信息。"
msgid "Log out"
msgstr "注销"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr "更多应用"
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "自动登录被拒绝!"
@@ -618,14 +616,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "你好!<br><br>温馨提示: %s 与您共享了 %s 。<br><br>\n查看: %s <br><br> 祝顺利!"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "后退"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "前进"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 813fda9499a..b7c7892b60b 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# aivier <iaivier@126.com>, 2013
# hlx98007 <hlx98007@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -95,12 +96,12 @@ msgstr "容量不足"
msgid "Upload cancelled."
msgstr "上传取消了"
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "文件正在上传。关闭页面会取消上传。"
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "网址不能为空。"
@@ -108,8 +109,8 @@ msgstr "网址不能为空。"
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "无效文件夹名。“Shared”已经被系统保留。"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "出错"
@@ -121,15 +122,11 @@ msgstr "分享"
msgid "Delete permanently"
msgstr "永久删除"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "删除"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "重命名"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "等待中"
@@ -157,15 +154,12 @@ msgstr "已用 {old_name} 替换 {new_name}"
msgid "undo"
msgstr "撤销"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "执行删除"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "正在上传 %n 个文件"
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 个文件正在上传"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "个文件正在上传"
@@ -191,43 +185,43 @@ msgstr "容量已满,不能再同步/上传文件了!"
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "你的空间快用满了 ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "正在下载,可能会花点时间,跟文件大小有关"
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "不正确文件夹名。Shared是保留名,不能使用。"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "名称"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "大小"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "修改日期"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 个文件夹"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} 个文件夹"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 个文件"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n 个文件夹"
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} 个文件"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n 个文件"
#: lib/app.php:73
#, php-format
@@ -310,6 +304,10 @@ msgstr "下载"
msgid "Unshare"
msgstr "取消分享"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "删除"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "上传过大"
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index 7fab6e1ae73..5d2f51942f6 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/zh_CN.GB2312/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index 3305b7fbbbd..72a289d0209 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# aivier <iaivier@126.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"Last-Translator: aivier <iaivier@126.com>\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"
@@ -19,7 +20,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "密码错误。请重试。"
#: templates/authenticate.php:7
msgid "Password"
@@ -31,27 +32,27 @@ msgstr "提交"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "对不起,这个链接看起来是错误的。"
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "原因可能是:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "项目已经移除"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "链接已过期"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "分享已经被禁用"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "欲了解更多信息,请联系将此链接发送给你的人。"
#: templates/public.php:15
#, php-format
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index 92acb527468..cef04c5439f 100644
--- a/l10n/zh_CN.GB2312/files_trashbin.po
+++ b/l10n/zh_CN.GB2312/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"PO-Revision-Date: 2013-08-15 10:40+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"
@@ -51,21 +51,15 @@ msgstr "名称"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 个文件夹"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n 个文件夹"
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} 个文件夹"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 个文件"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} 个文件"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n 个文件"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
@@ -77,7 +71,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
-msgstr ""
+msgstr "恢复"
#: templates/index.php:30 templates/index.php:31
msgid "Delete"
@@ -85,4 +79,4 @@ msgstr "删除"
#: templates/part.breadcrumb.php:9
msgid "Deleted Files"
-msgstr ""
+msgstr "删除的文件"
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index 209fa855936..faa83e8fc6c 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/files_versions.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# aivier <iaivier@126.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:56+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"PO-Revision-Date: 2013-08-15 11:00+0000\n"
+"Last-Translator: aivier <iaivier@126.com>\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"
@@ -28,16 +29,16 @@ msgstr "版本"
#: js/versions.js:53
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "无法恢复文件 {file} 到 版本 {timestamp}。"
#: js/versions.js:79
msgid "More versions..."
-msgstr ""
+msgstr "更多版本"
#: js/versions.js:116
msgid "No other versions available"
-msgstr ""
+msgstr "没有其他可用版本"
#: js/versions.js:149
msgid "Restore"
-msgstr ""
+msgstr "恢复"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index c540254d9e2..d4a3f5836f4 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "用户"
#: app.php:409
-msgid "Apps"
-msgstr "程序"
-
-#: app.php:417
msgid "Admin"
msgstr "管理员"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr "应用未启用"
@@ -210,50 +202,42 @@ msgid "seconds ago"
msgstr "秒前"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 分钟前"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n 分钟以前"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d 分钟前"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n 小时以前"
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1小时前"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template/functions.php:85
msgid "today"
msgstr "今天"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "昨天"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d 天前"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] "%n 天以前"
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "上个月"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n 个月以前"
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "去年"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "年前"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index be3894e160f..1779b0427de 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.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-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
-"Last-Translator: Martin Liu <liuzh66@gmail.com>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -123,7 +123,11 @@ msgstr "应用升级时出现错误"
msgid "Updated"
msgstr "已升级"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "保存中..."
@@ -144,31 +148,31 @@ msgstr "无法移除用户"
msgid "Groups"
msgstr "群组"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "群组管理员"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "删除"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "添加群组"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "请填写有效用户名"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "新增用户时出现错误"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "请填写有效密码"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "Chinese"
@@ -239,106 +243,106 @@ msgstr "服务器没有可用的Internet连接。这意味着像挂载外部储
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "在每个页面载入时执行一项任务"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php 已作为 webcron 服务注册。owncloud 将通过 http 协议每分钟调用一次 cron.php。"
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "使用系统 cron 服务。通过系统 cronjob 每分钟调用一次 owncloud 文件夹下的 cron.php"
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "分享"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "开启分享API"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "允许应用使用分享API"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "允许链接"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "允许用户通过链接共享内容"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "允许公众账户上传"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "允许其它人向用户的公众共享文件夹里上传文件"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "允许转帖"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "允许用户再次共享已共享的内容"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "允许用户向任何人分享"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "只允许用户向所在群组中的其他用户分享"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "安全"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "强制HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "强制客户端通过加密连接与%s连接"
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "请通过HTTPS协议连接到 %s,需要启用或者禁止强制SSL的开关。"
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "日志"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "日志等级"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "更多"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "更少"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "版本"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -468,6 +472,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "访问WebDAV请点击 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">此处</a>"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "加密"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "登录名"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 2bc58acb884..291f44e4bcd 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr "用户登录过滤器"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "定义尝试登录时要应用的过滤器。用 %%uid 替换登录操作中使用的用户名。"
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "使用 %%uid 占位符,例如 \"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "用户列表过滤器"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "定义撷取用户时要应用的过滤器。"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "不能使用占位符,例如 \"objectClass=person\"。"
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "群组过滤器"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "定义撷取群组时要应用的过滤器"
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "不能使用占位符,例如 \"objectClass=posixGroup\"。"
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "端口"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "使用 TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "大小写不敏感的 LDAP 服务器 (Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "关闭 SSL 证书校验。"
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "不推荐,仅供测试"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "以秒计。修改会清空缓存。"
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "用户显示名称字段"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "基本用户树"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "群组显示名称字段"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "基本群组树"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "群组-成员组合"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "以字节计"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "用户名请留空 (默认)。否则,请指定一个 LDAP/AD 属性。"
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "帮助"
diff --git a/l10n/zh_CN.GB2312/user_webdavauth.po b/l10n/zh_CN.GB2312/user_webdavauth.po
index 042d9edc6b1..bcfa856ac0c 100644
--- a/l10n/zh_CN.GB2312/user_webdavauth.po
+++ b/l10n/zh_CN.GB2312/user_webdavauth.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# aivier <iaivier@126.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-16 01:29-0400\n"
+"PO-Revision-Date: 2013-08-15 10:30+0000\n"
+"Last-Translator: aivier <iaivier@126.com>\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"
@@ -19,11 +20,11 @@ msgstr ""
#: templates/settings.php:3
msgid "WebDAV Authentication"
-msgstr ""
+msgstr "WebDAV 验证"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "地址:"
#: templates/settings.php:7
msgid ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index b7ec2b43639..c516d6a84d5 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -139,59 +139,55 @@ msgstr "十一月"
msgid "December"
msgstr "十二月"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "设置"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "秒前"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "一分钟前"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n 分钟前"
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} 分钟前"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1小时前"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} 小时前"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "今天"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} 天前"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "上月"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} 月前"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "月前"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "去年"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "年前"
@@ -199,23 +195,19 @@ msgstr "年前"
msgid "Choose"
msgstr "选择(&C)..."
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "取消"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "加载文件选择器模板出错"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "否"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "好"
@@ -379,9 +371,10 @@ msgstr "更新不成功。请汇报将此问题汇报给 <a href=\"https://gith
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "更新成功。正在重定向至 ownCloud。"
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "重置 ownCloud 密码"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -580,6 +573,10 @@ msgstr "%s 可用。获取更多关于如何升级的信息。"
msgid "Log out"
msgstr "注销"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "自动登录被拒绝!"
@@ -617,14 +614,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "您好,<br><br>%s 向您分享了 »%s«。<br><a href=\"%s\">查看</a>"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "上一页"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "下一页"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 42d80f04146..f2c016bafb2 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -97,12 +97,12 @@ msgstr "没有足够可用空间"
msgid "Upload cancelled."
msgstr "上传已取消"
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL不能为空"
@@ -110,8 +110,8 @@ msgstr "URL不能为空"
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "错误"
@@ -123,15 +123,11 @@ msgstr "分享"
msgid "Delete permanently"
msgstr "永久删除"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "删除"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "重命名"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "等待"
@@ -159,15 +155,12 @@ msgstr "已将 {old_name}替换成 {new_name}"
msgid "undo"
msgstr "撤销"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "进行删除操作"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1个文件上传中"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "文件上传中"
@@ -193,43 +186,43 @@ msgstr "您的存储空间已满,文件将无法更新或同步!"
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "您的存储空间即将用完 ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "名称"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "大小"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "修改日期"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1个文件夹"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} 个文件夹"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 个文件"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n 文件夹"
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} 个文件"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n个文件"
#: lib/app.php:73
#, php-format
@@ -312,6 +305,10 @@ msgstr "下载"
msgid "Unshare"
msgstr "取消共享"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "删除"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "上传文件过大"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 61e263ad2a5..fd619e23d55 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -64,18 +64,18 @@ msgid ""
"files."
msgstr "您的私有密钥无效!也许是您在 ownCloud 系统外更改了密码 (比如,在您的公司目录)。您可以在个人设置里更新您的私钥密码来恢复访问你的加密文件。"
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 013eee53c4e..b526299a397 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# waterone <suiy02@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+0000\n"
+"Last-Translator: waterone <suiy02@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,7 +20,7 @@ msgstr ""
#: templates/authenticate.php:4
msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "用户名或密码错误!请重试"
#: templates/authenticate.php:7
msgid "Password"
@@ -31,27 +32,27 @@ msgstr "提交"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "抱歉,此链接已失效"
#: templates/part.404.php:4
msgid "Reasons might be:"
-msgstr ""
+msgstr "可能原因是:"
#: templates/part.404.php:6
msgid "the item was removed"
-msgstr ""
+msgstr "此项已移除"
#: templates/part.404.php:7
msgid "the link expired"
-msgstr ""
+msgstr "链接过期"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr ""
+msgstr "共享已禁用"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "欲知详情,请联系发给你链接的人。"
#: templates/public.php:15
#, php-format
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index ce6063dce99..3b1a2c82069 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# waterone <suiy02@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-16 16:20+0000\n"
+"Last-Translator: waterone <suiy02@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"
@@ -51,25 +52,19 @@ msgstr "名称"
msgid "Deleted"
msgstr "已删除"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1个文件夹"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n 文件夹"
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} 个文件夹"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 个文件"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} 个文件"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n个文件"
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
-msgstr ""
+msgstr "已恢复"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 880725f9d90..3a6ed61af5f 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Charlie Mak <makchamhim72@gmail.com>, 2013
# modokwang <modokwang@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +36,10 @@ msgid "Users"
msgstr "用户"
#: app.php:409
-msgid "Apps"
-msgstr "应用"
-
-#: app.php:417
msgid "Admin"
msgstr "管理"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -78,10 +75,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "无法确定"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "应用程序未启用"
@@ -211,50 +204,42 @@ msgid "seconds ago"
msgstr "秒前"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "一分钟前"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n 分钟前"
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d 分钟前"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1小时前"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d小时前"
-
-#: template/functions.php:85
msgid "today"
msgstr "今天"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "昨天"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d 天前"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "上月"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d 月前"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "去年"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "年前"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 4a2a1d76d89..9dcf1c56847 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -4,14 +4,15 @@
#
# Translators:
# m13253 <m13253@hotmail.com>, 2013
+# waterone <suiy02@gmail.com>, 2013
# modokwang <modokwang@gmail.com>, 2013
# zhangmin <zm1990s@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-05 07:52-0400\n"
-"PO-Revision-Date: 2013-08-05 11:10+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -123,7 +124,11 @@ msgstr "更新 app 时出错"
msgid "Updated"
msgstr "已更新"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "保存中"
@@ -144,31 +149,31 @@ msgstr "无法移除用户"
msgid "Groups"
msgstr "组"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "组管理员"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "删除"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "添加组"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "必须提供合法的用户名"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "创建用户出错"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "必须提供合法的密码"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "简体中文"
@@ -183,7 +188,7 @@ msgid ""
"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 "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器,以使数据文件夹不可被访问,或者将数据文件夹移到web服务器以外。"
#: templates/admin.php:29
msgid "Setup Warning"
@@ -198,7 +203,7 @@ msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV
#: templates/admin.php:33
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "请认真检查<a href='%s'>安装指南</a>."
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
@@ -220,7 +225,7 @@ msgid ""
"System locale can't be set to %s. 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 %s."
-msgstr ""
+msgstr "服务器无法设置系统本地化到%s. 这意味着可能文件名中有一些字符会引起问题. 我们强烈建议在你系统上安装所需的软件包来支持%s"
#: templates/admin.php:75
msgid "Internet connection not working"
@@ -233,112 +238,112 @@ msgid ""
"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."
-msgstr ""
+msgstr "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作,例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接."
#: templates/admin.php:92
msgid "Cron"
msgstr "计划任务"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "每个页面加载后执行一个任务"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
-msgstr ""
+msgstr "cron.php已被注册到网络定时任务服务。通过http每分钟调用owncloud根目录的cron.php网页。"
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
-msgstr ""
+msgstr "使用系统定时任务服务。每分钟通过系统定时任务调用owncloud文件夹中的cron.php文件"
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "共享"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "启用共享API"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "允许应用软件使用共享API"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "允许链接"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "允许用户使用连接公开共享项目"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
-msgstr ""
+msgstr "允许公开上传"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "用户可让其他人上传到他的公开共享文件夹"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "允许再次共享"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "允许用户将共享给他们的项目再次共享"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "允许用户向任何人共享"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "允许用户只向同组用户共享"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "安全"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "强制使用 HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "强制客户端通过加密连接连接到%s。"
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
-msgstr ""
+msgstr "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL."
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "日志"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "日志级别"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "更多"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "更少"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "版本"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +471,22 @@ msgstr "WebDAV"
msgid ""
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
"target=\"_blank\">access your Files via WebDAV</a>"
+msgstr "使用该链接 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">通过WebDAV访问你的文件</a>"
+
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "加密"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
msgstr ""
#: templates/users.php:21
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 795269be235..f1052643431 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -155,198 +155,185 @@ msgstr "用户登录过滤"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "定义当尝试登录时的过滤器。 在登录过程中,%%uid将会被用户名替换"
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "使用 %%uid作为占位符,例如“uid=%%uid”"
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "用户列表过滤"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "定义拉取用户时的过滤器"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "没有任何占位符,如 \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "组过滤"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "定义拉取组信息时的过滤器"
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "无需占位符,例如\"objectClass=posixGroup\""
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "连接设置"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "现行配置"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "当反选后,此配置将被忽略。"
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "端口"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "备份 (镜像) 主机"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "给出一个可选的备份主机。它必须为主 LDAP/AD 服务器的一个镜像。"
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "备份 (镜像) 端口"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "禁用主服务器"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "使用TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "对于 LDAPS 连接不要额外启用它,连接必然失败。"
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "大小写敏感LDAP服务器(Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "关闭SSL证书验证"
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "暂不推荐,仅供测试"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "缓存存活时间"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "以秒计。修改将清空缓存。"
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "目录设置"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "用户显示名称字段"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "基础用户树"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "每行一个用户基准判别名"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "用户搜索属性"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "可选;每行一个属性"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "组显示名称字段"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "基础组树"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "每行一个群组基准判别名"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "群组搜索属性"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "组成员关联"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "特殊属性"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "配额字段"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "默认配额"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "字节数"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "电邮字段"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "用户主目录命名规则"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "内部用户名"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr "内部用户名属性:"
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr "超越UUID检测"
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr "UUID属性:"
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr "用户名-LDAP用户映射"
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr "清除用户-LDAP用户映射"
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "清除组用户-LDAP级映射"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "测试配置"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "帮助"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index ed5fbd0aba6..f91ec7caff1 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -137,59 +137,55 @@ msgstr "十一月"
msgid "December"
msgstr "十二月"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "設定"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr ""
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr ""
-
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr ""
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr ""
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr ""
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "今日"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "昨日"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr ""
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "前一月"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr ""
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "個月之前"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr ""
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr ""
@@ -197,23 +193,19 @@ msgstr ""
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "取消"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "Yes"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "OK"
@@ -377,8 +369,9 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "更新成功, 正"
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
msgstr ""
#: lostpassword/templates/email.php:2
@@ -578,6 +571,10 @@ msgstr ""
msgid "Log out"
msgstr "登出"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "自動登入被拒"
@@ -615,14 +612,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr ""
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "前一步"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "下一步"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 40bf4a77a00..ad3332276dd 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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -94,12 +94,12 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr ""
@@ -107,8 +107,8 @@ msgstr ""
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr ""
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "錯誤"
@@ -120,15 +120,11 @@ msgstr "分享"
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "刪除"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr ""
@@ -156,15 +152,12 @@ msgstr ""
msgid "undo"
msgstr ""
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr ""
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr ""
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr ""
@@ -190,43 +183,43 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "名稱"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:763
-msgid "1 folder"
-msgstr ""
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{}文件夾"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr ""
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr ""
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/app.php:73
#, php-format
@@ -309,6 +302,10 @@ msgstr "下載"
msgid "Unshare"
msgstr "取消分享"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "刪除"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr ""
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index 7cba2f446ad..f1049dc1eb6 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -61,18 +61,18 @@ msgid ""
"files."
msgstr ""
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index b0da2eac01a..1ab84440f23 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index a90458ecce9..31ad547f9b1 100644
--- a/l10n/zh_HK/files_trashbin.po
+++ b/l10n/zh_HK/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,15 @@ msgstr "名稱"
msgid "Deleted"
msgstr ""
-#: js/trash.js:192
-msgid "1 folder"
-msgstr ""
-
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{}文件夾"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/trash.js:202
-msgid "1 file"
-msgstr ""
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr ""
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index a8ac7fdbd81..037fcf13654 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -34,14 +34,10 @@ msgid "Users"
msgstr "用戶"
#: app.php:409
-msgid "Apps"
-msgstr "軟件"
-
-#: app.php:417
msgid "Admin"
msgstr "管理"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -77,10 +73,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr ""
-
#: json.php:28
msgid "Application is not enabled"
msgstr ""
@@ -210,50 +202,42 @@ msgid "seconds ago"
msgstr ""
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr ""
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr ""
-
-#: template/functions.php:85
msgid "today"
msgstr "今日"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "昨日"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "前一月"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr ""
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr ""
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index 63950a02dec..23427516418 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.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-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:01+0000\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19: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"
@@ -120,7 +120,11 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr ""
@@ -141,31 +145,31 @@ msgstr ""
msgid "Groups"
msgstr "群組"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr ""
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "刪除"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr ""
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr ""
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr ""
@@ -236,106 +240,106 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr ""
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr ""
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr ""
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr ""
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr ""
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr ""
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr ""
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr ""
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr ""
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr ""
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr ""
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr ""
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -465,6 +469,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr ""
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "加密"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index d72c1e0b0d9..98bb4324137 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -154,198 +154,185 @@ msgstr ""
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"username in the login action. Example: \"uid=%%uid\""
msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "連接埠"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
-msgstr ""
-
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr ""
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -361,15 +348,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -380,15 +367,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -402,18 +389,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "幫助"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index e28629b8c22..487c676ed04 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:06+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"
@@ -139,59 +139,55 @@ msgstr "十一月"
msgid "December"
msgstr "十二月"
-#: js/js.js:293
+#: js/js.js:355
msgid "Settings"
msgstr "設定"
-#: js/js.js:753
+#: js/js.js:812
msgid "seconds ago"
msgstr "幾秒前"
-#: js/js.js:754
-msgid "1 minute ago"
-msgstr "1 分鐘前"
+#: js/js.js:813
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
-#: js/js.js:755
-msgid "{minutes} minutes ago"
-msgstr "{minutes} 分鐘前"
+#: js/js.js:814
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
-#: js/js.js:756
-msgid "1 hour ago"
-msgstr "1 小時之前"
-
-#: js/js.js:757
-msgid "{hours} hours ago"
-msgstr "{hours} 小時前"
-
-#: js/js.js:758
+#: js/js.js:815
msgid "today"
msgstr "今天"
-#: js/js.js:759
+#: js/js.js:816
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:760
-msgid "{days} days ago"
-msgstr "{days} 天前"
+#: js/js.js:817
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: js/js.js:761
+#: js/js.js:818
msgid "last month"
msgstr "上個月"
-#: js/js.js:762
-msgid "{months} months ago"
-msgstr "{months} 個月前"
+#: js/js.js:819
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: js/js.js:763
+#: js/js.js:820
msgid "months ago"
msgstr "幾個月前"
-#: js/js.js:764
+#: js/js.js:821
msgid "last year"
msgstr "去年"
-#: js/js.js:765
+#: js/js.js:822
msgid "years ago"
msgstr "幾年前"
@@ -199,23 +195,19 @@ msgstr "幾年前"
msgid "Choose"
msgstr "選擇"
-#: js/oc-dialogs.js:122
-msgid "Cancel"
-msgstr "取消"
-
-#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+#: js/oc-dialogs.js:137 js/oc-dialogs.js:196
msgid "Error loading file picker template"
msgstr "載入檔案選擇器樣板發生錯誤"
-#: js/oc-dialogs.js:164
+#: js/oc-dialogs.js:160
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:168
msgid "No"
msgstr "否"
-#: js/oc-dialogs.js:185
+#: js/oc-dialogs.js:181
msgid "Ok"
msgstr "好"
@@ -379,9 +371,10 @@ msgstr "升級失敗,請將此問題回報 <a href=\"https://github.com/ownclo
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "升級成功,正將您重新導向至 ownCloud 。"
-#: lostpassword/controller.php:60
-msgid "ownCloud password reset"
-msgstr "ownCloud 密碼重設"
+#: lostpassword/controller.php:61
+#, php-format
+msgid "%s password reset"
+msgstr ""
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
@@ -580,6 +573,10 @@ msgstr "%s 已經釋出,瞭解更多資訊以進行更新。"
msgid "Log out"
msgstr "登出"
+#: templates/layout.user.php:100
+msgid "More apps"
+msgstr ""
+
#: templates/login.php:9
msgid "Automatic logon rejected!"
msgstr "自動登入被拒!"
@@ -617,14 +614,6 @@ msgid ""
"href=\"%s\">View it!</a><br><br>Cheers!"
msgstr "嗨,<br><br>通知您,%s 與您分享了 %s ,<br><a href=\"%s\">看一下吧</a>"
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr "上一頁"
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr "下一頁"
-
#: templates/update.php:3
#, php-format
msgid "Updating ownCloud to version %s, this may take a while."
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index ab8b7e2c5e5..6bca4b0ddc8 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -95,12 +95,12 @@ msgstr "沒有足夠的可用空間"
msgid "Upload cancelled."
msgstr "上傳已取消"
-#: js/file-upload.js:167 js/files.js:266
+#: js/file-upload.js:167 js/files.js:280
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "檔案上傳中。離開此頁面將會取消上傳。"
-#: js/file-upload.js:233 js/files.js:339
+#: js/file-upload.js:233 js/files.js:353
msgid "URL cannot be empty."
msgstr "URL 不能為空白。"
@@ -108,8 +108,8 @@ msgstr "URL 不能為空白。"
msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
msgstr "無效的資料夾名稱,'Shared' 的使用被 ownCloud 保留"
-#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
-#: js/files.js:693 js/files.js:731
+#: js/file-upload.js:269 js/file-upload.js:285 js/files.js:389 js/files.js:405
+#: js/files.js:709 js/files.js:747
msgid "Error"
msgstr "錯誤"
@@ -121,15 +121,11 @@ msgstr "分享"
msgid "Delete permanently"
msgstr "永久刪除"
-#: js/fileactions.js:128 templates/index.php:91 templates/index.php:92
-msgid "Delete"
-msgstr "刪除"
-
-#: js/fileactions.js:194
+#: js/fileactions.js:192
msgid "Rename"
msgstr "重新命名"
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:466
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:465
msgid "Pending"
msgstr "等候中"
@@ -157,15 +153,12 @@ msgstr "使用 {new_name} 取代 {old_name}"
msgid "undo"
msgstr "復原"
-#: js/filelist.js:375
-msgid "perform delete operation"
-msgstr "進行刪除動作"
+#: js/filelist.js:453
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
-#: js/filelist.js:458
-msgid "1 file uploading"
-msgstr "1 個檔案正在上傳"
-
-#: js/filelist.js:461 js/filelist.js:519
+#: js/filelist.js:518
msgid "files uploading"
msgstr "檔案正在上傳中"
@@ -191,43 +184,43 @@ msgstr "您的儲存空間已滿,沒有辦法再更新或是同步檔案!"
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "您的儲存空間快要滿了 ({usedSpacePercent}%)"
-#: js/files.js:231
+#: js/files.js:94
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:245
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "正在準備您的下載,若您的檔案較大,將會需要更多時間。"
-#: js/files.js:344
+#: js/files.js:358
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "無效的資料夾名稱,'Shared' 的使用被 ownCloud 保留"
-#: js/files.js:744 templates/index.php:67
+#: js/files.js:760 templates/index.php:67
msgid "Name"
msgstr "名稱"
-#: js/files.js:745 templates/index.php:78
+#: js/files.js:761 templates/index.php:78
msgid "Size"
msgstr "大小"
-#: js/files.js:746 templates/index.php:80
+#: js/files.js:762 templates/index.php:80
msgid "Modified"
msgstr "修改"
-#: js/files.js:763
-msgid "1 folder"
-msgstr "1 個資料夾"
-
-#: js/files.js:765
-msgid "{count} folders"
-msgstr "{count} 個資料夾"
-
-#: js/files.js:773
-msgid "1 file"
-msgstr "1 個檔案"
+#: js/files.js:778
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/files.js:775
-msgid "{count} files"
-msgstr "{count} 個檔案"
+#: js/files.js:784
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/app.php:73
#, php-format
@@ -310,6 +303,10 @@ msgstr "下載"
msgid "Unshare"
msgstr "取消共享"
+#: templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr "刪除"
+
#: templates/index.php:105
msgid "Upload too large"
msgstr "上傳過大"
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index d3b22dc0e59..2adbae532d9 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.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-08-02 01:55-0400\n"
-"PO-Revision-Date: 2013-08-02 05:57+0000\n"
+"POT-Creation-Date: 2013-08-21 08:10-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -63,18 +63,18 @@ msgid ""
"files."
msgstr "您的私鑰不正確! 感覺像是密碼在 ownCloud 系統之外被改變(例:您的目錄)。 您可以在個人設定中更新私鑰密碼取回已加密的檔案。"
-#: hooks/hooks.php:44
+#: hooks/hooks.php:41
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:45
+#: hooks/hooks.php:42
msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL "
-"PHP extension is enabled and configured properly. For now, the encryption "
-"app has been disabled."
-msgstr "請確認已安裝 PHP 5.3.3 或更新的版本並啟用 OpenSSL PHP 且正確設定。目前 encryption app 不可使用。"
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
-#: hooks/hooks.php:263
+#: hooks/hooks.php:249
msgid "Following users are not set up for encryption:"
msgstr ""
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 77a810102c4..6cf49409e59 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 12:22+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 18:23+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"
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index 62ef3f9c1b9..f51e340bf86 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/files_trashbin.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-07-30 01:55-0400\n"
-"PO-Revision-Date: 2013-07-30 05:56+0000\n"
+"POT-Creation-Date: 2013-08-15 04:47-0400\n"
+"PO-Revision-Date: 2013-08-15 08:48+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"
@@ -51,21 +51,15 @@ msgstr "名稱"
msgid "Deleted"
msgstr "已刪除"
-#: js/trash.js:192
-msgid "1 folder"
-msgstr "1 個資料夾"
+#: js/trash.js:191
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
-#: js/trash.js:194
-msgid "{count} folders"
-msgstr "{count} 個資料夾"
-
-#: js/trash.js:202
-msgid "1 file"
-msgstr "1 個檔案"
-
-#: js/trash.js:204
-msgid "{count} files"
-msgstr "{count} 個檔案"
+#: js/trash.js:197
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
#: lib/trash.php:819 lib/trash.php:821
msgid "restored"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index adb5dfb4f95..51f5864b64c 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -35,14 +35,10 @@ msgid "Users"
msgstr "使用者"
#: app.php:409
-msgid "Apps"
-msgstr "應用程式"
-
-#: app.php:417
msgid "Admin"
msgstr "管理"
-#: app.php:844
+#: app.php:836
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
@@ -78,10 +74,6 @@ msgid ""
"administrator."
msgstr ""
-#: helper.php:235
-msgid "couldn't be determined"
-msgstr "無法判斷"
-
#: json.php:28
msgid "Application is not enabled"
msgstr "應用程式未啟用"
@@ -211,50 +203,42 @@ msgid "seconds ago"
msgstr "幾秒前"
#: template/functions.php:81
-msgid "1 minute ago"
-msgstr "1 分鐘前"
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
#: template/functions.php:82
-#, php-format
-msgid "%d minutes ago"
-msgstr "%d 分鐘前"
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
#: template/functions.php:83
-msgid "1 hour ago"
-msgstr "1 小時之前"
-
-#: template/functions.php:84
-#, php-format
-msgid "%d hours ago"
-msgstr "%d 小時之前"
-
-#: template/functions.php:85
msgid "today"
msgstr "今天"
-#: template/functions.php:86
+#: template/functions.php:84
msgid "yesterday"
msgstr "昨天"
-#: template/functions.php:87
-#, php-format
-msgid "%d days ago"
-msgstr "%d 天前"
+#: template/functions.php:85
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
-#: template/functions.php:88
+#: template/functions.php:86
msgid "last month"
msgstr "上個月"
-#: template/functions.php:89
-#, php-format
-msgid "%d months ago"
-msgstr "%d 個月之前"
+#: template/functions.php:87
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
-#: template/functions.php:90
+#: template/functions.php:88
msgid "last year"
msgstr "去年"
-#: template/functions.php:91
+#: template/functions.php:89
msgid "years ago"
msgstr "幾年前"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index c8de92286f6..dd203a6e97a 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.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-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:10+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-08-21 08:11-0400\n"
+"PO-Revision-Date: 2013-08-19 19:20+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"
@@ -121,7 +121,11 @@ msgstr "更新應用程式錯誤"
msgid "Updated"
msgstr "已更新"
-#: js/personal.js:118
+#: js/personal.js:150
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:172
msgid "Saving..."
msgstr "儲存中..."
@@ -142,31 +146,31 @@ msgstr "無法刪除用戶"
msgid "Groups"
msgstr "群組"
-#: js/users.js:95 templates/users.php:89 templates/users.php:124
+#: js/users.js:97 templates/users.php:89 templates/users.php:124
msgid "Group Admin"
msgstr "群組管理員"
-#: js/users.js:115 templates/users.php:164
+#: js/users.js:120 templates/users.php:164
msgid "Delete"
msgstr "刪除"
-#: js/users.js:269
+#: js/users.js:277
msgid "add group"
msgstr "新增群組"
-#: js/users.js:428
+#: js/users.js:436
msgid "A valid username must be provided"
msgstr "必須提供一個有效的用戶名"
-#: js/users.js:429 js/users.js:435 js/users.js:450
+#: js/users.js:437 js/users.js:443 js/users.js:458
msgid "Error creating user"
msgstr "建立用戶時出現錯誤"
-#: js/users.js:434
+#: js/users.js:442
msgid "A valid password must be provided"
msgstr "一定要提供一個有效的密碼"
-#: personal.php:37 personal.php:38
+#: personal.php:40 personal.php:41
msgid "__language_name__"
msgstr "__language_name__"
@@ -237,106 +241,106 @@ msgstr "這臺 ownCloud 伺服器沒有連接到網際網路,因此有些功
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:101
+#: templates/admin.php:99
msgid "Execute one task with each page loaded"
msgstr "當頁面載入時,執行"
-#: templates/admin.php:111
+#: templates/admin.php:107
msgid ""
"cron.php is registered at a webcron service to call cron.php once a minute "
"over http."
msgstr "cron.php 已經註冊 webcron 服務,webcron 每分鐘會呼叫 cron.php 一次。"
-#: templates/admin.php:121
+#: templates/admin.php:115
msgid "Use systems cron service to call the cron.php file once a minute."
msgstr "使用系統的 cron 服務來呼叫 cron.php 每分鐘一次。"
-#: templates/admin.php:128
+#: templates/admin.php:120
msgid "Sharing"
msgstr "分享"
-#: templates/admin.php:134
+#: templates/admin.php:126
msgid "Enable Share API"
msgstr "啟用分享 API"
-#: templates/admin.php:135
+#: templates/admin.php:127
msgid "Allow apps to use the Share API"
msgstr "允許 apps 使用分享 API"
-#: templates/admin.php:142
+#: templates/admin.php:134
msgid "Allow links"
msgstr "允許連結"
-#: templates/admin.php:143
+#: templates/admin.php:135
msgid "Allow users to share items to the public with links"
msgstr "允許使用者以結連公開分享檔案"
-#: templates/admin.php:151
+#: templates/admin.php:143
msgid "Allow public uploads"
msgstr "允許任何人上傳"
-#: templates/admin.php:152
+#: templates/admin.php:144
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "允許使用者將他們公開分享的資料夾設定為「任何人皆可上傳」"
-#: templates/admin.php:160
+#: templates/admin.php:152
msgid "Allow resharing"
msgstr "允許轉貼分享"
-#: templates/admin.php:161
+#: templates/admin.php:153
msgid "Allow users to share items shared with them again"
msgstr "允許使用者分享其他使用者分享給他的檔案"
-#: templates/admin.php:168
+#: templates/admin.php:160
msgid "Allow users to share with anyone"
msgstr "允許使用者與任何人分享檔案"
-#: templates/admin.php:171
+#: templates/admin.php:163
msgid "Allow users to only share with users in their groups"
msgstr "僅允許使用者在群組內分享"
-#: templates/admin.php:178
+#: templates/admin.php:170
msgid "Security"
msgstr "安全性"
-#: templates/admin.php:191
+#: templates/admin.php:183
msgid "Enforce HTTPS"
msgstr "強制啟用 HTTPS"
-#: templates/admin.php:193
+#: templates/admin.php:185
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "強迫用戶端使用加密連線連接到 %s"
-#: templates/admin.php:199
+#: templates/admin.php:191
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "請使用 HTTPS 連線到 %s 以啓用或停用強制 SSL 加密。"
-#: templates/admin.php:211
+#: templates/admin.php:203
msgid "Log"
msgstr "紀錄"
-#: templates/admin.php:212
+#: templates/admin.php:204
msgid "Log level"
msgstr "紀錄層級"
-#: templates/admin.php:243
+#: templates/admin.php:235
msgid "More"
msgstr "更多"
-#: templates/admin.php:244
+#: templates/admin.php:236
msgid "Less"
msgstr "更少"
-#: templates/admin.php:250 templates/personal.php:114
+#: templates/admin.php:242 templates/personal.php:140
msgid "Version"
msgstr "版本"
-#: templates/admin.php:254 templates/personal.php:117
+#: templates/admin.php:246 templates/personal.php:143
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -466,6 +470,22 @@ msgid ""
"target=\"_blank\">access your Files via WebDAV</a>"
msgstr "使用<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">這個網址</a>來透過 WebDAV 存取您的檔案"
+#: templates/personal.php:117
+msgid "Encryption"
+msgstr "加密"
+
+#: templates/personal.php:119
+msgid "The encryption app is no longer enabled, decrypt all your file"
+msgstr ""
+
+#: templates/personal.php:125
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:130
+msgid "Decrypt all Files"
+msgstr ""
+
#: templates/users.php:21
msgid "Login Name"
msgstr "登入名稱"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 06d5cc0639a..c8e59df49f4 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: 2013-08-04 01:55-0400\n"
-"PO-Revision-Date: 2013-08-04 05:02+0000\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-19 19:07+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"
@@ -155,198 +155,185 @@ msgstr "使用者登入過濾器"
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
-msgstr "試圖登入時會定義要套用的篩選器。登入過程中%%uid會取代使用者名稱。"
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
#: templates/settings.php:55
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "請使用 %%uid placeholder,例如:\"uid=%%uid\""
-
-#: templates/settings.php:56
msgid "User List Filter"
msgstr "使用者名單篩選器"
-#: templates/settings.php:59
-msgid "Defines the filter to apply, when retrieving users."
-msgstr "檢索使用者時定義要套用的篩選器"
-
-#: templates/settings.php:60
-msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "請勿使用任何placeholder,例如:\"objectClass=person\"。"
+#: templates/settings.php:58
+msgid ""
+"Defines the filter to apply, when retrieving users (no placeholders). "
+"Example: \"objectClass=person\""
+msgstr ""
-#: templates/settings.php:61
+#: templates/settings.php:59
msgid "Group Filter"
msgstr "群組篩選器"
-#: templates/settings.php:64
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr "檢索群組時,定義要套用的篩選器"
-
-#: templates/settings.php:65
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "請勿使用任何placeholder,例如:\"objectClass=posixGroup\"。"
+#: templates/settings.php:62
+msgid ""
+"Defines the filter to apply, when retrieving groups (no placeholders). "
+"Example: \"objectClass=posixGroup\""
+msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:66
msgid "Connection Settings"
msgstr "連線設定"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "Configuration Active"
msgstr "設定為主動模式"
-#: templates/settings.php:71
+#: templates/settings.php:68
msgid "When unchecked, this configuration will be skipped."
msgstr "沒有被勾選時,此設定會被略過。"
-#: templates/settings.php:72
+#: templates/settings.php:69
msgid "Port"
msgstr "連接阜"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid "Backup (Replica) Host"
msgstr "備用主機"
-#: templates/settings.php:73
+#: templates/settings.php:70
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "請給定一個可選的備用主機。必須是LDAP/AD中央伺服器的複本。"
-#: templates/settings.php:74
+#: templates/settings.php:71
msgid "Backup (Replica) Port"
msgstr "備用(複本)連接阜"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Disable Main Server"
msgstr "停用主伺服器"
-#: templates/settings.php:75
+#: templates/settings.php:72
msgid "Only connect to the replica server."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Use TLS"
msgstr "使用TLS"
-#: templates/settings.php:76
+#: templates/settings.php:73
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:74
msgid "Case insensitve LDAP server (Windows)"
msgstr "不區分大小寫的LDAP伺服器(Windows)"
-#: templates/settings.php:78
+#: templates/settings.php:75
msgid "Turn off SSL certificate validation."
msgstr "關閉 SSL 憑證驗證"
-#: templates/settings.php:78
+#: templates/settings.php:75
#, php-format
msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your %s server."
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
msgstr ""
-#: templates/settings.php:78
-msgid "Not recommended, use for testing only."
-msgstr "不推薦使用,僅供測試用途。"
-
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "Cache Time-To-Live"
msgstr "快取的存活時間"
-#: templates/settings.php:79
+#: templates/settings.php:76
msgid "in seconds. A change empties the cache."
msgstr "以秒為單位。更變後會清空快取。"
-#: templates/settings.php:81
+#: templates/settings.php:78
msgid "Directory Settings"
msgstr "目錄選項"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "User Display Name Field"
msgstr "使用者名稱欄位"
-#: templates/settings.php:83
+#: templates/settings.php:80
msgid "The LDAP attribute to use to generate the user's display name."
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "Base User Tree"
msgstr "Base使用者數"
-#: templates/settings.php:84
+#: templates/settings.php:81
msgid "One User Base DN per line"
msgstr "一行一個使用者Base DN"
-#: templates/settings.php:85
+#: templates/settings.php:82
msgid "User Search Attributes"
msgstr "使用者搜索屬性"
-#: templates/settings.php:85 templates/settings.php:88
+#: templates/settings.php:82 templates/settings.php:85
msgid "Optional; one attribute per line"
msgstr "可選的; 一行一項屬性"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "Group Display Name Field"
msgstr "群組顯示名稱欄位"
-#: templates/settings.php:86
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the groups's display name."
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "Base Group Tree"
msgstr "Base群組樹"
-#: templates/settings.php:87
+#: templates/settings.php:84
msgid "One Group Base DN per line"
msgstr "一行一個群組Base DN"
-#: templates/settings.php:88
+#: templates/settings.php:85
msgid "Group Search Attributes"
msgstr "群組搜索屬性"
-#: templates/settings.php:89
+#: templates/settings.php:86
msgid "Group-Member association"
msgstr "群組成員的關係"
-#: templates/settings.php:91
+#: templates/settings.php:88
msgid "Special Attributes"
msgstr "特殊屬性"
-#: templates/settings.php:93
+#: templates/settings.php:90
msgid "Quota Field"
msgstr "配額欄位"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "Quota Default"
msgstr "預設配額"
-#: templates/settings.php:94
+#: templates/settings.php:91
msgid "in bytes"
msgstr "以位元組為單位"
-#: templates/settings.php:95
+#: templates/settings.php:92
msgid "Email Field"
msgstr "電郵欄位"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid "User Home Folder Naming Rule"
msgstr "使用者家目錄的命名規則"
-#: templates/settings.php:96
+#: templates/settings.php:93
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。"
-#: templates/settings.php:101
+#: templates/settings.php:98
msgid "Internal Username"
msgstr "內部使用者名稱"
-#: templates/settings.php:102
+#: templates/settings.php:99
msgid ""
"By default the internal username will be created from the UUID attribute. It"
" makes sure that the username is unique and characters do not need to be "
@@ -362,15 +349,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:103
+#: templates/settings.php:100
msgid "Internal Username Attribute:"
msgstr ""
-#: templates/settings.php:104
+#: templates/settings.php:101
msgid "Override UUID detection"
msgstr ""
-#: templates/settings.php:105
+#: templates/settings.php:102
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -381,15 +368,15 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:106
+#: templates/settings.php:103
msgid "UUID Attribute:"
msgstr ""
-#: templates/settings.php:107
+#: templates/settings.php:104
msgid "Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:108
+#: templates/settings.php:105
msgid ""
"Usernames are used to store and assign (meta) data. In order to precisely "
"identify and recognize users, each LDAP user will have a internal username. "
@@ -403,18 +390,18 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Username-LDAP User Mapping"
msgstr ""
-#: templates/settings.php:109
+#: templates/settings.php:106
msgid "Clear Groupname-LDAP Group Mapping"
msgstr ""
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Test Configuration"
msgstr "測試此設定"
-#: templates/settings.php:111
+#: templates/settings.php:108
msgid "Help"
msgstr "說明"
diff --git a/l10n/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po
index 2e684f4150b..88132e1361f 100644
--- a/l10n/zh_TW/user_webdavauth.po
+++ b/l10n/zh_TW/user_webdavauth.po
@@ -4,6 +4,7 @@
#
# Translators:
# Hydriz <admin@alphacorp.tk>, 2013
+# chenanyeh <chnjsn1221@gmail.com>, 2013
# Hydriz <admin@alphacorp.tk>, 2013
# pellaeon <nfsmwlin@gmail.com>, 2013
# sofiasu <sofia168@livemail.tw>, 2012
@@ -11,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-08-19 15:06-0400\n"
+"PO-Revision-Date: 2013-08-17 09:30+0000\n"
+"Last-Translator: chenanyeh <chnjsn1221@gmail.com>\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"
@@ -27,11 +28,11 @@ msgstr "WebDAV 認證"
#: templates/settings.php:4
msgid "Address: "
-msgstr ""
+msgstr "為址"
#: templates/settings.php:7
msgid ""
"The user credentials will be sent to this address. 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 ""
+msgstr "使用者憑證將會被傳送到此位址。此外掛程式將會檢查回應,HTTP statuscodes 401與403將會被理解為無效憑證,而所有其他的回應將會被理解為有效憑證。"
diff --git a/lib/app.php b/lib/app.php
index 2437896157a..f76b92cde1b 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -401,15 +401,7 @@ class OC_App{
// if the user is an 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" )
- );
-
+ // admin settings
$settings[]=array(
"id" => "admin",
"order" => 1000,
@@ -674,7 +666,7 @@ class OC_App{
}
$dh = opendir( $apps_dir['path'] );
- while( $file = readdir( $dh ) ) {
+ while (($file = readdir($dh)) !== false) {
if ($file[0] != '.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) {
diff --git a/lib/archive.php b/lib/archive.php
index 70615db714e..364cd5a74a1 100644
--- a/lib/archive.php
+++ b/lib/archive.php
@@ -121,7 +121,7 @@ abstract class OC_Archive{
function addRecursive($path, $source) {
if($dh=opendir($source)) {
$this->addFolder($path);
- while($file=readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if($file=='.' or $file=='..') {
continue;
}
diff --git a/lib/autoloader.php b/lib/autoloader.php
index 21170639092..01841f831be 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -111,15 +111,39 @@ class Autoloader {
* @param string $class
* @return bool
*/
+ protected $memoryCache = null;
+ protected $constructingMemoryCache = true; // hack to prevent recursion
public function load($class) {
- $paths = $this->findClass($class);
+ // Does this PHP have an in-memory cache? We cache the paths there
+ if ($this->constructingMemoryCache && !$this->memoryCache) {
+ $this->constructingMemoryCache = false;
+ $this->memoryCache = \OC\Memcache\Factory::createLowLatency('Autoloader');
+ }
+ if ($this->memoryCache) {
+ $pathsToRequire = $this->memoryCache->get($class);
+ if (is_array($pathsToRequire)) {
+ foreach ($pathsToRequire as $path) {
+ require_once $path;
+ }
+ return false;
+ }
+ }
+ // Use the normal class loading path
+ $paths = $this->findClass($class);
if (is_array($paths)) {
+ $pathsToRequire = array();
foreach ($paths as $path) {
if ($fullPath = stream_resolve_include_path($path)) {
require_once $fullPath;
+ $pathsToRequire[] = $fullPath;
}
}
+
+ // Save in our memory cache
+ if ($this->memoryCache) {
+ $this->memoryCache->set($class, $pathsToRequire, 60); // cache 60 sec
+ }
}
return false;
}
diff --git a/lib/base.php b/lib/base.php
index eaee8424651..2613e88d053 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -91,7 +91,7 @@ class OC {
// ensure we can find OC_Config
set_include_path(
OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
- get_include_path()
+ get_include_path()
);
OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT)));
@@ -160,11 +160,11 @@ class OC {
// 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
+ OC::$SERVERROOT . '/config' . PATH_SEPARATOR .
+ OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR .
+ implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR .
+ get_include_path() . PATH_SEPARATOR .
+ OC::$SERVERROOT
);
}
@@ -278,17 +278,17 @@ class OC {
ini_set('session.cookie_httponly', '1;');
// set the cookie path to the ownCloud directory
- $cookie_path = OC::$WEBROOT ?: '/';
+ $cookie_path = OC::$WEBROOT ? : '/';
ini_set('session.cookie_path', $cookie_path);
//set the session object to a dummy session so code relying on the session existing still works
self::$session = new \OC\Session\Memory('');
-
- try{
+
+ try {
// set the session name to the instance id - which is unique
self::$session = new \OC\Session\Internal(OC_Util::getInstanceId());
// if session cant be started break with http 500 error
- }catch (Exception $e){
+ } catch (Exception $e) {
OC_Log::write('core', 'Session could not be initialized',
OC_Log::ERROR);
@@ -352,7 +352,7 @@ class OC {
public static function init() {
// register autoloader
require_once __DIR__ . '/autoloader.php';
- self::$loader=new \OC\Autoloader();
+ self::$loader = new \OC\Autoloader();
self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib');
self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib');
self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing');
@@ -373,7 +373,7 @@ class OC {
ini_set('arg_separator.output', '&amp;');
// try to switch magic quotes off.
- if (get_magic_quotes_gpc()==1) {
+ if (get_magic_quotes_gpc() == 1) {
ini_set('magic_quotes_runtime', 0);
}
@@ -398,7 +398,8 @@ class OC {
//set http auth headers for apache+php-cgi work around
if (isset($_SERVER['HTTP_AUTHORIZATION'])
- && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) {
+ && 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);
@@ -406,7 +407,8 @@ class OC {
//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)) {
+ && 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);
@@ -435,10 +437,11 @@ class OC {
stream_wrapper_register('fakedir', 'OC\Files\Stream\Dir');
stream_wrapper_register('static', 'OC\Files\Stream\StaticStream');
stream_wrapper_register('close', 'OC\Files\Stream\Close');
+ stream_wrapper_register('quota', 'OC\Files\Stream\Quota');
stream_wrapper_register('oc', 'OC\Files\Stream\OC');
self::initTemplateEngine();
- if ( !self::$CLI ) {
+ if (!self::$CLI) {
self::initSession();
} else {
self::$session = new \OC\Session\Memory('');
@@ -459,7 +462,7 @@ class OC {
// User and Groups
if (!OC_Config::getValue("installed", false)) {
- self::$session->set('user_id','');
+ self::$session->set('user_id', '');
}
OC_User::useBackend(new OC_User_Database());
diff --git a/lib/cache/file.php b/lib/cache/file.php
index 531e1d50f40..9fee6034a71 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -29,22 +29,30 @@ class OC_Cache_File{
}
public function get($key) {
+ $result = null;
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
if ($this->hasKey($key)) {
$storage = $this->getStorage();
- return $storage->file_get_contents($key);
+ $result = $storage->file_get_contents($key);
}
- return null;
+ \OC_FileProxy::$enabled = $proxyStatus;
+ return $result;
}
public function set($key, $value, $ttl=0) {
$storage = $this->getStorage();
+ $result = false;
+ $proxyStatus = \OC_FileProxy::$enabled;
+ \OC_FileProxy::$enabled = false;
if ($storage and $storage->file_put_contents($key, $value)) {
if ($ttl === 0) {
$ttl = 86400; // 60*60*24
}
- return $storage->touch($key, time() + $ttl);
+ $result = $storage->touch($key, time() + $ttl);
}
- return false;
+ \OC_FileProxy::$enabled = $proxyStatus;
+ return $result;
}
public function hasKey($key) {
@@ -72,7 +80,7 @@ class OC_Cache_File{
$storage = $this->getStorage();
if($storage and $storage->is_dir('/')) {
$dh=$storage->opendir('/');
- while($file=readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) {
$storage->unlink('/'.$file);
}
@@ -86,7 +94,7 @@ class OC_Cache_File{
if($storage and $storage->is_dir('/')) {
$now = time();
$dh=$storage->opendir('/');
- while($file=readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if($file!='.' and $file!='..') {
$mtime = $storage->filemtime('/'.$file);
if ($mtime < $now) {
diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php
index 6d01964e185..2fbd8ca3edb 100644
--- a/lib/cache/fileglobal.php
+++ b/lib/cache/fileglobal.php
@@ -69,7 +69,7 @@ class OC_Cache_FileGlobal{
$prefix = $this->fixKey($prefix);
if($cache_dir and is_dir($cache_dir)) {
$dh=opendir($cache_dir);
- while($file=readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) {
unlink($cache_dir.$file);
}
@@ -88,7 +88,7 @@ class OC_Cache_FileGlobal{
$cache_dir = self::getCacheDir();
if($cache_dir and is_dir($cache_dir)) {
$dh=opendir($cache_dir);
- while($file=readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if($file!='.' and $file!='..') {
$mtime = filemtime($cache_dir.$file);
if ($mtime < $now) {
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index 06ab73e3e4d..61bdcd5e0ae 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -50,6 +50,11 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
throw new \Sabre_DAV_Exception_Forbidden();
}
+ // throw an exception if encryption was disabled but the files are still encrypted
+ if (\OC_Util::encryptedFiles()) {
+ throw new \Sabre_DAV_Exception_ServiceUnavailable();
+ }
+
// mark file as partial while uploading (ignored by the scanner)
$partpath = $this->path . '.part';
@@ -89,7 +94,12 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
*/
public function get() {
- return \OC\Files\Filesystem::fopen($this->path, 'rb');
+ //throw execption if encryption is disabled but files are still encrypted
+ if (\OC_Util::encryptedFiles()) {
+ throw new \Sabre_DAV_Exception_ServiceUnavailable();
+ } else {
+ return \OC\Files\Filesystem::fopen($this->path, 'rb');
+ }
}
diff --git a/lib/connector/sabre/objecttree.php b/lib/connector/sabre/objecttree.php
index c4ddcbecbb8..b298813a202 100644
--- a/lib/connector/sabre/objecttree.php
+++ b/lib/connector/sabre/objecttree.php
@@ -88,7 +88,7 @@ class ObjectTree extends \Sabre_DAV_ObjectTree {
} else {
Filesystem::mkdir($destination);
$dh = Filesystem::opendir($source);
- while ($subnode = readdir($dh)) {
+ while (($subnode = readdir($dh)) !== false) {
if ($subnode == '.' || $subnode == '..') continue;
$this->copy($source . '/' . $subnode, $destination . '/' . $subnode);
diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php
index 16c88b96ea6..59a96797c16 100644
--- a/lib/connector/sabre/principal.php
+++ b/lib/connector/sabre/principal.php
@@ -66,13 +66,13 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
*/
public function getGroupMemberSet($principal) {
// TODO: for now the group principal has only one member, the user itself
- list($prefix, $name) = Sabre_DAV_URLUtil::splitPath($principal);
-
- $principal = $this->getPrincipalByPath($prefix);
- if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
+ $principal = $this->getPrincipalByPath($principal);
+ if (!$principal) {
+ throw new Sabre_DAV_Exception('Principal not found');
+ }
return array(
- $prefix
+ $principal['uri']
);
}
@@ -88,7 +88,9 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
$group_membership = array();
if ($prefix == 'principals') {
$principal = $this->getPrincipalByPath($principal);
- if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
+ if (!$principal) {
+ throw new Sabre_DAV_Exception('Principal not found');
+ }
// TODO: for now the user principal has only its own groups
return array(
diff --git a/lib/connector/sabre/quotaplugin.php b/lib/connector/sabre/quotaplugin.php
index eb95a839b86..c8ce65a8576 100644
--- a/lib/connector/sabre/quotaplugin.php
+++ b/lib/connector/sabre/quotaplugin.php
@@ -60,7 +60,7 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin {
}
list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri);
$freeSpace = $this->fileView->free_space($parentUri);
- if ($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN && $length > $freeSpace) {
+ if ($freeSpace !== \OC\Files\SPACE_UNKNOWN && $length > $freeSpace) {
throw new Sabre_DAV_Exception_InsufficientStorage();
}
}
diff --git a/lib/db.php b/lib/db.php
index a96f4697235..ebd012c72f8 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -41,68 +41,25 @@ class DatabaseException extends Exception {
* Doctrine with some adaptions.
*/
class OC_DB {
- const BACKEND_DOCTRINE=2;
-
- static private $preparedQueries = array();
- static private $cachingEnabled = true;
-
/**
- * @var \Doctrine\DBAL\Connection
+ * @var \OC\DB\Connection $connection
*/
- static private $connection; //the preferred connection to use, only Doctrine
- static private $backend=null;
- /**
- * @var \Doctrine\DBAL\Connection
- */
- static private $DOCTRINE=null;
+ static private $connection; //the prefered connection to use, only Doctrine
static private $prefix=null;
static private $type=null;
/**
- * check which backend we should use
- * @return int BACKEND_DOCTRINE
- */
- private static function getDBBackend() {
- return self::BACKEND_DOCTRINE;
- }
-
- /**
* @brief connects to the database
- * @param int $backend
* @return bool true if connection can be established or false on error
*
* Connects to the database as specified in config.php
*/
- public static function connect($backend=null) {
+ public static function connect() {
if(self::$connection) {
return true;
}
- if(is_null($backend)) {
- $backend=self::getDBBackend();
- }
- if($backend==self::BACKEND_DOCTRINE) {
- $success = self::connectDoctrine();
- self::$connection=self::$DOCTRINE;
- self::$backend=self::BACKEND_DOCTRINE;
- }
- return $success;
- }
- /**
- * connect to the database using doctrine
- *
- * @return bool
- */
- public static function connectDoctrine() {
- if(self::$connection) {
- if(self::$backend!=self::BACKEND_DOCTRINE) {
- self::disconnect();
- } else {
- return true;
- }
- }
- self::$preparedQueries = array();
// The global data we need
$name = OC_Config::getValue( "dbname", "owncloud" );
$host = OC_Config::getValue( "dbhost", "" );
@@ -116,7 +73,7 @@ class OC_DB {
}
// do nothing if the connection already has been established
- if(!self::$DOCTRINE) {
+ if (!self::$connection) {
$config = new \Doctrine\DBAL\Configuration();
switch($type) {
case 'sqlite':
@@ -128,6 +85,7 @@ class OC_DB {
'path' => $datadir.'/'.$name.'.db',
'driver' => 'pdo_sqlite',
);
+ $connectionParams['adapter'] = '\OC\DB\AdapterSqlite';
break;
case 'mysql':
$connectionParams = array(
@@ -139,6 +97,7 @@ class OC_DB {
'charset' => 'UTF8',
'driver' => 'pdo_mysql',
);
+ $connectionParams['adapter'] = '\OC\DB\Adapter';
break;
case 'pgsql':
$connectionParams = array(
@@ -149,6 +108,7 @@ class OC_DB {
'dbname' => $name,
'driver' => 'pdo_pgsql',
);
+ $connectionParams['adapter'] = '\OC\DB\AdapterPgSql';
break;
case 'oci':
$connectionParams = array(
@@ -162,6 +122,7 @@ class OC_DB {
if (!empty($port)) {
$connectionParams['port'] = $port;
}
+ $connectionParams['adapter'] = '\OC\DB\AdapterOCI8';
break;
case 'mssql':
$connectionParams = array(
@@ -173,12 +134,20 @@ class OC_DB {
'charset' => 'UTF8',
'driver' => 'pdo_sqlsrv',
);
+ $connectionParams['adapter'] = '\OC\DB\AdapterSQLSrv';
break;
default:
return false;
}
+ $connectionParams['wrapperClass'] = 'OC\DB\Connection';
+ $connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_' );
try {
- self::$DOCTRINE = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
+ self::$connection = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
+ if ($type === 'sqlite' || $type === 'sqlite3') {
+ // Sqlite doesn't handle query caching and schema changes
+ // TODO: find a better way to handle this
+ self::$connection->disableQueryStatementCaching();
+ }
} catch(\Doctrine\DBAL\DBALException $e) {
OC_Log::write('core', $e->getMessage(), OC_Log::FATAL);
OC_User::setUserId(null);
@@ -194,12 +163,9 @@ class OC_DB {
}
/**
- * get the database connection object
- *
- * @return \Doctrine\DBAL\Connection
+ * @return \OC\DB\Connection
*/
- private static function getConnection()
- {
+ static public function getConnection() {
self::connect();
return self::$connection;
}
@@ -226,25 +192,6 @@ class OC_DB {
* SQL query via Doctrine prepare(), needs to be execute()'d!
*/
static public function prepare( $query , $limit = null, $offset = null, $isManipulation = null) {
-
- if (!is_null($limit) && $limit != -1) {
- if ($limit === -1) {
- $limit = null;
- }
- $platform = self::$connection->getDatabasePlatform();
- $query = $platform->modifyLimitQuery($query, $limit, $offset);
- } else {
- if (isset(self::$preparedQueries[$query]) and self::$cachingEnabled) {
- return self::$preparedQueries[$query];
- }
- }
- $rawQuery = $query;
-
- // Optimize the query
- $query = self::processQuery( $query );
- if(OC_Config::getValue( "log_query", false)) {
- OC_Log::write('core', 'DB prepare : '.$query, OC_Log::DEBUG);
- }
self::connect();
if ($isManipulation === null) {
@@ -253,45 +200,38 @@ class OC_DB {
}
// return the result
- if (self::$backend == self::BACKEND_DOCTRINE) {
- try {
- $result=self::$connection->prepare($query);
- } catch(\Doctrine\DBAL\DBALException $e) {
- throw new \DatabaseException($e->getMessage(), $query);
- }
- // differentiate between query and manipulation
- $result=new OC_DB_StatementWrapper($result, $isManipulation);
- }
- if ((is_null($limit) || $limit == -1) and self::$cachingEnabled ) {
- $type = OC_Config::getValue( "dbtype", "sqlite" );
- if( $type != 'sqlite' && $type != 'sqlite3' ) {
- self::$preparedQueries[$rawQuery] = $result;
- }
+ try {
+ $result = self::$connection->prepare($query, $limit, $offset);
+ } catch (\Doctrine\DBAL\DBALException $e) {
+ throw new \DatabaseException($e->getMessage(), $query);
}
+ // differentiate between query and manipulation
+ $result = new OC_DB_StatementWrapper($result, $isManipulation);
return $result;
}
-
+
/**
* tries to guess the type of statement based on the first 10 characters
* the current check allows some whitespace but does not work with IF EXISTS or other more complex statements
*
* @param string $sql
+ * @return bool
*/
static public function isManipulation( $sql ) {
- $selectOccurence = stripos ($sql, "SELECT");
- if ($selectOccurence !== false && $selectOccurence < 10) {
+ $selectOccurrence = stripos($sql, 'SELECT');
+ if ($selectOccurrence !== false && $selectOccurrence < 10) {
return false;
}
- $insertOccurence = stripos ($sql, "INSERT");
- if ($insertOccurence !== false && $insertOccurence < 10) {
+ $insertOccurrence = stripos($sql, 'INSERT');
+ if ($insertOccurrence !== false && $insertOccurrence < 10) {
return true;
}
- $updateOccurence = stripos ($sql, "UPDATE");
- if ($updateOccurence !== false && $updateOccurence < 10) {
+ $updateOccurrence = stripos($sql, 'UPDATE');
+ if ($updateOccurrence !== false && $updateOccurrence < 10) {
return true;
}
- $deleteOccurance = stripos ($sql, "DELETE");
- if ($deleteOccurance !== false && $deleteOccurance < 10) {
+ $deleteOccurrence = stripos($sql, 'DELETE');
+ if ($deleteOccurrence !== false && $deleteOccurrence < 10) {
return true;
}
return false;
@@ -309,7 +249,7 @@ class OC_DB {
static public function executeAudited( $stmt, array $parameters = null) {
if (is_string($stmt)) {
// convert to an array with 'sql'
- if (stripos($stmt,'LIMIT') !== false) { //OFFSET requires LIMIT, se we only neet to check for LIMIT
+ if (stripos($stmt, 'LIMIT') !== false) { //OFFSET requires LIMIT, so we only need to check for LIMIT
// TODO try to convert LIMIT OFFSET notation to parameters, see fixLimitClauseForMSSQL
$message = 'LIMIT and OFFSET are forbidden for portability reasons,'
. ' pass an array with \'limit\' and \'offset\' instead';
@@ -317,7 +257,7 @@ class OC_DB {
}
$stmt = array('sql' => $stmt, 'limit' => null, 'offset' => null);
}
- if (is_array($stmt)){
+ if (is_array($stmt)) {
// convert to prepared statement
if ( ! array_key_exists('sql', $stmt) ) {
$message = 'statement array must at least contain key \'sql\'';
@@ -359,55 +299,49 @@ class OC_DB {
*/
public static function insertid($table=null) {
self::connect();
- $type = OC_Config::getValue( "dbtype", "sqlite" );
- if( $type === 'pgsql' ) {
- $result = self::executeAudited('SELECT lastval() AS id');
- $row = $result->fetchRow();
- self::raiseExceptionOnError($row, 'fetching row for insertid failed');
- return (int)$row['id'];
- } else if( $type === 'mssql') {
- if($table !== null) {
- $prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
- $table = str_replace( '*PREFIX*', $prefix, $table );
- }
- return self::$connection->lastInsertId($table);
- }
- if( $type === 'oci' ) {
- if($table !== null) {
- $prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
- $suffix = '_SEQ';
- $table = '"'.str_replace( '*PREFIX*', $prefix, $table ).$suffix.'"';
- }
- return self::$connection->lastInsertId($table);
- } else {
- if($table !== null) {
- $prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
- $suffix = OC_Config::getValue( "dbsequencesuffix", "_id_seq" );
- $table = str_replace( '*PREFIX*', $prefix, $table ).$suffix;
- }
- $result = self::$connection->lastInsertId($table);
- }
- self::raiseExceptionOnError($result, 'insertid failed');
- return (int)$result;
+ return self::$connection->lastInsertId($table);
+ }
+
+ /**
+ * @brief Insert a row if a matching row doesn't exists.
+ * @param string $table. The table to insert into in the form '*PREFIX*tableName'
+ * @param array $input. An array of fieldname/value pairs
+ * @return int number of updated rows
+ */
+ public static function insertIfNotExist($table, $input) {
+ self::connect();
+ return self::$connection->insertIfNotExist($table, $input);
+ }
+
+ /**
+ * Start a transaction
+ */
+ public static function beginTransaction() {
+ self::connect();
+ self::$connection->beginTransaction();
+ }
+
+ /**
+ * Commit the database changes done during a transaction that is in progress
+ */
+ public static function commit() {
+ self::connect();
+ self::$connection->commit();
}
/**
* @brief Disconnect
- * @return bool
*
* This is good bye, good bye, yeah!
*/
public static function disconnect() {
// Cut connection if required
if(self::$connection) {
- self::$connection=false;
- self::$DOCTRINE=false;
+ self::$connection->close();
}
-
- return true;
}
- /** else {
+ /**
* @brief saves database schema to xml file
* @param string $file name of file
* @param int $mode
@@ -415,7 +349,7 @@ class OC_DB {
*
* TODO: write more documentation
*/
- public static function getDbStructure( $file, $mode=MDB2_SCHEMA_DUMP_STRUCTURE) {
+ public static function getDbStructure( $file, $mode = 0) {
$schemaManager = self::getMDB2SchemaManager();
return $schemaManager->getDbStructure($file);
}
@@ -451,172 +385,6 @@ class OC_DB {
}
/**
- * @brief Insert a row if a matching row doesn't exists.
- * @param string $table. The table to insert into in the form '*PREFIX*tableName'
- * @param array $input. An array of fieldname/value pairs
- * @returns int number of updated rows
- */
- public static function insertIfNotExist($table, $input) {
- self::connect();
- $prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
- $table = str_replace( '*PREFIX*', $prefix, $table );
-
- if(is_null(self::$type)) {
- self::$type=OC_Config::getValue( "dbtype", "sqlite" );
- }
- $type = self::$type;
-
- $query = '';
- $inserts = array_values($input);
- // differences in escaping of table names ('`' for mysql) and getting the current timestamp
- if( $type == 'sqlite' || $type == 'sqlite3' ) {
- // NOTE: For SQLite we have to use this clumsy approach
- // otherwise all fieldnames used must have a unique key.
- $query = 'SELECT * FROM `' . $table . '` WHERE ';
- foreach($input as $key => $value) {
- $query .= '`' . $key . '` = ? AND ';
- }
- $query = substr($query, 0, strlen($query) - 5);
- try {
- $result = self::executeAudited($query, $inserts);
- } catch(DatabaseException $e) {
- OC_Template::printExceptionErrorPage( $e );
- }
-
- if((int)$result->numRows() === 0) {
- $query = 'INSERT INTO `' . $table . '` (`'
- . implode('`,`', array_keys($input)) . '`) VALUES('
- . str_repeat('?,', count($input)-1).'? ' . ')';
- } else {
- return 0; //no rows updated
- }
- } elseif( $type == 'pgsql' || $type == 'oci' || $type == 'mysql' || $type == 'mssql') {
- $query = 'INSERT INTO `' .$table . '` (`'
- . implode('`,`', array_keys($input)) . '`) SELECT '
- . str_repeat('?,', count($input)-1).'? ' // Is there a prettier alternative?
- . 'FROM `' . $table . '` WHERE ';
-
- foreach($input as $key => $value) {
- $query .= '`' . $key . '` = ? AND ';
- }
- $query = substr($query, 0, strlen($query) - 5);
- $query .= ' HAVING COUNT(*) = 0';
- $inserts = array_merge($inserts, $inserts);
- }
-
- try {
- $result = self::executeAudited($query, $inserts);
- } catch(\Doctrine\DBAL\DBALException $e) {
- OC_Template::printExceptionErrorPage( $e );
- }
-
- return $result;
- }
-
- /**
- * @brief does minor changes to query
- * @param string $query Query string
- * @return string corrected query string
- *
- * This function replaces *PREFIX* with the value of $CONFIG_DBTABLEPREFIX
- * and replaces the ` with ' or " according to the database driver.
- */
- private static function processQuery( $query ) {
- self::connect();
- // We need Database type and table prefix
- if(is_null(self::$type)) {
- self::$type=OC_Config::getValue( "dbtype", "sqlite" );
- }
- $type = self::$type;
- if(is_null(self::$prefix)) {
- self::$prefix=OC_Config::getValue( "dbtableprefix", "oc_" );
- }
- $prefix = self::$prefix;
-
- // differences in escaping of table names ('`' for mysql) and getting the current timestamp
- if( $type == 'sqlite' || $type == 'sqlite3' ) {
- $query = str_replace( '`', '"', $query );
- $query = str_ireplace( 'NOW()', 'datetime(\'now\')', $query );
- $query = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $query );
- } elseif( $type == 'pgsql' ) {
- $query = str_replace( '`', '"', $query );
- $query = str_ireplace( 'UNIX_TIMESTAMP()', 'cast(extract(epoch from current_timestamp) as integer)',
- $query );
- } elseif( $type == 'oci' ) {
- $query = str_replace( '`', '"', $query );
- $query = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
- $query = str_ireplace( 'UNIX_TIMESTAMP()', "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400", $query );
- }elseif( $type == 'mssql' ) {
- $query = preg_replace( "/\`(.*?)`/", "[$1]", $query );
- $query = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
- $query = str_replace( 'LENGTH(', 'LEN(', $query );
- $query = str_replace( 'SUBSTR(', 'SUBSTRING(', $query );
- $query = str_ireplace( 'UNIX_TIMESTAMP()', 'DATEDIFF(second,{d \'1970-01-01\'},GETDATE())', $query );
-
- $query = self::fixLimitClauseForMSSQL($query);
- }
-
- // replace table name prefix
- $query = str_replace( '*PREFIX*', $prefix, $query );
-
- return $query;
- }
-
- private static function fixLimitClauseForMSSQL($query) {
- $limitLocation = stripos ($query, "LIMIT");
-
- if ( $limitLocation === false ) {
- return $query;
- }
-
- // total == 0 means all results - not zero results
- //
- // First number is either total or offset, locate it by first space
- //
- $offset = substr ($query, $limitLocation + 5);
- $offset = substr ($offset, 0, stripos ($offset, ' '));
- $offset = trim ($offset);
-
- // check for another parameter
- if (stripos ($offset, ',') === false) {
- // no more parameters
- $offset = 0;
- $total = intval ($offset);
- } else {
- // found another parameter
- $offset = intval ($offset);
-
- $total = substr ($query, $limitLocation + 5);
- $total = substr ($total, stripos ($total, ','));
-
- $total = substr ($total, 0, stripos ($total, ' '));
- $total = intval ($total);
- }
-
- $query = trim (substr ($query, 0, $limitLocation));
-
- if ($offset == 0 && $total !== 0) {
- if (strpos($query, "SELECT") === false) {
- $query = "TOP {$total} " . $query;
- } else {
- $query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP '.$total, $query);
- }
- } else if ($offset > 0) {
- $query = preg_replace('/SELECT(\s*DISTINCT)?/Dsi', 'SELECT$1 TOP(10000000) ', $query);
- $query = 'SELECT *
- FROM (SELECT sub2.*, ROW_NUMBER() OVER(ORDER BY sub2.line2) AS line3
- FROM (SELECT 1 AS line2, sub1.* FROM (' . $query . ') AS sub1) as sub2) AS sub3';
-
- if ($total > 0) {
- $query .= ' WHERE line3 BETWEEN ' . ($offset + 1) . ' AND ' . ($offset + $total);
- } else {
- $query .= ' WHERE line3 > ' . $offset;
- }
- }
- return $query;
- }
-
- /**
* @brief drop a table
* @param string $tableName the table to drop
*/
@@ -644,22 +412,6 @@ class OC_DB {
}
/**
- * Start a transaction
- */
- public static function beginTransaction() {
- self::connect();
- self::$connection->beginTransaction();
- }
-
- /**
- * Commit the database changes done during a transaction that is in progress
- */
- public static function commit() {
- self::connect();
- self::$connection->commit();
- }
-
- /**
* check if a result is an error, works with Doctrine
* @param mixed $result
* @return bool
@@ -697,17 +449,9 @@ class OC_DB {
* @return string
*/
public static function getErrorMessage($error) {
- if (self::$backend==self::BACKEND_DOCTRINE and self::$DOCTRINE) {
- $msg = self::$DOCTRINE->errorCode() . ': ';
- $errorInfo = self::$DOCTRINE->errorInfo();
- if (is_array($errorInfo)) {
- $msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
- $msg .= 'Driver Code = '.$errorInfo[1] . ', ';
- $msg .= 'Driver Message = '.$errorInfo[2];
- }
- return $msg;
+ if (self::$connection) {
+ return self::$connection->getError();
}
-
return '';
}
@@ -715,9 +459,10 @@ class OC_DB {
* @param bool $enabled
*/
static public function enableCaching($enabled) {
- if (!$enabled) {
- self::$preparedQueries = array();
+ if ($enabled) {
+ self::$connection->enableQueryStatementCaching();
+ } else {
+ self::$connection->disableQueryStatementCaching();
}
- self::$cachingEnabled = $enabled;
}
}
diff --git a/lib/db/adapter.php b/lib/db/adapter.php
new file mode 100644
index 00000000000..6b31f37dd98
--- /dev/null
+++ b/lib/db/adapter.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\DB;
+
+/**
+ * This handles the way we use to write queries, into something that can be
+ * handled by the database abstraction layer.
+ */
+class Adapter {
+
+ /**
+ * @var \OC\DB\Connection $conn
+ */
+ protected $conn;
+
+ public function __construct($conn) {
+ $this->conn = $conn;
+ }
+
+ /**
+ * @param string $table name
+ * @return int id of last insert statement
+ */
+ public function lastInsertId($table) {
+ return $this->conn->realLastInsertId($table);
+ }
+
+ /**
+ * @param string $statement that needs to be changed so the db can handle it
+ * @return string changed statement
+ */
+ public function fixupStatement($statement) {
+ return $statement;
+ }
+
+ /**
+ * @brief insert the @input values when they do not exist yet
+ * @param string $table name
+ * @param array $input key->value pairs
+ * @return int count of inserted rows
+ */
+ public function insertIfNotExist($table, $input) {
+ $query = 'INSERT INTO `' .$table . '` (`'
+ . implode('`,`', array_keys($input)) . '`) SELECT '
+ . str_repeat('?,', count($input)-1).'? ' // Is there a prettier alternative?
+ . 'FROM `' . $table . '` WHERE ';
+
+ foreach($input as $key => $value) {
+ $query .= '`' . $key . '` = ? AND ';
+ }
+ $query = substr($query, 0, strlen($query) - 5);
+ $query .= ' HAVING COUNT(*) = 0';
+ $inserts = array_values($input);
+ $inserts = array_merge($inserts, $inserts);
+
+ try {
+ return $this->conn->executeUpdate($query, $inserts);
+ } catch(\Doctrine\DBAL\DBALException $e) {
+ $entry = 'DB Error: "'.$e->getMessage() . '"<br />';
+ $entry .= 'Offending command was: ' . $query.'<br />';
+ \OC_Log::write('core', $entry, \OC_Log::FATAL);
+ error_log('DB error: ' . $entry);
+ \OC_Template::printErrorPage( $entry );
+ }
+ }
+}
diff --git a/lib/db/adapteroci8.php b/lib/db/adapteroci8.php
new file mode 100644
index 00000000000..bc226e979ec
--- /dev/null
+++ b/lib/db/adapteroci8.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+namespace OC\DB;
+
+class AdapterOCI8 extends Adapter {
+ public function lastInsertId($table) {
+ if($table !== null) {
+ $suffix = '_SEQ';
+ $table = '"'.$table.$suffix.'"';
+ }
+ return $this->conn->realLastInsertId($table);
+ }
+
+ const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400";
+ public function fixupStatement($statement) {
+ $statement = str_replace( '`', '"', $statement );
+ $statement = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $statement );
+ $statement = str_ireplace( 'UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement );
+ return $statement;
+ }
+}
diff --git a/lib/db/adapterpgsql.php b/lib/db/adapterpgsql.php
new file mode 100644
index 00000000000..990d71c9f29
--- /dev/null
+++ b/lib/db/adapterpgsql.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+namespace OC\DB;
+
+class AdapterPgSql extends Adapter {
+ public function lastInsertId($table) {
+ return $this->conn->fetchColumn('SELECT lastval()');
+ }
+
+ const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)';
+ public function fixupStatement($statement) {
+ $statement = str_replace( '`', '"', $statement );
+ $statement = str_ireplace( 'UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement );
+ return $statement;
+ }
+}
diff --git a/lib/db/adaptersqlite.php b/lib/db/adaptersqlite.php
new file mode 100644
index 00000000000..fa6d308ae32
--- /dev/null
+++ b/lib/db/adaptersqlite.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+namespace OC\DB;
+
+class AdapterSqlite extends Adapter {
+ public function fixupStatement($statement) {
+ $statement = str_replace( '`', '"', $statement );
+ $statement = str_ireplace( 'NOW()', 'datetime(\'now\')', $statement );
+ $statement = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement );
+ return $statement;
+ }
+
+ public function insertIfNotExist($table, $input) {
+ // NOTE: For SQLite we have to use this clumsy approach
+ // otherwise all fieldnames used must have a unique key.
+ $query = 'SELECT COUNT(*) FROM `' . $table . '` WHERE ';
+ foreach($input as $key => $value) {
+ $query .= '`' . $key . '` = ? AND ';
+ }
+ $query = substr($query, 0, strlen($query) - 5);
+ try {
+ $stmt = $this->conn->prepare($query);
+ $result = $stmt->execute(array_values($input));
+ } catch(\Doctrine\DBAL\DBALException $e) {
+ $entry = 'DB Error: "'.$e->getMessage() . '"<br />';
+ $entry .= 'Offending command was: ' . $query . '<br />';
+ \OC_Log::write('core', $entry, \OC_Log::FATAL);
+ error_log('DB error: '.$entry);
+ \OC_Template::printErrorPage( $entry );
+ }
+
+ if ($stmt->fetchColumn() === '0') {
+ $query = 'INSERT INTO `' . $table . '` (`'
+ . implode('`,`', array_keys($input)) . '`) VALUES('
+ . str_repeat('?,', count($input)-1).'? ' . ')';
+ } else {
+ return 0; //no rows updated
+ }
+
+ try {
+ $statement = $this->conn->prepare($query);
+ $result = $statement->execute(array_values($input));
+ } catch(\Doctrine\DBAL\DBALException $e) {
+ $entry = 'DB Error: "'.$e->getMessage() . '"<br />';
+ $entry .= 'Offending command was: ' . $query.'<br />';
+ \OC_Log::write('core', $entry, \OC_Log::FATAL);
+ error_log('DB error: ' . $entry);
+ \OC_Template::printErrorPage( $entry );
+ }
+
+ return $result;
+ }
+}
diff --git a/lib/db/adaptersqlsrv.php b/lib/db/adaptersqlsrv.php
new file mode 100644
index 00000000000..d0a67af28a7
--- /dev/null
+++ b/lib/db/adaptersqlsrv.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+
+namespace OC\DB;
+
+class AdapterSQLSrv extends Adapter {
+ public function lastInsertId($table) {
+ if($table !== null) {
+ $table = $this->conn->replaceTablePrefix( $table );
+ }
+ return $this->conn->lastInsertId($table);
+ }
+
+ public function fixupStatement($statement) {
+ $statement = preg_replace( "/\`(.*?)`/", "[$1]", $statement );
+ $statement = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $statement );
+ $statement = str_replace( 'LENGTH(', 'LEN(', $statement );
+ $statement = str_replace( 'SUBSTR(', 'SUBSTRING(', $statement );
+ $statement = str_ireplace( 'UNIX_TIMESTAMP()', 'DATEDIFF(second,{d \'1970-01-01\'},GETDATE())', $statement );
+ return $statement;
+ }
+}
diff --git a/lib/db/connection.php b/lib/db/connection.php
new file mode 100644
index 00000000000..2581969dbd0
--- /dev/null
+++ b/lib/db/connection.php
@@ -0,0 +1,197 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\DB;
+use Doctrine\DBAL\Driver;
+use Doctrine\DBAL\Configuration;
+use Doctrine\DBAL\Cache\QueryCacheProfile;
+use Doctrine\Common\EventManager;
+
+class Connection extends \Doctrine\DBAL\Connection {
+ /**
+ * @var string $tablePrefix
+ */
+ protected $tablePrefix;
+
+ /**
+ * @var \OC\DB\Adapter $adapter
+ */
+ protected $adapter;
+
+ /**
+ * @var \Doctrine\DBAL\Driver\Statement[] $preparedQueries
+ */
+ protected $preparedQueries = array();
+
+ protected $cachingQueryStatementEnabled = true;
+
+ /**
+ * Initializes a new instance of the Connection class.
+ *
+ * @param array $params The connection parameters.
+ * @param \Doctrine\DBAL\Driver $driver
+ * @param \Doctrine\DBAL\Configuration $config
+ * @param \Doctrine\Common\EventManager $eventManager
+ * @throws \Exception
+ */
+ public function __construct(array $params, Driver $driver, Configuration $config = null,
+ EventManager $eventManager = null)
+ {
+ if (!isset($params['adapter'])) {
+ throw new \Exception('adapter not set');
+ }
+ if (!isset($params['tablePrefix'])) {
+ throw new \Exception('tablePrefix not set');
+ }
+ parent::__construct($params, $driver, $config, $eventManager);
+ $this->adapter = new $params['adapter']($this);
+ $this->tablePrefix = $params['tablePrefix'];
+ }
+
+ /**
+ * Prepares an SQL statement.
+ *
+ * @param string $statement The SQL statement to prepare.
+ * @param int $limit
+ * @param int $offset
+ * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
+ */
+ public function prepare( $statement, $limit=null, $offset=null ) {
+ if ($limit === -1) {
+ $limit = null;
+ }
+ if (!is_null($limit)) {
+ $platform = $this->getDatabasePlatform();
+ $statement = $platform->modifyLimitQuery($statement, $limit, $offset);
+ } else {
+ if (isset($this->preparedQueries[$statement]) && $this->cachingQueryStatementEnabled) {
+ return $this->preparedQueries[$statement];
+ }
+ $origStatement = $statement;
+ }
+ $statement = $this->replaceTablePrefix($statement);
+ $statement = $this->adapter->fixupStatement($statement);
+
+ if(\OC_Config::getValue( 'log_query', false)) {
+ \OC_Log::write('core', 'DB prepare : '.$statement, \OC_Log::DEBUG);
+ }
+ $result = parent::prepare($statement);
+ if (is_null($limit) && $this->cachingQueryStatementEnabled) {
+ $this->preparedQueries[$origStatement] = $result;
+ }
+ return $result;
+ }
+
+ /**
+ * Executes an, optionally parameterized, SQL query.
+ *
+ * If the query is parameterized, a prepared statement is used.
+ * If an SQLLogger is configured, the execution is logged.
+ *
+ * @param string $query The SQL query to execute.
+ * @param array $params The parameters to bind to the query, if any.
+ * @param array $types The types the previous parameters are in.
+ * @param QueryCacheProfile $qcp
+ * @return \Doctrine\DBAL\Driver\Statement The executed statement.
+ * @internal PERF: Directly prepares a driver statement, not a wrapper.
+ */
+ public function executeQuery($query, array $params = array(), $types = array(), QueryCacheProfile $qcp = null)
+ {
+ $query = $this->replaceTablePrefix($query);
+ $query = $this->adapter->fixupStatement($query);
+ return parent::executeQuery($query, $params, $types, $qcp);
+ }
+
+ /**
+ * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
+ * and returns the number of affected rows.
+ *
+ * This method supports PDO binding types as well as DBAL mapping types.
+ *
+ * @param string $query The SQL query.
+ * @param array $params The query parameters.
+ * @param array $types The parameter types.
+ * @return integer The number of affected rows.
+ * @internal PERF: Directly prepares a driver statement, not a wrapper.
+ */
+ public function executeUpdate($query, array $params = array(), array $types = array())
+ {
+ $query = $this->replaceTablePrefix($query);
+ $query = $this->adapter->fixupStatement($query);
+ return parent::executeUpdate($query, $params, $types);
+ }
+
+ /**
+ * Returns the ID of the last inserted row, or the last value from a sequence object,
+ * depending on the underlying driver.
+ *
+ * Note: This method may not return a meaningful or consistent result across different drivers,
+ * because the underlying database may not even support the notion of AUTO_INCREMENT/IDENTITY
+ * columns or sequences.
+ *
+ * @param string $seqName Name of the sequence object from which the ID should be returned.
+ * @return string A string representation of the last inserted ID.
+ */
+ public function lastInsertId($seqName = null)
+ {
+ if ($seqName) {
+ $seqName = $this->replaceTablePrefix($seqName);
+ }
+ return $this->adapter->lastInsertId($seqName);
+ }
+
+ // internal use
+ public function realLastInsertId($seqName = null)
+ {
+ return parent::lastInsertId($seqName);
+ }
+
+ /**
+ * @brief Insert a row if a matching row doesn't exists.
+ * @param string $table. The table to insert into in the form '*PREFIX*tableName'
+ * @param array $input. An array of fieldname/value pairs
+ * @return bool The return value from execute()
+ */
+ public function insertIfNotExist($table, $input) {
+ return $this->adapter->insertIfNotExist($table, $input);
+ }
+
+ /**
+ * returns the error code and message as a string for logging
+ * works with DoctrineException
+ * @return string
+ */
+ public function getError() {
+ $msg = $this->errorCode() . ': ';
+ $errorInfo = $this->errorInfo();
+ if (is_array($errorInfo)) {
+ $msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
+ $msg .= 'Driver Code = '.$errorInfo[1] . ', ';
+ $msg .= 'Driver Message = '.$errorInfo[2];
+ }
+ return $msg;
+ }
+
+ // internal use
+ /**
+ * @param string $statement
+ * @return string
+ */
+ protected function replaceTablePrefix($statement) {
+ return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
+ }
+
+ public function enableQueryStatementCaching() {
+ $this->cachingQueryStatementEnabled = true;
+ }
+
+ public function disableQueryStatementCaching() {
+ $this->cachingQueryStatementEnabled = false;
+ $this->preparedQueries = array();
+ }
+}
diff --git a/lib/db/mdb2schemamanager.php b/lib/db/mdb2schemamanager.php
index a34bc9dae75..8e76f46c78f 100644
--- a/lib/db/mdb2schemamanager.php
+++ b/lib/db/mdb2schemamanager.php
@@ -10,12 +10,12 @@ namespace OC\DB;
class MDB2SchemaManager {
/**
- * @var \Doctrine\DBAL\Connection $conn
+ * @var \OC\DB\Connection $conn
*/
protected $conn;
/**
- * @param \Doctrine\DBAL\Connection $conn
+ * @param \OC\DB\Connection $conn
*/
public function __construct($conn) {
$this->conn = $conn;
@@ -95,7 +95,7 @@ class MDB2SchemaManager {
$toSchema = clone $fromSchema;
$toSchema->dropTable($tableName);
$sql = $fromSchema->getMigrateToSql($toSchema, $this->conn->getDatabasePlatform());
- $this->conn->execute($sql);
+ $this->conn->executeQuery($sql);
}
/**
@@ -122,7 +122,7 @@ class MDB2SchemaManager {
$apps = \OC_App::getAllApps();
$this->conn->beginTransaction();
// Delete the old tables
- $this->removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
+ $this->removeDBStructure( \OC::$SERVERROOT . '/db_structure.xml' );
foreach($apps as $app) {
$path = \OC_App::getAppPath($app).'/appinfo/database.xml';
diff --git a/lib/db/statementwrapper.php b/lib/db/statementwrapper.php
index f7bc45e068f..b8da1afc0e5 100644
--- a/lib/db/statementwrapper.php
+++ b/lib/db/statementwrapper.php
@@ -53,7 +53,7 @@ class OC_DB_StatementWrapper {
*/
public function execute($input=array()) {
if(OC_Config::getValue( "log_query", false)) {
- $params_str = str_replace("\n"," ",var_export($input,true));
+ $params_str = str_replace("\n", " ", var_export($input, true));
OC_Log::write('core', 'DB execute with arguments : '.$params_str, OC_Log::DEBUG);
}
$this->lastArguments = $input;
@@ -134,7 +134,7 @@ class OC_DB_StatementWrapper {
$host = OC_Config::getValue( "dbhost", "" );
$user = OC_Config::getValue( "dbuser", "" );
$pass = OC_Config::getValue( "dbpassword", "" );
- if (strpos($host,':')) {
+ if (strpos($host, ':')) {
list($host, $port) = explode(':', $host, 2);
} else {
$port = false;
diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
deleted file mode 100644
index 3dac3264fbe..00000000000
--- a/lib/fileproxy/quota.php
+++ /dev/null
@@ -1,114 +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/>.
-*
-*/
-
-/**
- * user quota management
- */
-
-class OC_FileProxy_Quota extends OC_FileProxy{
- static $rootView;
- private $userQuota=array();
-
- /**
- * get the quota for the user
- * @param user
- * @return int
- */
- private function getQuota($user) {
- if(in_array($user, $this->userQuota)) {
- return $this->userQuota[$user];
- }
- $userQuota=OC_Preferences::getValue($user, 'files', 'quota', 'default');
- if($userQuota=='default') {
- $userQuota=OC_AppConfig::getValue('files', 'default_quota', 'none');
- }
- if($userQuota=='none') {
- $this->userQuota[$user]=-1;
- }else{
- $this->userQuota[$user]=OC_Helper::computerFileSize($userQuota);
- }
- return $this->userQuota[$user];
-
- }
-
- /**
- * get the free space in the path's owner home folder
- * @param path
- * @return int
- */
- private function getFreeSpace($path) {
- /**
- * @var \OC\Files\Storage\Storage $storage
- * @var string $internalPath
- */
- list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($path);
- $owner = $storage->getOwner($internalPath);
- if (!$owner) {
- return -1;
- }
-
- $totalSpace = $this->getQuota($owner);
- if($totalSpace == -1) {
- return -1;
- }
-
- $view = new \OC\Files\View("/".$owner."/files");
-
- $rootInfo = $view->getFileInfo('/');
- $usedSpace = isset($rootInfo['size'])?$rootInfo['size']:0;
- return $totalSpace - $usedSpace;
- }
-
- public function postFree_space($path, $space) {
- $free=$this->getFreeSpace($path);
- if($free==-1) {
- return $space;
- }
- if ($space < 0){
- return $free;
- }
- return min($free, $space);
- }
-
- public function preFile_put_contents($path, $data) {
- if (is_resource($data)) {
- $data = '';//TODO: find a way to get the length of the stream without emptying it
- }
- return (strlen($data)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==-1);
- }
-
- public function preCopy($path1, $path2) {
- if(!self::$rootView) {
- self::$rootView = new \OC\Files\View('');
- }
- return (self::$rootView->filesize($path1)<$this->getFreeSpace($path2) or $this->getFreeSpace($path2)==-1);
- }
-
- public function preFromTmpFile($tmpfile, $path) {
- return (filesize($tmpfile)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==-1);
- }
-
- public function preFromUploadedFile($tmpfile, $path) {
- return (filesize($tmpfile)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==-1);
- }
-}
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index adecc2bb901..87fa7c1365a 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -159,7 +159,7 @@ class Scanner extends BasicEmitter {
$newChildren = array();
if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) {
\OC_DB::beginTransaction();
- while ($file = readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
$child = ($path) ? $path . '/' . $file : $file;
if (!Filesystem::isIgnoredDir($file)) {
$newChildren[] = $file;
@@ -184,7 +184,7 @@ class Scanner extends BasicEmitter {
}
\OC_DB::commit();
foreach ($childQueue as $child) {
- $childSize = $this->scanChildren($child, self::SCAN_RECURSIVE);
+ $childSize = $this->scanChildren($child, self::SCAN_RECURSIVE, $reuse);
if ($childSize === -1) {
$size = -1;
} else {
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index d6ebe7d629a..10ec5c41d11 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -31,8 +31,9 @@
namespace OC\Files;
use OC\Files\Storage\Loader;
-const FREE_SPACE_UNKNOWN = -2;
-const FREE_SPACE_UNLIMITED = -3;
+const SPACE_NOT_COMPUTED = -1;
+const SPACE_UNKNOWN = -2;
+const SPACE_UNLIMITED = -3;
class Filesystem {
/**
@@ -148,6 +149,18 @@ class Filesystem {
*/
private static $loader;
+ /**
+ * @param callable $wrapper
+ */
+ public static function addStorageWrapper($wrapper) {
+ self::getLoader()->addStorageWrapper($wrapper);
+
+ $mounts = self::getMountManager()->getAll();
+ foreach ($mounts as $mount) {
+ $mount->wrapStorage($wrapper);
+ }
+ }
+
public static function getLoader() {
if (!self::$loader) {
self::$loader = new Loader();
diff --git a/lib/files/mount/manager.php b/lib/files/mount/manager.php
index 25a5fe241cc..4c432dcf724 100644
--- a/lib/files/mount/manager.php
+++ b/lib/files/mount/manager.php
@@ -96,6 +96,13 @@ class Manager {
}
/**
+ * @return Mount[]
+ */
+ public function getAll() {
+ return $this->mounts;
+ }
+
+ /**
* Find mounts by numeric storage id
*
* @param string $id
diff --git a/lib/files/mount/mount.php b/lib/files/mount/mount.php
index 17b0055ee84..0ce2f5975c7 100644
--- a/lib/files/mount/mount.php
+++ b/lib/files/mount/mount.php
@@ -138,4 +138,11 @@ class Mount {
}
return $path;
}
+
+ /**
+ * @param callable $wrapper
+ */
+ public function wrapStorage($wrapper) {
+ $this->storage = $wrapper($this->mountPoint, $this->storage);
+ }
}
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 3da13ac4df0..01560f34fde 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -142,7 +142,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
return false;
} else {
$directoryHandle = $this->opendir($directory);
- while ($contents = readdir($directoryHandle)) {
+ while (($contents = readdir($directoryHandle)) !== false) {
if (!\OC\Files\Filesystem::isIgnoredDir($contents)) {
$path = $directory . '/' . $contents;
if ($this->is_dir($path)) {
@@ -225,7 +225,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
private function addLocalFolder($path, $target) {
if ($dh = $this->opendir($path)) {
- while ($file = readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if ($file !== '.' and $file !== '..') {
if ($this->is_dir($path . '/' . $file)) {
mkdir($target . '/' . $file);
@@ -243,7 +243,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
$files = array();
$dh = $this->opendir($dir);
if ($dh) {
- while ($item = readdir($dh)) {
+ while (($item = readdir($dh)) !== false) {
if ($item == '.' || $item == '..') continue;
if (strstr(strtolower($item), strtolower($query)) !== false) {
$files[] = $dir . '/' . $item;
@@ -366,6 +366,6 @@ abstract class Common implements \OC\Files\Storage\Storage {
* @return int
*/
public function free_space($path) {
- return \OC\Files\FREE_SPACE_UNKNOWN;
+ return \OC\Files\SPACE_UNKNOWN;
}
}
diff --git a/lib/files/storage/commontest.php b/lib/files/storage/commontest.php
index fbdb7fbf110..c3f1eb31955 100644
--- a/lib/files/storage/commontest.php
+++ b/lib/files/storage/commontest.php
@@ -77,4 +77,4 @@ class CommonTest extends \OC\Files\Storage\Common{
public function touch($path, $mtime=null) {
return $this->storage->touch($path, $mtime);
}
-} \ No newline at end of file
+}
diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index b08fd73ce19..5209fabc30a 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -265,7 +265,7 @@ if (\OC_Util::runningOnWindows()) {
public function free_space($path) {
$space = @disk_free_space($this->datadir . $path);
if ($space === false) {
- return \OC\Files\FREE_SPACE_UNKNOWN;
+ return \OC\Files\SPACE_UNKNOWN;
}
return $space;
}
diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php
index cf5d9b3ef4f..fbf1b4ebf96 100644
--- a/lib/files/storage/mappedlocal.php
+++ b/lib/files/storage/mappedlocal.php
@@ -65,7 +65,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
$logicalPath = $this->mapper->physicalToLogic($physicalPath);
$dh = opendir($physicalPath);
- while ($file = readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if ($file === '.' or $file === '..') {
continue;
}
diff --git a/lib/files/storage/wrapper/quota.php b/lib/files/storage/wrapper/quota.php
new file mode 100644
index 00000000000..e2da8cf2e05
--- /dev/null
+++ b/lib/files/storage/wrapper/quota.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright (c) 2013 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 OC\Files\Storage\Wrapper;
+
+class Quota extends Wrapper {
+
+ /**
+ * @var int $quota
+ */
+ protected $quota;
+
+ /**
+ * @param array $parameters
+ */
+ public function __construct($parameters) {
+ $this->storage = $parameters['storage'];
+ $this->quota = $parameters['quota'];
+ }
+
+ protected function getSize($path) {
+ $cache = $this->getCache();
+ $data = $cache->get($path);
+ if (is_array($data) and isset($data['size'])) {
+ return $data['size'];
+ } else {
+ return \OC\Files\SPACE_NOT_COMPUTED;
+ }
+ }
+
+ /**
+ * Get free space as limited by the quota
+ *
+ * @param string $path
+ * @return int
+ */
+ public function free_space($path) {
+ if ($this->quota < 0) {
+ return $this->storage->free_space($path);
+ } else {
+ $used = $this->getSize('');
+ if ($used < 0) {
+ return \OC\Files\SPACE_NOT_COMPUTED;
+ } else {
+ $free = $this->storage->free_space($path);
+ return min($free, (max($this->quota - $used, 0)));
+ }
+ }
+ }
+
+ /**
+ * see http://php.net/manual/en/function.file_put_contents.php
+ *
+ * @param string $path
+ * @param string $data
+ * @return bool
+ */
+ public function file_put_contents($path, $data) {
+ $free = $this->free_space('');
+ if ($free < 0 or strlen($data) < $free) {
+ return $this->storage->file_put_contents($path, $data);
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * see http://php.net/manual/en/function.copy.php
+ *
+ * @param string $source
+ * @param string $target
+ * @return bool
+ */
+ public function copy($source, $target) {
+ $free = $this->free_space('');
+ if ($free < 0 or $this->getSize($source) < $free) {
+ return $this->storage->copy($source, $target);
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * see http://php.net/manual/en/function.fopen.php
+ *
+ * @param string $path
+ * @param string $mode
+ * @return resource
+ */
+ public function fopen($path, $mode) {
+ $source = $this->storage->fopen($path, $mode);
+ $free = $this->free_space('');
+ if ($free >= 0) {
+ return \OC\Files\Stream\Quota::wrap($source, $free);
+ } else {
+ return $source;
+ }
+ }
+}
diff --git a/lib/files/storage/wrapper/wrapper.php b/lib/files/storage/wrapper/wrapper.php
index 4feb0520f12..0336c27efa1 100644
--- a/lib/files/storage/wrapper/wrapper.php
+++ b/lib/files/storage/wrapper/wrapper.php
@@ -395,7 +395,7 @@ class Wrapper implements \OC\Files\Storage\Storage {
* @return \OC\Files\Cache\Permissions
*/
public function getPermissionsCache($path = '') {
- return $this->storage->getPermissions($path);
+ return $this->storage->getPermissionsCache($path);
}
/**
diff --git a/lib/files/stream/quota.php b/lib/files/stream/quota.php
new file mode 100644
index 00000000000..53d8a03d30f
--- /dev/null
+++ b/lib/files/stream/quota.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright (c) 2013 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 OC\Files\Stream;
+
+/**
+ * stream wrapper limits the amount of data that can be written to a stream
+ *
+ * usage: void \OC\Files\Stream\Quota::register($id, $stream, $limit)
+ * or: resource \OC\Files\Stream\Quota::wrap($stream, $limit)
+ */
+class Quota {
+ private static $streams = array();
+
+ /**
+ * @var resource $source
+ */
+ private $source;
+
+ /**
+ * @var int $limit
+ */
+ private $limit;
+
+ /**
+ * @param string $id
+ * @param resource $stream
+ * @param int $limit
+ */
+ public static function register($id, $stream, $limit) {
+ self::$streams[$id] = array($stream, $limit);
+ }
+
+ /**
+ * remove all registered streams
+ */
+ public static function clear() {
+ self::$streams = array();
+ }
+
+ /**
+ * @param resource $stream
+ * @param int $limit
+ * @return resource
+ */
+ static public function wrap($stream, $limit) {
+ $id = uniqid();
+ self::register($id, $stream, $limit);
+ $meta = stream_get_meta_data($stream);
+ return fopen('quota://' . $id, $meta['mode']);
+ }
+
+ public function stream_open($path, $mode, $options, &$opened_path) {
+ $id = substr($path, strlen('quota://'));
+ if (isset(self::$streams[$id])) {
+ list($this->source, $this->limit) = self::$streams[$id];
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public function stream_seek($offset, $whence = SEEK_SET) {
+ if ($whence === SEEK_SET) {
+ $this->limit += $this->stream_tell() - $offset;
+ } else {
+ $this->limit -= $offset;
+ }
+ fseek($this->source, $offset, $whence);
+ }
+
+ public function stream_tell() {
+ return ftell($this->source);
+ }
+
+ public function stream_read($count) {
+ $this->limit -= $count;
+ return fread($this->source, $count);
+ }
+
+ public function stream_write($data) {
+ $size = strlen($data);
+ if ($size > $this->limit) {
+ $data = substr($data, 0, $this->limit);
+ $size = $this->limit;
+ }
+ $this->limit -= $size;
+ return fwrite($this->source, $data);
+ }
+
+ 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);
+ }
+
+ public function stream_close() {
+ fclose($this->source);
+ }
+}
diff --git a/lib/files/type/detection.php b/lib/files/type/detection.php
new file mode 100644
index 00000000000..242a81cb5a4
--- /dev/null
+++ b/lib/files/type/detection.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright (c) 2013 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 OC\Files\Type;
+
+/**
+ * Class Detection
+ *
+ * Mimetype detection
+ *
+ * @package OC\Files\Type
+ */
+class Detection {
+ protected $mimetypes = array();
+
+ /**
+ * add an extension -> mimetype mapping
+ *
+ * @param string $extension
+ * @param string $mimetype
+ */
+ public function registerType($extension, $mimetype) {
+ $this->mimetypes[$extension] = $mimetype;
+ }
+
+ /**
+ * add an array of extension -> mimetype mappings
+ *
+ * @param array $types
+ */
+ public function registerTypeArray($types) {
+ $this->mimetypes = array_merge($this->mimetypes, $types);
+ }
+
+ /**
+ * detect mimetype only based on filename, content of file is not used
+ *
+ * @param string $path
+ * @return string
+ */
+ public function detectPath($path) {
+ if (strpos($path, '.')) {
+ //try to guess the type by the file extension
+ $extension = strtolower(strrchr(basename($path), "."));
+ $extension = substr($extension, 1); //remove leading .
+ return (isset($this->mimetypes[$extension])) ? $this->mimetypes[$extension] : 'application/octet-stream';
+ } else {
+ return 'application/octet-stream';
+ }
+ }
+
+ /**
+ * detect mimetype based on both filename and content
+ *
+ * @param string $path
+ * @return string
+ */
+ public function detect($path) {
+ $isWrapped = (strpos($path, '://') !== false) and (substr($path, 0, 7) === 'file://');
+
+ if (@is_dir($path)) {
+ // directories are easy
+ return "httpd/unix-directory";
+ }
+
+ $mimeType = $this->detectPath($path);
+
+ if ($mimeType === 'application/octet-stream' and function_exists('finfo_open')
+ and function_exists('finfo_file') and $finfo = finfo_open(FILEINFO_MIME)
+ ) {
+ $info = @strtolower(finfo_file($finfo, $path));
+ if ($info) {
+ $mimeType = substr($info, 0, strpos($info, ';'));
+ }
+ finfo_close($finfo);
+ }
+ if (!$isWrapped and $mimeType === 'application/octet-stream' && function_exists("mime_content_type")) {
+ // use mime magic extension if available
+ $mimeType = mime_content_type($path);
+ }
+ if (!$isWrapped and $mimeType === 'application/octet-stream' && \OC_Helper::canExecute("file")) {
+ // it looks like we have a 'file' command,
+ // lets see if it does have mime support
+ $path = escapeshellarg($path);
+ $fp = popen("file -b --mime-type $path 2>/dev/null", "r");
+ $reply = fgets($fp);
+ pclose($fp);
+
+ //trim the newline
+ $mimeType = trim($reply);
+
+ }
+ return $mimeType;
+ }
+
+ /**
+ * detect mimetype based on the content of a string
+ *
+ * @param string $data
+ * @return string
+ */
+ public function detectString($data) {
+ if (function_exists('finfo_open') and function_exists('finfo_file')) {
+ $finfo = finfo_open(FILEINFO_MIME);
+ return finfo_buffer($finfo, $data);
+ } else {
+ $tmpFile = \OC_Helper::tmpFile();
+ $fh = fopen($tmpFile, 'wb');
+ fwrite($fh, $data, 8024);
+ fclose($fh);
+ $mime = $this->detect($tmpFile);
+ unset($tmpFile);
+ return $mime;
+ }
+ }
+}
diff --git a/lib/files/type/templatemanager.php b/lib/files/type/templatemanager.php
new file mode 100644
index 00000000000..cd1536d2732
--- /dev/null
+++ b/lib/files/type/templatemanager.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright (c) 2013 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 OC\Files\Type;
+
+class TemplateManager {
+ protected $templates = array();
+
+ public function registerTemplate($mimetype, $path) {
+ $this->templates[$mimetype] = $path;
+ }
+
+ /**
+ * get the path of the template for a mimetype
+ *
+ * @param string $mimetype
+ * @return string | null
+ */
+ public function getTemplatePath($mimetype) {
+ if (isset($this->templates[$mimetype])) {
+ return $this->templates[$mimetype];
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * get the template content for a mimetype
+ *
+ * @param string $mimetype
+ * @return string
+ */
+ public function getTemplate($mimetype) {
+ $path = $this->getTemplatePath($mimetype);
+ if ($path) {
+ return file_get_contents($path);
+ } else {
+ return '';
+ }
+ }
+}
diff --git a/lib/files/view.php b/lib/files/view.php
index c9727fe4984..bb737f19ef8 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -499,7 +499,7 @@ class View {
} else {
if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) {
$result = $this->mkdir($path2);
- while ($file = readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if (!Filesystem::isIgnoredDir($file)) {
$result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file);
}
diff --git a/lib/geo.php b/lib/geo.php
index 4eb785da355..ed01ad0b616 100644
--- a/lib/geo.php
+++ b/lib/geo.php
@@ -28,4 +28,4 @@ class OC_Geo{
reset($variances);
return current($variances);
}
-} \ No newline at end of file
+}
diff --git a/lib/group.php b/lib/group.php
index 8fbf5f86418..ba93dc129a1 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -230,7 +230,7 @@ class OC_Group {
public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
$group = self::getManager()->get($gid);
if ($group) {
- $users = $group->searchUsers($search . $limit, $offset);
+ $users = $group->searchUsers($search, $limit, $offset);
$userIds = array();
foreach ($users as $user) {
$userIds[] = $user->getUID();
diff --git a/lib/helper.php b/lib/helper.php
index ca508e1d933..1024a570e36 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -25,9 +25,10 @@
* Collection of useful functions
*/
class OC_Helper {
- private static $mimetypes=array();
- private static $tmpFiles=array();
+ private static $tmpFiles = array();
private static $mimetypeIcons = array();
+ private static $mimetypeDetector;
+ private static $templateManager;
/**
* @brief Creates an url using a defined route
@@ -39,7 +40,7 @@ class OC_Helper {
*
* Returns a url to the given app and file.
*/
- public static function linkToRoute( $route, $parameters = array() ) {
+ public static function linkToRoute($route, $parameters = array()) {
$urlLinkTo = OC::getRouter()->generate($route, $parameters);
return $urlLinkTo;
}
@@ -49,7 +50,7 @@ class OC_Helper {
* @param string $app app
* @param string $file file
* @param array $args array with param=>value, will be appended to the returned url
- * The value of $args will be urlencoded
+ * The value of $args will be urlencoded
* @return string the url
*
* Returns a url to the given app and file.
@@ -58,29 +59,26 @@ class OC_Helper {
if( $app != '' ) {
$app_path = OC_App::getAppPath($app);
// Check if the app is in the app folder
- if( $app_path && file_exists( $app_path.'/'.$file )) {
- if(substr($file, -3) == 'php' || substr($file, -3) == 'css') {
- $urlLinkTo = OC::$WEBROOT . '/index.php/apps/' . $app;
- $urlLinkTo .= ($file!='index.php') ? '/' . $file : '';
- }else{
- $urlLinkTo = OC_App::getAppWebPath($app) . '/' . $file;
+ if ($app_path && file_exists($app_path . '/' . $file)) {
+ if (substr($file, -3) == 'php' || substr($file, -3) == 'css') {
+ $urlLinkTo = OC::$WEBROOT . '/index.php/apps/' . $app;
+ $urlLinkTo .= ($file != 'index.php') ? '/' . $file : '';
+ } else {
+ $urlLinkTo = OC_App::getAppWebPath($app) . '/' . $file;
}
+ } else {
+ $urlLinkTo = OC::$WEBROOT . '/' . $app . '/' . $file;
}
- else{
- $urlLinkTo = OC::$WEBROOT . '/' . $app . '/' . $file;
- }
- }
- else{
- if( file_exists( OC::$SERVERROOT . '/core/'. $file )) {
- $urlLinkTo = OC::$WEBROOT . '/core/'.$file;
- }
- else{
- $urlLinkTo = OC::$WEBROOT . '/'.$file;
+ } else {
+ if (file_exists(OC::$SERVERROOT . '/core/' . $file)) {
+ $urlLinkTo = OC::$WEBROOT . '/core/' . $file;
+ } else {
+ $urlLinkTo = OC::$WEBROOT . '/' . $file;
}
}
if ($args && $query = http_build_query($args, '', '&')) {
- $urlLinkTo .= '?'.$query;
+ $urlLinkTo .= '?' . $query;
}
return $urlLinkTo;
@@ -91,13 +89,13 @@ class OC_Helper {
* @param string $app app
* @param string $file file
* @param array $args array with param=>value, will be appended to the returned url
- * The value of $args will be urlencoded
+ * The value of $args will be urlencoded
* @return string the url
*
* Returns a absolute url to the given app and file.
*/
- public static function linkToAbsolute( $app, $file, $args = array() ) {
- $urlLinkTo = self::linkTo( $app, $file, $args );
+ public static function linkToAbsolute($app, $file, $args = array()) {
+ $urlLinkTo = self::linkTo($app, $file, $args);
return self::makeURLAbsolute($urlLinkTo);
}
@@ -108,9 +106,8 @@ class OC_Helper {
*
* Returns a absolute url to the given app and file.
*/
- public static function makeURLAbsolute( $url )
- {
- return OC_Request::serverProtocol(). '://' . OC_Request::serverHost() . $url;
+ public static function makeURLAbsolute($url) {
+ return OC_Request::serverProtocol() . '://' . OC_Request::serverHost() . $url;
}
/**
@@ -120,8 +117,8 @@ class OC_Helper {
*
* Returns a url to the given service.
*/
- public static function linkToRemoteBase( $service ) {
- return self::linkTo( '', 'remote.php') . '/' . $service;
+ public static function linkToRemoteBase($service) {
+ return self::linkTo('', 'remote.php') . '/' . $service;
}
/**
@@ -132,9 +129,9 @@ class OC_Helper {
*
* Returns a absolute url to the given service.
*/
- public static function linkToRemote( $service, $add_slash = true ) {
+ public static function linkToRemote($service, $add_slash = true) {
return self::makeURLAbsolute(self::linkToRemoteBase($service))
- . (($add_slash && $service[strlen($service)-1]!='/')?'/':'');
+ . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '');
}
/**
@@ -146,8 +143,8 @@ class OC_Helper {
* Returns a absolute url to the given service.
*/
public static function linkToPublic($service, $add_slash = false) {
- return self::linkToAbsolute( '', 'public.php') . '?service=' . $service
- . (($add_slash && $service[strlen($service)-1]!='/')?'/':'');
+ return self::linkToAbsolute('', 'public.php') . '?service=' . $service
+ . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '');
}
/**
@@ -158,25 +155,25 @@ class OC_Helper {
*
* Returns the path to the image.
*/
- public static function imagePath( $app, $image ) {
+ public static function imagePath($app, $image) {
// Read the selected theme from the config file
$theme = OC_Util::getTheme();
// Check if the app is in the app folder
- if( file_exists( OC::$SERVERROOT."/themes/$theme/apps/$app/img/$image" )) {
- return OC::$WEBROOT."/themes/$theme/apps/$app/img/$image";
- }elseif( file_exists(OC_App::getAppPath($app)."/img/$image" )) {
- return OC_App::getAppWebPath($app)."/img/$image";
- }elseif( !empty( $app ) and file_exists( OC::$SERVERROOT."/themes/$theme/$app/img/$image" )) {
- return OC::$WEBROOT."/themes/$theme/$app/img/$image";
- }elseif( !empty( $app ) and file_exists( OC::$SERVERROOT."/$app/img/$image" )) {
- return OC::$WEBROOT."/$app/img/$image";
- }elseif( file_exists( OC::$SERVERROOT."/themes/$theme/core/img/$image" )) {
- return OC::$WEBROOT."/themes/$theme/core/img/$image";
- }elseif( file_exists( OC::$SERVERROOT."/core/img/$image" )) {
- return OC::$WEBROOT."/core/img/$image";
- }else{
- throw new RuntimeException('image not found: image:'.$image.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+ if (file_exists(OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$image")) {
+ return OC::$WEBROOT . "/themes/$theme/apps/$app/img/$image";
+ } elseif (file_exists(OC_App::getAppPath($app) . "/img/$image")) {
+ return OC_App::getAppWebPath($app) . "/img/$image";
+ } elseif (!empty($app) and file_exists(OC::$SERVERROOT . "/themes/$theme/$app/img/$image")) {
+ return OC::$WEBROOT . "/themes/$theme/$app/img/$image";
+ } elseif (!empty($app) and file_exists(OC::$SERVERROOT . "/$app/img/$image")) {
+ return OC::$WEBROOT . "/$app/img/$image";
+ } elseif (file_exists(OC::$SERVERROOT . "/themes/$theme/core/img/$image")) {
+ return OC::$WEBROOT . "/themes/$theme/core/img/$image";
+ } elseif (file_exists(OC::$SERVERROOT . "/core/img/$image")) {
+ return OC::$WEBROOT . "/core/img/$image";
+ } else {
+ throw new RuntimeException('image not found: image:' . $image . ' webroot:' . OC::$WEBROOT . ' serverroot:' . OC::$SERVERROOT);
}
}
@@ -197,28 +194,28 @@ class OC_Helper {
}
// Replace slash and backslash with a minus
$icon = str_replace('/', '-', $mimetype);
- $icon = str_replace( '\\', '-', $icon);
+ $icon = str_replace('\\', '-', $icon);
// Is it a dir?
if ($mimetype === 'dir') {
- self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/folder.png';
- return OC::$WEBROOT.'/core/img/filetypes/folder.png';
+ self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/folder.png';
+ return OC::$WEBROOT . '/core/img/filetypes/folder.png';
}
// Icon exists?
- if (file_exists(OC::$SERVERROOT.'/core/img/filetypes/'.$icon.'.png')) {
- self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/'.$icon.'.png';
- return OC::$WEBROOT.'/core/img/filetypes/'.$icon.'.png';
+ if (file_exists(OC::$SERVERROOT . '/core/img/filetypes/' . $icon . '.png')) {
+ self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/' . $icon . '.png';
+ return OC::$WEBROOT . '/core/img/filetypes/' . $icon . '.png';
}
// Try only the first part of the filetype
$mimePart = substr($icon, 0, strpos($icon, '-'));
- if (file_exists(OC::$SERVERROOT.'/core/img/filetypes/'.$mimePart.'.png')) {
- self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/'.$mimePart.'.png';
- return OC::$WEBROOT.'/core/img/filetypes/'.$mimePart.'.png';
+ if (file_exists(OC::$SERVERROOT . '/core/img/filetypes/' . $mimePart . '.png')) {
+ self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/' . $mimePart . '.png';
+ return OC::$WEBROOT . '/core/img/filetypes/' . $mimePart . '.png';
} else {
- self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/file.png';
- return OC::$WEBROOT.'/core/img/filetypes/file.png';
+ self::$mimetypeIcons[$mimetype] = OC::$WEBROOT . '/core/img/filetypes/file.png';
+ return OC::$WEBROOT . '/core/img/filetypes/file.png';
}
}
@@ -229,25 +226,25 @@ class OC_Helper {
*
* Makes 2048 to 2 kB.
*/
- public static function humanFileSize( $bytes ) {
- if( $bytes < 0 ) {
+ public static function humanFileSize($bytes) {
+ if ($bytes < 0) {
$l = OC_L10N::get('lib');
- return $l->t("couldn't be determined");
+ return "?";
}
- if( $bytes < 1024 ) {
+ if ($bytes < 1024) {
return "$bytes B";
}
- $bytes = round( $bytes / 1024, 1 );
- if( $bytes < 1024 ) {
+ $bytes = round($bytes / 1024, 1);
+ if ($bytes < 1024) {
return "$bytes kB";
}
- $bytes = round( $bytes / 1024, 1 );
- if( $bytes < 1024 ) {
+ $bytes = round($bytes / 1024, 1);
+ if ($bytes < 1024) {
return "$bytes MB";
}
// Wow, heavy duty for owncloud
- $bytes = round( $bytes / 1024, 1 );
+ $bytes = round($bytes / 1024, 1);
return "$bytes GB";
}
@@ -260,21 +257,21 @@ class OC_Helper {
*
* Inspired by: http://www.php.net/manual/en/function.filesize.php#92418
*/
- public static function computerFileSize( $str ) {
- $str=strtolower($str);
+ public static function computerFileSize($str) {
+ $str = strtolower($str);
$bytes_array = array(
'b' => 1,
'k' => 1024,
'kb' => 1024,
'mb' => 1024 * 1024,
- 'm' => 1024 * 1024,
+ 'm' => 1024 * 1024,
'gb' => 1024 * 1024 * 1024,
- 'g' => 1024 * 1024 * 1024,
+ 'g' => 1024 * 1024 * 1024,
'tb' => 1024 * 1024 * 1024 * 1024,
- 't' => 1024 * 1024 * 1024 * 1024,
+ 't' => 1024 * 1024 * 1024 * 1024,
'pb' => 1024 * 1024 * 1024 * 1024 * 1024,
- 'p' => 1024 * 1024 * 1024 * 1024 * 1024,
+ 'p' => 1024 * 1024 * 1024 * 1024 * 1024,
);
$bytes = floatval($str);
@@ -299,18 +296,17 @@ class OC_Helper {
return chmod($path, $filemode);
$dh = opendir($path);
while (($file = readdir($dh)) !== false) {
- if($file != '.' && $file != '..') {
- $fullpath = $path.'/'.$file;
- if(is_link($fullpath))
+ if ($file != '.' && $file != '..') {
+ $fullpath = $path . '/' . $file;
+ if (is_link($fullpath))
return false;
- elseif(!is_dir($fullpath) && !@chmod($fullpath, $filemode))
- return false;
- elseif(!self::chmodr($fullpath, $filemode))
+ elseif (!is_dir($fullpath) && !@chmod($fullpath, $filemode))
+ return false; elseif (!self::chmodr($fullpath, $filemode))
return false;
}
}
closedir($dh);
- if(@chmod($path, $filemode))
+ if (@chmod($path, $filemode))
return true;
else
return false;
@@ -323,8 +319,8 @@ class OC_Helper {
*
*/
static function copyr($src, $dest) {
- if(is_dir($src)) {
- if(!is_dir($dest)) {
+ if (is_dir($src)) {
+ if (!is_dir($dest)) {
mkdir($dest);
}
$files = scandir($src);
@@ -333,7 +329,7 @@ class OC_Helper {
self::copyr("$src/$file", "$dest/$file");
}
}
- }elseif(file_exists($src) && !\OC\Files\Filesystem::isFileBlacklisted($src)) {
+ } elseif (file_exists($src) && !\OC\Files\Filesystem::isFileBlacklisted($src)) {
copy($src, $dest);
}
}
@@ -344,105 +340,74 @@ class OC_Helper {
* @return bool
*/
static function rmdirr($dir) {
- if(is_dir($dir)) {
- $files=scandir($dir);
- foreach($files as $file) {
+ if (is_dir($dir)) {
+ $files = scandir($dir);
+ foreach ($files as $file) {
if ($file != "." && $file != "..") {
self::rmdirr("$dir/$file");
}
}
rmdir($dir);
- }elseif(file_exists($dir)) {
+ } elseif (file_exists($dir)) {
unlink($dir);
}
- if(file_exists($dir)) {
+ if (file_exists($dir)) {
return false;
- }else{
+ } else {
return true;
}
}
/**
+ * @return \OC\Files\Type\Detection
+ */
+ static public function getMimetypeDetector() {
+ if (!self::$mimetypeDetector) {
+ self::$mimetypeDetector = new \OC\Files\Type\Detection();
+ self::$mimetypeDetector->registerTypeArray(include 'mimetypes.list.php');
+ }
+ return self::$mimetypeDetector;
+ }
+
+ /**
+ * @return \OC\Files\Type\TemplateManager
+ */
+ static public function getFileTemplateManager() {
+ if (!self::$templateManager) {
+ self::$templateManager = new \OC\Files\Type\TemplateManager();
+ }
+ return self::$templateManager;
+ }
+
+ /**
* Try to guess the mimetype based on filename
*
* @param string $path
* @return string
*/
- static public function getFileNameMimeType($path){
- if(strpos($path, '.')) {
- //try to guess the type by the file extension
- if(!self::$mimetypes || self::$mimetypes != include 'mimetypes.list.php') {
- self::$mimetypes=include 'mimetypes.list.php';
- }
- $extension=strtolower(strrchr(basename($path), "."));
- $extension=substr($extension, 1);//remove leading .
- return (isset(self::$mimetypes[$extension]))?self::$mimetypes[$extension]:'application/octet-stream';
- }else{
- return 'application/octet-stream';
- }
+ static public function getFileNameMimeType($path) {
+ return self::getMimetypeDetector()->detectPath($path);
}
/**
* get the mimetype form a local file
+ *
* @param string $path
* @return string
* does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
*/
static function getMimeType($path) {
- $isWrapped=(strpos($path, '://')!==false) and (substr($path, 0, 7)=='file://');
-
- if (@is_dir($path)) {
- // directories are easy
- return "httpd/unix-directory";
- }
-
- $mimeType = self::getFileNameMimeType($path);
-
- if($mimeType=='application/octet-stream' and function_exists('finfo_open')
- and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)) {
- $info = @strtolower(finfo_file($finfo, $path));
- if($info) {
- $mimeType=substr($info, 0, strpos($info, ';'));
- }
- finfo_close($finfo);
- }
- if (!$isWrapped and $mimeType=='application/octet-stream' && function_exists("mime_content_type")) {
- // use mime magic extension if available
- $mimeType = mime_content_type($path);
- }
- if (!$isWrapped and $mimeType=='application/octet-stream' && OC_Helper::canExecute("file")) {
- // it looks like we have a 'file' command,
- // lets see if it does have mime support
- $path=escapeshellarg($path);
- $fp = popen("file -b --mime-type $path 2>/dev/null", "r");
- $reply = fgets($fp);
- pclose($fp);
-
- //trim the newline
- $mimeType = trim($reply);
-
- }
- return $mimeType;
+ return self::getMimetypeDetector()->detect($path);
}
/**
* get the mimetype form a data string
+ *
* @param string $data
* @return string
*/
static function getStringMimeType($data) {
- if(function_exists('finfo_open') and function_exists('finfo_file')) {
- $finfo=finfo_open(FILEINFO_MIME);
- return finfo_buffer($finfo, $data);
- }else{
- $tmpFile=OC_Helper::tmpFile();
- $fh=fopen($tmpFile, 'wb');
- fwrite($fh, $data, 8024);
- fclose($fh);
- $mime=self::getMimeType($tmpFile);
- unset($tmpFile);
- return $mime;
- }
+ return self::getMimetypeDetector()->detectString($data);
}
/**
@@ -454,9 +419,9 @@ class OC_Helper {
*/
//FIXME: should also check for value validation (i.e. the email is an email).
- public static function init_var($s, $d="") {
+ public static function init_var($s, $d = "") {
$r = $d;
- if(isset($_REQUEST[$s]) && !empty($_REQUEST[$s])) {
+ if (isset($_REQUEST[$s]) && !empty($_REQUEST[$s])) {
$r = OC_Util::sanitizeHTML($_REQUEST[$s]);
}
@@ -466,12 +431,13 @@ class OC_Helper {
/**
* returns "checked"-attribute if request contains selected radio element
* OR if radio element is the default one -- maybe?
+ *
* @param string $s Name of radio-button element name
* @param string $v Value of current radio-button element
* @param string $d Value of default radio-button element
*/
public static function init_radio($s, $v, $d) {
- if((isset($_REQUEST[$s]) && $_REQUEST[$s]==$v) || (!isset($_REQUEST[$s]) && $v == $d))
+ if ((isset($_REQUEST[$s]) && $_REQUEST[$s] == $v) || (!isset($_REQUEST[$s]) && $v == $d))
print "checked=\"checked\" ";
}
@@ -503,17 +469,17 @@ class OC_Helper {
$dirs = explode(PATH_SEPARATOR, $path);
// WARNING : We have to check if open_basedir is enabled :
$obd = ini_get('open_basedir');
- if($obd != "none") {
+ if ($obd != "none") {
$obd_values = explode(PATH_SEPARATOR, $obd);
- if(count($obd_values) > 0 and $obd_values[0]) {
+ if (count($obd_values) > 0 and $obd_values[0]) {
// open_basedir is in effect !
// We need to check if the program is in one of these dirs :
$dirs = $obd_values;
}
}
- foreach($dirs as $dir) {
- foreach($exts as $ext) {
- if($check_fn("$dir/$name".$ext))
+ foreach ($dirs as $dir) {
+ foreach ($exts as $ext) {
+ if ($check_fn("$dir/$name" . $ext))
return true;
}
}
@@ -522,18 +488,19 @@ class OC_Helper {
/**
* copy the contents of one stream to another
+ *
* @param resource $source
* @param resource $target
* @return int the number of bytes copied
*/
public static function streamCopy($source, $target) {
- if(!$source or !$target) {
+ if (!$source or !$target) {
return false;
}
$result = true;
$count = 0;
- while(!feof($source)) {
- if ( ( $c = fwrite($target, fread($source, 8192)) ) === false) {
+ while (!feof($source)) {
+ if (($c = fwrite($target, fread($source, 8192))) === false) {
$result = false;
} else {
$count += $c;
@@ -544,37 +511,39 @@ class OC_Helper {
/**
* create a temporary file with an unique filename
+ *
* @param string $postfix
* @return string
*
* temporary files are automatically cleaned up after the script is finished
*/
- public static function tmpFile($postfix='') {
- $file=get_temp_dir().'/'.md5(time().rand()).$postfix;
- $fh=fopen($file, 'w');
+ public static function tmpFile($postfix = '') {
+ $file = get_temp_dir() . '/' . md5(time() . rand()) . $postfix;
+ $fh = fopen($file, 'w');
fclose($fh);
- self::$tmpFiles[]=$file;
+ self::$tmpFiles[] = $file;
return $file;
}
/**
* move a file to oc-noclean temp dir
+ *
* @param string $filename
* @return mixed
*
*/
- public static function moveToNoClean($filename='') {
+ public static function moveToNoClean($filename = '') {
if ($filename == '') {
return false;
}
- $tmpDirNoClean=get_temp_dir().'/oc-noclean/';
+ $tmpDirNoClean = get_temp_dir() . '/oc-noclean/';
if (!file_exists($tmpDirNoClean) || !is_dir($tmpDirNoClean)) {
if (file_exists($tmpDirNoClean)) {
unlink($tmpDirNoClean);
}
mkdir($tmpDirNoClean);
}
- $newname=$tmpDirNoClean.basename($filename);
+ $newname = $tmpDirNoClean . basename($filename);
if (rename($filename, $newname)) {
return $newname;
} else {
@@ -584,34 +553,35 @@ class OC_Helper {
/**
* create a temporary folder with an unique filename
+ *
* @return string
*
* temporary files are automatically cleaned up after the script is finished
*/
public static function tmpFolder() {
- $path=get_temp_dir().'/'.md5(time().rand());
+ $path = get_temp_dir() . '/' . md5(time() . rand());
mkdir($path);
- self::$tmpFiles[]=$path;
- return $path.'/';
+ self::$tmpFiles[] = $path;
+ return $path . '/';
}
/**
* remove all files created by self::tmpFile
*/
public static function cleanTmp() {
- $leftoversFile=get_temp_dir().'/oc-not-deleted';
- if(file_exists($leftoversFile)) {
- $leftovers=file($leftoversFile);
- foreach($leftovers as $file) {
+ $leftoversFile = get_temp_dir() . '/oc-not-deleted';
+ if (file_exists($leftoversFile)) {
+ $leftovers = file($leftoversFile);
+ foreach ($leftovers as $file) {
self::rmdirr($file);
}
unlink($leftoversFile);
}
- foreach(self::$tmpFiles as $file) {
- if(file_exists($file)) {
- if(!self::rmdirr($file)) {
- file_put_contents($leftoversFile, $file."\n", FILE_APPEND);
+ foreach (self::$tmpFiles as $file) {
+ if (file_exists($file)) {
+ if (!self::rmdirr($file)) {
+ file_put_contents($leftoversFile, $file . "\n", FILE_APPEND);
}
}
}
@@ -621,34 +591,34 @@ class OC_Helper {
* remove all files in PHP /oc-noclean temp dir
*/
public static function cleanTmpNoClean() {
- $tmpDirNoCleanFile=get_temp_dir().'/oc-noclean/';
- if(file_exists($tmpDirNoCleanFile)) {
+ $tmpDirNoCleanFile = get_temp_dir() . '/oc-noclean/';
+ if (file_exists($tmpDirNoCleanFile)) {
self::rmdirr($tmpDirNoCleanFile);
}
}
/**
- * Adds a suffix to the name in case the file exists
- *
- * @param $path
- * @param $filename
- * @return string
- */
+ * Adds a suffix to the name in case the file exists
+ *
+ * @param $path
+ * @param $filename
+ * @return string
+ */
public static function buildNotExistingFileName($path, $filename) {
$view = \OC\Files\Filesystem::getView();
return self::buildNotExistingFileNameForView($path, $filename, $view);
}
/**
- * Adds a suffix to the name in case the file exists
- *
- * @param $path
- * @param $filename
- * @return string
- */
+ * Adds a suffix to the name in case the file exists
+ *
+ * @param $path
+ * @param $filename
+ * @return string
+ */
public static function buildNotExistingFileNameForView($path, $filename, \OC\Files\View $view) {
- if($path==='/') {
- $path='';
+ if ($path === '/') {
+ $path = '';
}
if ($pos = strrpos($filename, '.')) {
$name = substr($filename, 0, $pos);
@@ -660,10 +630,10 @@ class OC_Helper {
$newpath = $path . '/' . $filename;
if ($view->file_exists($newpath)) {
- if(preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
+ if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
//Replace the last "(number)" with "(number+1)"
- $last_match = count($matches[0])-1;
- $counter = $matches[1][$last_match][0]+1;
+ $last_match = count($matches[0]) - 1;
+ $counter = $matches[1][$last_match][0] + 1;
$offset = $matches[0][$last_match][1];
$match_length = strlen($matches[0][$last_match][0]);
} else {
@@ -671,9 +641,9 @@ class OC_Helper {
$offset = false;
}
do {
- if($offset) {
+ if ($offset) {
//Replace the last "(number)" with "(number+1)"
- $newname = substr_replace($name, '('.$counter.')', $offset, $match_length);
+ $newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
} else {
$newname = $name . ' (' . $counter . ')';
}
@@ -700,17 +670,17 @@ class OC_Helper {
}
/**
- * @brief Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
- *
- * @param array $input The array to work on
- * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
- * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
- * @return array
- *
- * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
- * based on http://www.php.net/manual/en/function.array-change-key-case.php#107715
- *
- */
+ * @brief Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
+ *
+ * @param array $input The array to work on
+ * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
+ * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+ * @return array
+ *
+ * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
+ * based on http://www.php.net/manual/en/function.array-change-key-case.php#107715
+ *
+ */
public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') {
$case = ($case != MB_CASE_UPPER) ? MB_CASE_LOWER : MB_CASE_UPPER;
$ret = array();
@@ -736,26 +706,26 @@ class OC_Helper {
$length = intval($length);
$string = mb_substr($string, 0, $start, $encoding) .
$replacement .
- mb_substr($string, $start+$length, mb_strlen($string, 'UTF-8')-$start, $encoding);
+ mb_substr($string, $start + $length, mb_strlen($string, 'UTF-8') - $start, $encoding);
return $string;
}
/**
- * @brief Replace all occurrences of the search string with the replacement string
- *
- * @param string $search The value being searched for, otherwise known as the needle.
- * @param string $replace The replacement
- * @param string $subject The string or array being searched and replaced on, otherwise known as the haystack.
- * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
- * @param int $count If passed, this will be set to the number of replacements performed.
- * @return string
- *
- */
+ * @brief Replace all occurrences of the search string with the replacement string
+ *
+ * @param string $search The value being searched for, otherwise known as the needle.
+ * @param string $replace The replacement
+ * @param string $subject The string or array being searched and replaced on, otherwise known as the haystack.
+ * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+ * @param int $count If passed, this will be set to the number of replacements performed.
+ * @return string
+ *
+ */
public static function mb_str_replace($search, $replace, $subject, $encoding = 'UTF-8', &$count = null) {
$offset = -1;
$length = mb_strlen($search, $encoding);
- while(($i = mb_strrpos($subject, $search, $offset, $encoding)) !== false ) {
+ while (($i = mb_strrpos($subject, $search, $offset, $encoding)) !== false) {
$subject = OC_Helper::mb_substr_replace($subject, $replace, $i, $length);
$offset = $i - mb_strlen($subject, $encoding);
$count++;
@@ -764,21 +734,21 @@ class OC_Helper {
}
/**
- * @brief performs a search in a nested array
- * @param array $haystack the array to be searched
- * @param string $needle the search string
- * @param string $index optional, only search this key name
- * @return mixed the key of the matching field, otherwise false
- *
- * performs a search in a nested array
- *
- * taken from http://www.php.net/manual/en/function.array-search.php#97645
- */
+ * @brief performs a search in a nested array
+ * @param array $haystack the array to be searched
+ * @param string $needle the search string
+ * @param string $index optional, only search this key name
+ * @return mixed the key of the matching field, otherwise false
+ *
+ * performs a search in a nested array
+ *
+ * taken from http://www.php.net/manual/en/function.array-search.php#97645
+ */
public static function recursiveArraySearch($haystack, $needle, $index = null) {
$aIt = new RecursiveArrayIterator($haystack);
$it = new RecursiveIteratorIterator($aIt);
- while($it->valid()) {
+ while ($it->valid()) {
if (((isset($index) AND ($it->key() == $index)) OR (!isset($index))) AND ($it->current() == $needle)) {
return $aIt->key();
}
@@ -792,6 +762,7 @@ class OC_Helper {
/**
* Shortens str to maxlen by replacing characters in the middle with '...', eg.
* ellipsis('a very long string with lots of useless info to make a better example', 14) becomes 'a very ...example'
+ *
* @param string $str the string
* @param string $maxlen the maximum length of the result
* @return string with at most maxlen characters
@@ -815,14 +786,14 @@ class OC_Helper {
$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
$freeSpace = \OC\Files\Filesystem::free_space($dir);
if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) {
- $maxUploadFilesize = \OC\Files\FREE_SPACE_UNLIMITED;
+ $maxUploadFilesize = \OC\Files\SPACE_UNLIMITED;
} elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) {
$maxUploadFilesize = max($upload_max_filesize, $post_max_size); //only the non 0 value counts
} else {
$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
}
- if($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN){
+ if ($freeSpace !== \OC\Files\SPACE_UNKNOWN) {
$freeSpace = max($freeSpace, 0);
return min($maxUploadFilesize, $freeSpace);
@@ -833,6 +804,7 @@ class OC_Helper {
/**
* Checks if a function is available
+ *
* @param string $function_name
* @return bool
*/
@@ -861,7 +833,7 @@ class OC_Helper {
$used = 0;
}
$free = \OC\Files\Filesystem::free_space();
- if ($free >= 0){
+ if ($free >= 0) {
$total = $free + $used;
} else {
$total = $free; //either unknown or unlimited
@@ -869,7 +841,7 @@ class OC_Helper {
if ($total == 0) {
$total = 1; // prevent division by zero
}
- if ($total >= 0){
+ if ($total >= 0) {
$relative = round(($used / $total) * 10000) / 100;
} else {
$relative = 0;
diff --git a/lib/installer.php b/lib/installer.php
index dcd29f9e1ad..c29f9ec8982 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -109,7 +109,7 @@ class OC_Installer{
if(!is_file($extractDir.'/appinfo/info.xml')) {
//try to find it in a subdir
$dh=opendir($extractDir);
- while($folder=readdir($dh)) {
+ while (($folder = readdir($dh)) !== false) {
if($folder[0]!='.' and is_dir($extractDir.'/'.$folder)) {
if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')) {
$extractDir.='/'.$folder;
diff --git a/lib/l10n.php b/lib/l10n.php
index a28aa89c5f1..f93443b886a 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -2,8 +2,10 @@
/**
* ownCloud
*
+ * @author Frank Karlitschek
* @author Jakob Sack
* @copyright 2012 Frank Karlitschek frank@owncloud.org
+ * @copyright 2013 Jakob Sack
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -23,7 +25,7 @@
/**
* This class is for i18n and l10n
*/
-class OC_L10N{
+class OC_L10N {
/**
* cached instances
*/
@@ -55,6 +57,16 @@ class OC_L10N{
private $translations = array();
/**
+ * Plural forms (string)
+ */
+ private $plural_form_string = 'nplurals=2; plural=(n != 1);';
+
+ /**
+ * Plural forms (function)
+ */
+ private $plural_form_function = null;
+
+ /**
* Localization
*/
private $localizations = array(
@@ -66,6 +78,8 @@ class OC_L10N{
/**
* get an L10N instance
+ * @param $app string
+ * @param $lang string|null
* @return OC_L10N
*/
public static function get($app, $lang=null) {
@@ -81,8 +95,8 @@ class OC_L10N{
/**
* @brief The constructor
- * @param $app the app requesting l10n
- * @param $lang default: null Language
+ * @param $app string app requesting l10n
+ * @param $lang string default: null Language
* @returns OC_L10N-Object
*
* If language is not set, the constructor tries to find the right
@@ -93,6 +107,17 @@ class OC_L10N{
$this->lang = $lang;
}
+ public function load($transFile) {
+ $this->app = true;
+ include $transFile;
+ if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
+ $this->translations = $TRANSLATIONS;
+ }
+ if(isset($PLURAL_FORMS)) {
+ $this->plural_form_string = $PLURAL_FORMS;
+ }
+ }
+
protected function init() {
if ($this->app === true) {
return;
@@ -138,6 +163,9 @@ class OC_L10N{
}
}
}
+ if(isset($PLURAL_FORMS)) {
+ $this->plural_form_string = $PLURAL_FORMS;
+ }
}
if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')) {
@@ -154,6 +182,65 @@ class OC_L10N{
}
/**
+ * @brief Creates a function that The constructor
+ *
+ * If language is not set, the constructor tries to find the right
+ * language.
+ *
+ * Parts of the code is copied from Habari:
+ * https://github.com/habari/system/blob/master/classes/locale.php
+ * @param $string string
+ * @return string
+ */
+ protected function createPluralFormFunction($string){
+ if(preg_match( '/^\s*nplurals\s*=\s*(\d+)\s*;\s*plural=(.*)$/u', $string, $matches)) {
+ // sanitize
+ $nplurals = preg_replace( '/[^0-9]/', '', $matches[1] );
+ $plural = preg_replace( '#[^n0-9:\(\)\?\|\&=!<>+*/\%-]#', '', $matches[2] );
+
+ $body = str_replace(
+ array( 'plural', 'n', '$n$plurals', ),
+ array( '$plural', '$n', '$nplurals', ),
+ 'nplurals='. $nplurals . '; plural=' . $plural
+ );
+
+ // add parents
+ // important since PHP's ternary evaluates from left to right
+ $body .= ';';
+ $res = '';
+ $p = 0;
+ for($i = 0; $i < strlen($body); $i++) {
+ $ch = $body[$i];
+ switch ( $ch ) {
+ case '?':
+ $res .= ' ? (';
+ $p++;
+ break;
+ case ':':
+ $res .= ') : (';
+ break;
+ case ';':
+ $res .= str_repeat( ')', $p ) . ';';
+ $p = 0;
+ break;
+ default:
+ $res .= $ch;
+ }
+ }
+
+ $body = $res . 'return ($plural>=$nplurals?$nplurals-1:$plural);';
+ return create_function('$n', $body);
+ }
+ else {
+ // default: one plural form for all cases but n==1 (english)
+ return create_function(
+ '$n',
+ '$nplurals=2;$plural=($n==1?0:1);return ($plural>=$nplurals?$nplurals-1:$plural);'
+ );
+ }
+ }
+
+ /**
* @brief Translating
* @param $text String The text we need a translation for
* @param array $parameters default:array() Parameters for sprintf
@@ -168,6 +255,37 @@ class OC_L10N{
/**
* @brief Translating
+ * @param $text_singular String the string to translate for exactly one object
+ * @param $text_plural String the string to translate for n objects
+ * @param $count Integer Number of objects
+ * @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. %n will be replaced with the number of objects.
+ *
+ * The correct plural is determined by the plural_forms-function
+ * provided by the po file.
+ *
+ */
+ public function n($text_singular, $text_plural, $count, $parameters = array()) {
+ $this->init();
+ $identifier = "_${text_singular}__${text_plural}_";
+ if( array_key_exists($identifier, $this->translations)) {
+ return new OC_L10N_String( $this, $identifier, $parameters, $count );
+ }
+ else{
+ if($count === 1) {
+ return new OC_L10N_String($this, $text_singular, $parameters, $count);
+ }
+ else{
+ return new OC_L10N_String($this, $text_plural, $parameters, $count);
+ }
+ }
+ }
+
+ /**
+ * @brief Translating
* @param $textArray The text array we need a translation for
* @returns Translation or the same text
*
@@ -201,6 +319,42 @@ class OC_L10N{
}
/**
+ * @brief getPluralFormString
+ * @returns string containing the gettext "Plural-Forms"-string
+ *
+ * Returns a string like "nplurals=2; plural=(n != 1);"
+ */
+ public function getPluralFormString() {
+ $this->init();
+ return $this->plural_form_string;
+ }
+
+ /**
+ * @brief getPluralFormFunction
+ * @returns string the plural form function
+ *
+ * returned function accepts the argument $n
+ */
+ public function getPluralFormFunction() {
+ $this->init();
+ if(is_null($this->plural_form_function)) {
+ $this->plural_form_function = $this->createPluralFormFunction($this->plural_form_string);
+ }
+ return $this->plural_form_function;
+ }
+
+ /**
+ * @brief get localizations
+ * @returns Fetch all localizations
+ *
+ * Returns an associative array with all localizations
+ */
+ public function getLocalizations() {
+ $this->init();
+ return $this->localizations;
+ }
+
+ /**
* @brief Localization
* @param $type Type of localization
* @param $params parameters for this localization
@@ -230,8 +384,11 @@ class OC_L10N{
case 'date':
case 'datetime':
case 'time':
- if($data instanceof DateTime) return $data->format($this->localizations[$type]);
- elseif(is_string($data)) $data = strtotime($data);
+ if($data instanceof DateTime) {
+ return $data->format($this->localizations[$type]);
+ } elseif(is_string($data) && !is_numeric($data)) {
+ $data = strtotime($data);
+ }
$locales = array(self::findLanguage());
if (strlen($locales[0]) == 2) {
$locales[] = $locales[0].'_'.strtoupper($locales[0]);
diff --git a/lib/l10n/af_ZA.php b/lib/l10n/af_ZA.php
index de32778026f..d6bf5771e8d 100644
--- a/lib/l10n/af_ZA.php
+++ b/lib/l10n/af_ZA.php
@@ -1,9 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Hulp",
"Personal" => "Persoonlik",
"Settings" => "Instellings",
"Users" => "Gebruikers",
-"Apps" => "Toepassings",
"Admin" => "Admin",
-"web services under your control" => "webdienste onder jou beheer"
+"web services under your control" => "webdienste onder jou beheer",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php
index 107b27a1fc8..f626dcdfda6 100644
--- a/lib/l10n/ar.php
+++ b/lib/l10n/ar.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "المساعدة",
"Personal" => "شخصي",
"Settings" => "إعدادات",
"Users" => "المستخدمين",
-"Apps" => "التطبيقات",
"Admin" => "المدير",
"web services under your control" => "خدمات الشبكة تحت سيطرتك",
"ZIP download is turned off." => "تحميل ملفات ZIP متوقف",
"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." => "انتهت صلاحية الكلمة , يرجى اعادة تحميل الصفحة",
@@ -37,16 +36,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة",
"Please double check the <a href='%s'>installation guides</a>." => "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.",
"seconds ago" => "منذ ثواني",
-"1 minute ago" => "منذ دقيقة",
-"%d minutes ago" => "%d دقيقة مضت",
-"1 hour ago" => "قبل ساعة مضت",
-"%d hours ago" => "%d ساعة مضت",
+"_%n minute ago_::_%n minutes ago_" => array("","","","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","","","",""),
"today" => "اليوم",
"yesterday" => "يوم أمس",
-"%d days ago" => "%d يوم مضى",
+"_%n day go_::_%n days ago_" => array("","","","","",""),
"last month" => "الشهر الماضي",
-"%d months ago" => "%d شهر مضت",
+"_%n month ago_::_%n months ago_" => array("","","","","",""),
"last year" => "السنةالماضية",
"years ago" => "سنة مضت",
"Could not find category \"%s\"" => "تعذر العثور على المجلد \"%s\""
);
+$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;";
diff --git a/lib/l10n/be.php b/lib/l10n/be.php
new file mode 100644
index 00000000000..1570411eb86
--- /dev/null
+++ b/lib/l10n/be.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","",""),
+"_%n day go_::_%n days ago_" => array("","","",""),
+"_%n month ago_::_%n months ago_" => array("","","","")
+);
+$PLURAL_FORMS = "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
index e23112c8302..b6cc949eb8a 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/l10n/bg_BG.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Помощ",
"Personal" => "Лични",
"Settings" => "Настройки",
"Users" => "Потребители",
-"Apps" => "Приложения",
"Admin" => "Админ",
"web services under your control" => "уеб услуги под Ваш контрол",
"ZIP download is turned off." => "Изтеглянето като ZIP е изключено.",
"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." => "Ключът е изтекъл, моля презаредете страницата",
@@ -38,16 +37,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
"Please double check the <a href='%s'>installation guides</a>." => "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>.",
"seconds ago" => "преди секунди",
-"1 minute ago" => "преди 1 минута",
-"%d minutes ago" => "преди %d минути",
-"1 hour ago" => "преди 1 час",
-"%d hours ago" => "преди %d часа",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "днес",
"yesterday" => "вчера",
-"%d days ago" => "преди %d дни",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "последният месец",
-"%d months ago" => "преди %d месеца",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "последната година",
"years ago" => "последните години",
"Could not find category \"%s\"" => "Невъзможно откриване на категорията \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/bn_BD.php b/lib/l10n/bn_BD.php
index ab1d9b94d0d..a42435a2a47 100644
--- a/lib/l10n/bn_BD.php
+++ b/lib/l10n/bn_BD.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "সহায়িকা",
"Personal" => "ব্যক্তিগত",
"Settings" => "নিয়ামকসমূহ",
"Users" => "ব্যবহারকারী",
-"Apps" => "অ্যাপ",
"Admin" => "প্রশাসন",
"web services under your control" => "ওয়েব সার্ভিস আপনার হাতের মুঠোয়",
"ZIP download is turned off." => "ZIP ডাউনলোড বন্ধ করা আছে।",
@@ -16,13 +16,14 @@
"Files" => "ফাইল",
"Text" => "টেক্সট",
"seconds ago" => "সেকেন্ড পূর্বে",
-"1 minute ago" => "১ মিনিট পূর্বে",
-"%d minutes ago" => "%d মিনিট পূর্বে",
-"1 hour ago" => "1 ঘন্টা পূর্বে",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "আজ",
"yesterday" => "গতকাল",
-"%d days ago" => "%d দিন পূর্বে",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "গত মাস",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "গত বছর",
"years ago" => "বছর পূর্বে"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/bs.php b/lib/l10n/bs.php
new file mode 100644
index 00000000000..3cb98906e62
--- /dev/null
+++ b/lib/l10n/bs.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("","","")
+);
+$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);";
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 14f9edfe34c..83e70585e36 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Ajuda",
"Personal" => "Personal",
"Settings" => "Configuració",
"Users" => "Usuaris",
-"Apps" => "Aplicacions",
"Admin" => "Administració",
"Failed to upgrade \"%s\"." => "Ha fallat l'actualització \"%s\".",
"web services under your control" => "controleu els vostres serveis web",
@@ -13,7 +13,6 @@
"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.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Baixeu els fitxers en trossos petits, de forma separada, o pregunteu a l'administrador.",
-"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.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.",
"Please double check the <a href='%s'>installation guides</a>." => "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
"seconds ago" => "segons enrere",
-"1 minute ago" => "fa 1 minut",
-"%d minutes ago" => "fa %d minuts",
-"1 hour ago" => "fa 1 hora",
-"%d hours ago" => "fa %d hores",
+"_%n minute ago_::_%n minutes ago_" => array("fa %n minut","fa %n minuts"),
+"_%n hour ago_::_%n hours ago_" => array("fa %n hora","fa %n hores"),
"today" => "avui",
"yesterday" => "ahir",
-"%d days ago" => "fa %d dies",
+"_%n day go_::_%n days ago_" => array("fa %n dia","fa %n dies"),
"last month" => "el mes passat",
-"%d months ago" => "fa %d mesos",
+"_%n month ago_::_%n months ago_" => array("fa %n mes","fa %n mesos"),
"last year" => "l'any passat",
"years ago" => "anys enrere",
"Caused by:" => "Provocat per:",
"Could not find category \"%s\"" => "No s'ha trobat la categoria \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index 4952b2ccddf..1a80fc78bb6 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Nápověda",
"Personal" => "Osobní",
"Settings" => "Nastavení",
"Users" => "Uživatelé",
-"Apps" => "Aplikace",
"Admin" => "Administrace",
"Failed to upgrade \"%s\"." => "Selhala aktualizace verze \"%s\".",
"web services under your control" => "webové služby pod Vaší kontrolou",
@@ -13,7 +13,6 @@
"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.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Stáhněte soubory po menších částech, samostatně, nebo se obraťte na správce.",
-"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.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server není správně nastaven pro umožnění synchronizace, rozhraní WebDAV se zdá být rozbité.",
"Please double check the <a href='%s'>installation guides</a>." => "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
"seconds ago" => "před pár sekundami",
-"1 minute ago" => "před minutou",
-"%d minutes ago" => "před %d minutami",
-"1 hour ago" => "před hodinou",
-"%d hours ago" => "před %d hodinami",
+"_%n minute ago_::_%n minutes ago_" => array("před %n minutou","před %n minutami","před %n minutami"),
+"_%n hour ago_::_%n hours ago_" => array("před %n hodinou","před %n hodinami","před %n hodinami"),
"today" => "dnes",
"yesterday" => "včera",
-"%d days ago" => "před %d dny",
+"_%n day go_::_%n days ago_" => array("před %n dnem","před %n dny","před %n dny"),
"last month" => "minulý měsíc",
-"%d months ago" => "před %d měsíci",
+"_%n month ago_::_%n months ago_" => array("před %n měsícem","před %n měsíci","před %n měsíci"),
"last year" => "minulý rok",
"years ago" => "před lety",
"Caused by:" => "Příčina:",
"Could not find category \"%s\"" => "Nelze nalézt kategorii \"%s\""
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/lib/l10n/cy_GB.php b/lib/l10n/cy_GB.php
index 27140ba6dbb..6973b51878f 100644
--- a/lib/l10n/cy_GB.php
+++ b/lib/l10n/cy_GB.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Cymorth",
"Personal" => "Personol",
"Settings" => "Gosodiadau",
"Users" => "Defnyddwyr",
-"Apps" => "Pecynnau",
"Admin" => "Gweinyddu",
"web services under your control" => "gwasanaethau gwe a reolir gennych",
"ZIP download is turned off." => "Mae llwytho ZIP wedi ei ddiffodd.",
"Files need to be downloaded one by one." => "Mae angen llwytho ffeiliau i lawr fesul un.",
"Back to Files" => "Nôl i Ffeiliau",
"Selected files too large to generate zip file." => "Mae'r ffeiliau ddewiswyd yn rhy fawr i gynhyrchu ffeil zip.",
-"couldn't be determined" => "methwyd pennu",
"Application is not enabled" => "Nid yw'r pecyn wedi'i alluogi",
"Authentication error" => "Gwall dilysu",
"Token expired. Please reload page." => "Tocyn wedi dod i ben. Ail-lwythwch y dudalen.",
@@ -37,16 +36,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
"Please double check the <a href='%s'>installation guides</a>." => "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
"seconds ago" => "eiliad yn ôl",
-"1 minute ago" => "1 munud yn ôl",
-"%d minutes ago" => "%d munud yn ôl",
-"1 hour ago" => "1 awr yn ôl",
-"%d hours ago" => "%d awr yn ôl",
+"_%n minute ago_::_%n minutes ago_" => array("","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","",""),
"today" => "heddiw",
"yesterday" => "ddoe",
-"%d days ago" => "%d diwrnod yn ôl",
+"_%n day go_::_%n days ago_" => array("","","",""),
"last month" => "mis diwethaf",
-"%d months ago" => "%d mis yn ôl",
+"_%n month ago_::_%n months ago_" => array("","","",""),
"last year" => "y llynedd",
"years ago" => "blwyddyn yn ôl",
"Could not find category \"%s\"" => "Methu canfod categori \"%s\""
);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index 789328a3100..78859b08745 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Hjælp",
"Personal" => "Personligt",
"Settings" => "Indstillinger",
"Users" => "Brugere",
-"Apps" => "Apps",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Upgradering af \"%s\" fejlede",
"web services under your control" => "Webtjenester under din kontrol",
@@ -13,7 +13,6 @@
"Back to Files" => "Tilbage til Filer",
"Selected files too large to generate zip file." => "De markerede filer er for store til at generere en ZIP-fil.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download filerne i små bider, seperat, eller kontakt venligst din administrator.",
-"couldn't be determined" => "kunne ikke fastslås",
"Application is not enabled" => "Programmet er ikke aktiveret",
"Authentication error" => "Adgangsfejl",
"Token expired. Please reload page." => "Adgang er udløbet. Genindlæs siden.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
"Please double check the <a href='%s'>installation guides</a>." => "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
"seconds ago" => "sekunder siden",
-"1 minute ago" => "1 minut siden",
-"%d minutes ago" => "%d minutter siden",
-"1 hour ago" => "1 time siden",
-"%d hours ago" => "%d timer siden",
+"_%n minute ago_::_%n minutes ago_" => array("%n minut siden","%n minutter siden"),
+"_%n hour ago_::_%n hours ago_" => array("%n time siden","%n timer siden"),
"today" => "i dag",
"yesterday" => "i går",
-"%d days ago" => "%d dage siden",
+"_%n day go_::_%n days ago_" => array("%n dag siden","%n dage siden"),
"last month" => "sidste måned",
-"%d months ago" => "%d måneder siden",
+"_%n month ago_::_%n months ago_" => array("%n måned siden","%n måneder siden"),
"last year" => "sidste år",
"years ago" => "år siden",
"Caused by:" => "Forårsaget af:",
"Could not find category \"%s\"" => "Kunne ikke finde kategorien \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index f1c4a1171e2..01fe5ee0583 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Hilfe",
"Personal" => "Persönlich",
"Settings" => "Einstellungen",
"Users" => "Benutzer",
-"Apps" => "Apps",
"Admin" => "Administration",
"Failed to upgrade \"%s\"." => "Konnte \"%s\" nicht aktualisieren.",
"web services under your control" => "Web-Services unter Deiner Kontrolle",
@@ -13,7 +13,6 @@
"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.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Lade die Dateien in kleineren, separaten, Stücken herunter oder bitte deinen Administrator.",
-"couldn't be determined" => "konnte nicht festgestellt werden",
"Application is not enabled" => "Die Anwendung ist nicht aktiviert",
"Authentication error" => "Fehler bei der Anmeldung",
"Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
"seconds ago" => "Gerade eben",
-"1 minute ago" => "vor einer Minute",
-"%d minutes ago" => "Vor %d Minuten",
-"1 hour ago" => "Vor einer Stunde",
-"%d hours ago" => "Vor %d Stunden",
+"_%n minute ago_::_%n minutes ago_" => array("","Vor %n Minuten"),
+"_%n hour ago_::_%n hours ago_" => array("","Vor %n Stunden"),
"today" => "Heute",
"yesterday" => "Gestern",
-"%d days ago" => "Vor %d Tag(en)",
+"_%n day go_::_%n days ago_" => array("","Vor %n Tagen"),
"last month" => "Letzten Monat",
-"%d months ago" => "Vor %d Monaten",
+"_%n month ago_::_%n months ago_" => array("","Vor %n Monaten"),
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
"Caused by:" => "Verursacht durch:",
"Could not find category \"%s\"" => "Die Kategorie \"%s\" konnte nicht gefunden werden."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de_AT.php b/lib/l10n/de_AT.php
new file mode 100644
index 00000000000..15f78e0bce6
--- /dev/null
+++ b/lib/l10n/de_AT.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de_CH.php b/lib/l10n/de_CH.php
new file mode 100644
index 00000000000..188ea4e2fc0
--- /dev/null
+++ b/lib/l10n/de_CH.php
@@ -0,0 +1,55 @@
+<?php
+$TRANSLATIONS = array(
+"Help" => "Hilfe",
+"Personal" => "Persönlich",
+"Settings" => "Einstellungen",
+"Users" => "Benutzer",
+"Admin" => "Administrator",
+"Failed to upgrade \"%s\"." => "Konnte \"%s\" nicht aktualisieren.",
+"web services under your control" => "Web-Services unter Ihrer Kontrolle",
+"cannot open \"%s\"" => "Öffnen von \"%s\" fehlgeschlagen",
+"ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
+"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 gross, um eine ZIP-Datei zu erstellen.",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bitten Sie Ihren Administrator.",
+"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.",
+"Files" => "Dateien",
+"Text" => "Text",
+"Images" => "Bilder",
+"%s enter the database username." => "%s geben Sie den Datenbank-Benutzernamen an.",
+"%s enter the database name." => "%s geben Sie den Datenbank-Namen an.",
+"%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten",
+"MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Passwort ungültig: %s",
+"You need to enter either an existing account or the administrator." => "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
+"MySQL username and/or password not valid" => "MySQL Benutzername und/oder Passwort ungültig",
+"DB Error: \"%s\"" => "DB Fehler: \"%s\"",
+"Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "MySQL Benutzer '%s'@'localhost' existiert bereits.",
+"Drop this user from MySQL" => "Lösche diesen Benutzer aus MySQL",
+"MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
+"Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.",
+"Oracle connection could not be established" => "Die Oracle-Verbindung konnte nicht aufgebaut werden.",
+"Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
+"Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL Benutzername und/oder Passwort ungültig",
+"Set an admin username." => "Setze Administrator Benutzername.",
+"Set an admin password." => "Setze Administrator Passwort",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
+"seconds ago" => "Gerade eben",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"today" => "Heute",
+"yesterday" => "Gestern",
+"_%n day go_::_%n days ago_" => array("",""),
+"last month" => "Letzten Monat",
+"_%n month ago_::_%n months ago_" => array("",""),
+"last year" => "Letztes Jahr",
+"years ago" => "Vor Jahren",
+"Caused by:" => "Verursacht durch:",
+"Could not find category \"%s\"" => "Die Kategorie «%s» konnte nicht gefunden werden."
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 276e526e2ed..9fd319b7e1b 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Hilfe",
"Personal" => "Persönlich",
"Settings" => "Einstellungen",
"Users" => "Benutzer",
-"Apps" => "Apps",
"Admin" => "Administrator",
"Failed to upgrade \"%s\"." => "Konnte \"%s\" nicht aktualisieren.",
"web services under your control" => "Web-Services unter Ihrer Kontrolle",
@@ -13,7 +13,6 @@
"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.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laden Sie die Dateien in kleineren, separaten, Stücken herunter oder bitten Sie Ihren Administrator.",
-"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.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
"seconds ago" => "Gerade eben",
-"1 minute ago" => "Vor 1 Minute",
-"%d minutes ago" => "Vor %d Minuten",
-"1 hour ago" => "Vor einer Stunde",
-"%d hours ago" => "Vor %d Stunden",
+"_%n minute ago_::_%n minutes ago_" => array("Vor %n Minute","Vor %n Minuten"),
+"_%n hour ago_::_%n hours ago_" => array("Vor %n Stunde","Vor %n Stunden"),
"today" => "Heute",
"yesterday" => "Gestern",
-"%d days ago" => "Vor %d Tag(en)",
+"_%n day go_::_%n days ago_" => array("Vor %n Tag","Vor %n Tagen"),
"last month" => "Letzten Monat",
-"%d months ago" => "Vor %d Monaten",
+"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
"last year" => "Letztes Jahr",
"years ago" => "Vor Jahren",
"Caused by:" => "Verursacht durch:",
"Could not find category \"%s\"" => "Die Kategorie \"%s\" konnte nicht gefunden werden."
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index de1c6d67937..dcbf82d4a4b 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Βοήθεια",
"Personal" => "Προσωπικά",
"Settings" => "Ρυθμίσεις",
"Users" => "Χρήστες",
-"Apps" => "Εφαρμογές",
"Admin" => "Διαχειριστής",
"Failed to upgrade \"%s\"." => "Αποτυχία αναβάθμισης του \"%s\".",
"web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας",
@@ -13,7 +13,6 @@
"Back to Files" => "Πίσω στα Αρχεία",
"Selected files too large to generate zip file." => "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Λήψη των αρχείων σε μικρότερα κομμάτια, χωριστά ή ρωτήστε τον διαχειριστή σας.",
-"couldn't be determined" => "δεν μπορούσε να προσδιορισθεί",
"Application is not enabled" => "Δεν ενεργοποιήθηκε η εφαρμογή",
"Authentication error" => "Σφάλμα πιστοποίησης",
"Token expired. Please reload page." => "Το αναγνωριστικό έληξε. Παρακαλώ φορτώστε ξανά την σελίδα.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη.",
"Please double check the <a href='%s'>installation guides</a>." => "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
"seconds ago" => "δευτερόλεπτα πριν",
-"1 minute ago" => "1 λεπτό πριν",
-"%d minutes ago" => "%d λεπτά πριν",
-"1 hour ago" => "1 ώρα πριν",
-"%d hours ago" => "%d ώρες πριν",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "σήμερα",
"yesterday" => "χτες",
-"%d days ago" => "%d ημέρες πριν",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "τελευταίο μήνα",
-"%d months ago" => "%d μήνες πριν",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "τελευταίο χρόνο",
"years ago" => "χρόνια πριν",
"Caused by:" => "Προκλήθηκε από:",
"Could not find category \"%s\"" => "Αδυναμία εύρεσης κατηγορίας \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/en@pirate.php b/lib/l10n/en@pirate.php
index 02ff0331e05..a8175b1400f 100644
--- a/lib/l10n/en@pirate.php
+++ b/lib/l10n/en@pirate.php
@@ -1,3 +1,9 @@
-<?php $TRANSLATIONS = array(
-"web services under your control" => "web services under your control"
+<?php
+$TRANSLATIONS = array(
+"web services under your control" => "web services under your control",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index fd45f30c69b..5311dd6eb15 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Helpo",
"Personal" => "Persona",
"Settings" => "Agordo",
"Users" => "Uzantoj",
-"Apps" => "Aplikaĵoj",
"Admin" => "Administranto",
"web services under your control" => "TTT-servoj regataj de vi",
"ZIP download is turned off." => "ZIP-elŝuto estas malkapabligita.",
@@ -34,16 +34,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
"Please double check the <a href='%s'>installation guides</a>." => "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
"seconds ago" => "sekundoj antaŭe",
-"1 minute ago" => "antaŭ 1 minuto",
-"%d minutes ago" => "antaŭ %d minutoj",
-"1 hour ago" => "antaŭ 1 horo",
-"%d hours ago" => "antaŭ %d horoj",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "hodiaŭ",
"yesterday" => "hieraŭ",
-"%d days ago" => "antaŭ %d tagoj",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "lastamonate",
-"%d months ago" => "antaŭ %d monatoj",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "lastajare",
"years ago" => "jaroj antaŭe",
"Could not find category \"%s\"" => "Ne troviĝis kategorio “%s”"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 66011e61a0d..14bbf6f6a13 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Ayuda",
"Personal" => "Personal",
"Settings" => "Ajustes",
"Users" => "Usuarios",
-"Apps" => "Aplicaciones",
"Admin" => "Administración",
"Failed to upgrade \"%s\"." => "Falló la actualización \"%s\".",
"web services under your control" => "Servicios web bajo su control",
@@ -13,7 +13,6 @@
"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.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargue los archivos en trozos más pequeños, por separado o solicítelos amablemente su administrador.",
-"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.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
"seconds ago" => "hace segundos",
-"1 minute ago" => "hace 1 minuto",
-"%d minutes ago" => "hace %d minutos",
-"1 hour ago" => "Hace 1 hora",
-"%d hours ago" => "Hace %d horas",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "hoy",
"yesterday" => "ayer",
-"%d days ago" => "hace %d días",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "mes pasado",
-"%d months ago" => "Hace %d meses",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "año pasado",
"years ago" => "hace años",
"Caused by:" => "Causado por:",
"Could not find category \"%s\"" => "No puede encontrar la categoria \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index da0f6fae84a..26f1e4ecd5e 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Ayuda",
"Personal" => "Personal",
"Settings" => "Configuración",
"Users" => "Usuarios",
-"Apps" => "Apps",
"Admin" => "Administración",
"Failed to upgrade \"%s\"." => "No se pudo actualizar \"%s\".",
"web services under your control" => "servicios web sobre los que tenés control",
@@ -13,7 +13,6 @@
"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.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargá los archivos en partes más chicas, de forma separada, o pedíselos al administrador",
-"couldn't be determined" => "no se pudo determinar",
"Application is not enabled" => "La aplicación no está habilitada",
"Authentication error" => "Error al autenticar",
"Token expired. Please reload page." => "Token expirado. Por favor, recargá la página.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
"seconds ago" => "segundos atrás",
-"1 minute ago" => "hace 1 minuto",
-"%d minutes ago" => "hace %d minutos",
-"1 hour ago" => "hace 1 hora",
-"%d hours ago" => "hace %d horas",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "hoy",
"yesterday" => "ayer",
-"%d days ago" => "hace %d días",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "el mes pasado",
-"%d months ago" => "hace %d meses",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "el año pasado",
"years ago" => "años atrás",
"Caused by:" => "Provocado por:",
"Could not find category \"%s\"" => "No fue posible encontrar la categoría \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index c2cd8ff0389..a2ac6bcabc9 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Abiinfo",
"Personal" => "Isiklik",
"Settings" => "Seaded",
"Users" => "Kasutajad",
-"Apps" => "Rakendused",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Ebaõnnestunud uuendus \"%s\".",
"web services under your control" => "veebitenused sinu kontrolli all",
@@ -13,7 +13,6 @@
"Back to Files" => "Tagasi failide juurde",
"Selected files too large to generate zip file." => "Valitud failid on ZIP-faili loomiseks liiga suured.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Laadi failid alla eraldi väiksemate osadena või küsi nõu oma süsteemiadminstraatorilt.",
-"couldn't be determined" => "ei suudetud tuvastada",
"Application is not enabled" => "Rakendus pole sisse lülitatud",
"Authentication error" => "Autentimise viga",
"Token expired. Please reload page." => "Kontrollkood aegus. Paelun lae leht uuesti.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.",
"Please double check the <a href='%s'>installation guides</a>." => "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
"seconds ago" => "sekundit tagasi",
-"1 minute ago" => "1 minut tagasi",
-"%d minutes ago" => "%d minutit tagasi",
-"1 hour ago" => "1 tund tagasi",
-"%d hours ago" => "%d tundi tagasi",
+"_%n minute ago_::_%n minutes ago_" => array("","%n minutit tagasi"),
+"_%n hour ago_::_%n hours ago_" => array("","%n tundi tagasi"),
"today" => "täna",
"yesterday" => "eile",
-"%d days ago" => "%d päeva tagasi",
+"_%n day go_::_%n days ago_" => array("","%n päeva tagasi"),
"last month" => "viimasel kuul",
-"%d months ago" => "%d kuud tagasi",
+"_%n month ago_::_%n months ago_" => array("","%n kuud tagasi"),
"last year" => "viimasel aastal",
"years ago" => "aastat tagasi",
"Caused by:" => "Põhjustaja:",
"Could not find category \"%s\"" => "Ei leia kategooriat \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index 94b4cfb902e..8f967314f4b 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Laguntza",
"Personal" => "Pertsonala",
"Settings" => "Ezarpenak",
"Users" => "Erabiltzaileak",
-"Apps" => "Aplikazioak",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Ezin izan da \"%s\" eguneratu.",
"web services under your control" => "web zerbitzuak zure kontrolpean",
@@ -13,7 +13,6 @@
"Back to Files" => "Itzuli fitxategietara",
"Selected files too large to generate zip file." => "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Deskargatu fitzategiak zati txikiagoetan, banan-banan edo eskatu mesedez zure administradoreari",
-"couldn't be determined" => "ezin izan da zehaztu",
"Application is not enabled" => "Aplikazioa ez dago gaituta",
"Authentication error" => "Autentifikazio errorea",
"Token expired. Please reload page." => "Tokena iraungitu da. Mesedez birkargatu orria.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
"Please double check the <a href='%s'>installation guides</a>." => "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
"seconds ago" => "segundu",
-"1 minute ago" => "orain dela minutu 1",
-"%d minutes ago" => "orain dela %d minutu",
-"1 hour ago" => "orain dela ordu bat",
-"%d hours ago" => "orain dela %d ordu",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "gaur",
"yesterday" => "atzo",
-"%d days ago" => "orain dela %d egun",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "joan den hilabetean",
-"%d months ago" => "orain dela %d hilabete",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "joan den urtean",
"years ago" => "urte",
"Caused by:" => "Honek eraginda:",
"Could not find category \"%s\"" => "Ezin da \"%s\" kategoria aurkitu"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
index 40a778e2126..e9cb695bade 100644
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "راه‌نما",
"Personal" => "شخصی",
"Settings" => "تنظیمات",
"Users" => "کاربران",
-"Apps" => " برنامه ها",
"Admin" => "مدیر",
"web services under your control" => "سرویس های تحت وب در کنترل شما",
"ZIP download is turned off." => "دانلود به صورت فشرده غیر فعال است",
"Files need to be downloaded one by one." => "فایل ها باید به صورت یکی یکی دانلود شوند",
"Back to Files" => "بازگشت به فایل ها",
"Selected files too large to generate zip file." => "فایل های انتخاب شده بزرگتر از آن هستند که بتوان یک فایل فشرده تولید کرد",
-"couldn't be determined" => "نمیتواند مشخص شود",
"Application is not enabled" => "برنامه فعال نشده است",
"Authentication error" => "خطا در اعتبار سنجی",
"Token expired. Please reload page." => "رمز منقضی شده است. لطفا دوباره صفحه را بارگذاری نمایید.",
@@ -38,16 +37,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است.",
"Please double check the <a href='%s'>installation guides</a>." => "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
"seconds ago" => "ثانیه‌ها پیش",
-"1 minute ago" => "1 دقیقه پیش",
-"%d minutes ago" => "%d دقیقه پیش",
-"1 hour ago" => "1 ساعت پیش",
-"%d hours ago" => "%d ساعت پیش",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "امروز",
"yesterday" => "دیروز",
-"%d days ago" => "%d روز پیش",
+"_%n day go_::_%n days ago_" => array(""),
"last month" => "ماه قبل",
-"%d months ago" => "%dماه پیش",
+"_%n month ago_::_%n months ago_" => array(""),
"last year" => "سال قبل",
"years ago" => "سال‌های قبل",
"Could not find category \"%s\"" => "دسته بندی %s یافت نشد"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/fi.php b/lib/l10n/fi.php
index daaddb25e48..ac1f80a8f73 100644
--- a/lib/l10n/fi.php
+++ b/lib/l10n/fi.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Settings" => "asetukset"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 75576c3034d..4552d4627c0 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Ohje",
"Personal" => "Henkilökohtainen",
"Settings" => "Asetukset",
"Users" => "Käyttäjät",
-"Apps" => "Sovellukset",
"Admin" => "Ylläpitäjä",
"web services under your control" => "verkkopalvelut hallinnassasi",
"ZIP download is turned off." => "ZIP-lataus on poistettu käytöstä.",
"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" => "Tunnistautumisvirhe",
"Token expired. Please reload page." => "Valtuutus vanheni. Lataa sivu uudelleen.",
@@ -34,16 +33,16 @@
"Set an admin password." => "Aseta ylläpitäjän salasana.",
"Please double check the <a href='%s'>installation guides</a>." => "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
"seconds ago" => "sekuntia sitten",
-"1 minute ago" => "1 minuutti sitten",
-"%d minutes ago" => "%d minuuttia sitten",
-"1 hour ago" => "1 tunti sitten",
-"%d hours ago" => "%d tuntia sitten",
+"_%n minute ago_::_%n minutes ago_" => array("%n minuutti sitten","%n minuuttia sitten"),
+"_%n hour ago_::_%n hours ago_" => array("%n tunti sitten","%n tuntia sitten"),
"today" => "tänään",
"yesterday" => "eilen",
-"%d days ago" => "%d päivää sitten",
+"_%n day go_::_%n days ago_" => array("%n päivä sitten","%n päivää sitten"),
"last month" => "viime kuussa",
-"%d months ago" => "%d kuukautta sitten",
+"_%n month ago_::_%n months ago_" => array("%n kuukausi sitten","%n kuukautta sitten"),
"last year" => "viime vuonna",
"years ago" => "vuotta sitten",
+"Caused by:" => "Aiheuttaja:",
"Could not find category \"%s\"" => "Luokkaa \"%s\" ei löytynyt"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index 9f30b602696..cfcca28d5f8 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Aide",
"Personal" => "Personnel",
"Settings" => "Paramètres",
"Users" => "Utilisateurs",
-"Apps" => "Applications",
"Admin" => "Administration",
"web services under your control" => "services web sous votre contrôle",
"ZIP download is turned off." => "Téléchargement ZIP désactivé.",
"Files need to be downloaded one by one." => "Les fichiers nécessitent d'être téléchargés un par un.",
"Back to Files" => "Retour aux Fichiers",
"Selected files too large to generate zip file." => "Les fichiers sélectionnés sont trop volumineux pour être compressés.",
-"couldn't be determined" => "impossible à déterminer",
"Application is not enabled" => "L'application n'est pas activée",
"Authentication error" => "Erreur d'authentification",
"Token expired. Please reload page." => "La session a expiré. Veuillez recharger la page.",
@@ -38,16 +37,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.",
"Please double check the <a href='%s'>installation guides</a>." => "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
"seconds ago" => "il y a quelques secondes",
-"1 minute ago" => "il y a une minute",
-"%d minutes ago" => "il y a %d minutes",
-"1 hour ago" => "Il y a une heure",
-"%d hours ago" => "Il y a %d heures",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "aujourd'hui",
"yesterday" => "hier",
-"%d days ago" => "il y a %d jours",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "le mois dernier",
-"%d months ago" => "Il y a %d mois",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
"Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index f5309d95081..4d92e89ebba 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Axuda",
"Personal" => "Persoal",
"Settings" => "Axustes",
"Users" => "Usuarios",
-"Apps" => "Aplicativos",
"Admin" => "Administración",
"Failed to upgrade \"%s\"." => "Non foi posíbel anovar «%s».",
"web services under your control" => "servizos web baixo o seu control",
@@ -13,7 +13,6 @@
"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.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descargue os ficheiros en cachos máis pequenos e por separado, ou pídallos amabelmente ao seu administrador.",
-"couldn't be determined" => "non foi posíbel determinalo",
"Application is not enabled" => "O aplicativo non está activado",
"Authentication error" => "Produciuse un erro de autenticación",
"Token expired. Please reload page." => "Testemuña caducada. Recargue a páxina.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
"Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guías de instalación</a>",
"seconds ago" => "segundos atrás",
-"1 minute ago" => "hai 1 minuto",
-"%d minutes ago" => "hai %d minutos",
-"1 hour ago" => "Vai 1 hora",
-"%d hours ago" => "Vai %d horas",
+"_%n minute ago_::_%n minutes ago_" => array("hai %n minuto","hai %n minutos"),
+"_%n hour ago_::_%n hours ago_" => array("hai %n hora","hai %n horas"),
"today" => "hoxe",
"yesterday" => "onte",
-"%d days ago" => "hai %d días",
+"_%n day go_::_%n days ago_" => array("hai %n día","hai %n días"),
"last month" => "último mes",
-"%d months ago" => "Vai %d meses",
+"_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"),
"last year" => "último ano",
"years ago" => "anos atrás",
"Caused by:" => "Causado por:",
"Could not find category \"%s\"" => "Non foi posíbel atopar a categoría «%s»"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/he.php b/lib/l10n/he.php
index 2e011e342a0..bab1a6ff424 100644
--- a/lib/l10n/he.php
+++ b/lib/l10n/he.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "עזרה",
"Personal" => "אישי",
"Settings" => "הגדרות",
"Users" => "משתמשים",
-"Apps" => "יישומים",
"Admin" => "מנהל",
"web services under your control" => "שירותי רשת תחת השליטה שלך",
"ZIP download is turned off." => "הורדת ZIP כבויה",
@@ -19,16 +19,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין.",
"Please double check the <a href='%s'>installation guides</a>." => "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>.",
"seconds ago" => "שניות",
-"1 minute ago" => "לפני דקה אחת",
-"%d minutes ago" => "לפני %d דקות",
-"1 hour ago" => "לפני שעה",
-"%d hours ago" => "לפני %d שעות",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "היום",
"yesterday" => "אתמול",
-"%d days ago" => "לפני %d ימים",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "חודש שעבר",
-"%d months ago" => "לפני %d חודשים",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "שנה שעברה",
"years ago" => "שנים",
"Could not find category \"%s\"" => "לא ניתן למצוא את הקטגוריה „%s“"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/hi.php b/lib/l10n/hi.php
index f507993f494..039dfa4465d 100644
--- a/lib/l10n/hi.php
+++ b/lib/l10n/hi.php
@@ -1,7 +1,12 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "सहयोग",
"Personal" => "यक्तिगत",
"Settings" => "सेटिंग्स",
"Users" => "उपयोगकर्ता",
-"Apps" => "Apps"
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/hr.php b/lib/l10n/hr.php
index 41c34d3108c..d217f924099 100644
--- a/lib/l10n/hr.php
+++ b/lib/l10n/hr.php
@@ -1,18 +1,23 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Pomoć",
"Personal" => "Osobno",
"Settings" => "Postavke",
"Users" => "Korisnici",
-"Apps" => "Aplikacije",
"Admin" => "Administrator",
"web services under your control" => "web usluge pod vašom kontrolom",
"Authentication error" => "Greška kod autorizacije",
"Files" => "Datoteke",
"Text" => "Tekst",
"seconds ago" => "sekundi prije",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
"today" => "danas",
"yesterday" => "jučer",
+"_%n day go_::_%n days ago_" => array("","",""),
"last month" => "prošli mjesec",
+"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "prošlu godinu",
"years ago" => "godina"
);
+$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;";
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index 7738dcc05c8..7ec7621a655 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Súgó",
"Personal" => "Személyes",
"Settings" => "Beállítások",
"Users" => "Felhasználók",
-"Apps" => "Alkalmazások",
"Admin" => "Adminsztráció",
"Failed to upgrade \"%s\"." => "Sikertelen Frissítés \"%s\".",
"web services under your control" => "webszolgáltatások saját kézben",
@@ -13,7 +13,6 @@
"Back to Files" => "Vissza a Fájlokhoz",
"Selected files too large to generate zip file." => "A kiválasztott fájlok túl nagyok a zip tömörítéshez.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Tölts le a fileokat kisebb chunkokban, kölün vagy kérj segitséget a rendszergazdádtól.",
-"couldn't be determined" => "nem határozható meg",
"Application is not enabled" => "Az alkalmazás nincs engedélyezve",
"Authentication error" => "Azonosítási hiba",
"Token expired. Please reload page." => "A token lejárt. Frissítse az oldalt.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
"Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
"seconds ago" => "pár másodperce",
-"1 minute ago" => "1 perce",
-"%d minutes ago" => "%d perce",
-"1 hour ago" => "1 órája",
-"%d hours ago" => "%d órája",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "ma",
"yesterday" => "tegnap",
-"%d days ago" => "%d napja",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "múlt hónapban",
-"%d months ago" => "%d hónapja",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "tavaly",
"years ago" => "több éve",
"Caused by:" => "Okozta:",
"Could not find category \"%s\"" => "Ez a kategória nem található: \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/hy.php b/lib/l10n/hy.php
new file mode 100644
index 00000000000..15f78e0bce6
--- /dev/null
+++ b/lib/l10n/hy.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ia.php b/lib/l10n/ia.php
index e5f6e3ddf58..34f43bc424a 100644
--- a/lib/l10n/ia.php
+++ b/lib/l10n/ia.php
@@ -1,11 +1,16 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Adjuta",
"Personal" => "Personal",
"Settings" => "Configurationes",
"Users" => "Usatores",
-"Apps" => "Applicationes",
"Admin" => "Administration",
"web services under your control" => "servicios web sub tu controlo",
"Files" => "Files",
-"Text" => "Texto"
+"Text" => "Texto",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
index c247651f0c9..080faddb321 100644
--- a/lib/l10n/id.php
+++ b/lib/l10n/id.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Bantuan",
"Personal" => "Pribadi",
"Settings" => "Setelan",
"Users" => "Pengguna",
-"Apps" => "Aplikasi",
"Admin" => "Admin",
"web services under your control" => "layanan web dalam kontrol Anda",
"ZIP download is turned off." => "Pengunduhan ZIP dimatikan.",
"Files need to be downloaded one by one." => "Berkas harus diunduh satu persatu.",
"Back to Files" => "Kembali ke Daftar Berkas",
"Selected files too large to generate zip file." => "Berkas yang dipilih terlalu besar untuk dibuat berkas zip-nya.",
-"couldn't be determined" => "tidak dapat ditentukan",
"Application is not enabled" => "Aplikasi tidak diaktifkan",
"Authentication error" => "Galat saat autentikasi",
"Token expired. Please reload page." => "Token kedaluwarsa. Silakan muat ulang halaman.",
@@ -37,16 +36,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
"Please double check the <a href='%s'>installation guides</a>." => "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
"seconds ago" => "beberapa detik yang lalu",
-"1 minute ago" => "1 menit yang lalu",
-"%d minutes ago" => "%d menit yang lalu",
-"1 hour ago" => "1 jam yang lalu",
-"%d hours ago" => "%d jam yang lalu",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "hari ini",
"yesterday" => "kemarin",
-"%d days ago" => "%d hari yang lalu",
+"_%n day go_::_%n days ago_" => array(""),
"last month" => "bulan kemarin",
-"%d months ago" => "%d bulan yang lalu",
+"_%n month ago_::_%n months ago_" => array(""),
"last year" => "tahun kemarin",
"years ago" => "beberapa tahun lalu",
"Could not find category \"%s\"" => "Tidak dapat menemukan kategori \"%s\""
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/is.php b/lib/l10n/is.php
index 0f7a22fd13e..7512d278fb8 100644
--- a/lib/l10n/is.php
+++ b/lib/l10n/is.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Hjálp",
"Personal" => "Um mig",
"Settings" => "Stillingar",
"Users" => "Notendur",
-"Apps" => "Forrit",
"Admin" => "Stjórnun",
"web services under your control" => "vefþjónusta undir þinni stjórn",
"ZIP download is turned off." => "Slökkt á ZIP niðurhali.",
@@ -17,16 +17,15 @@
"Text" => "Texti",
"Images" => "Myndir",
"seconds ago" => "sek.",
-"1 minute ago" => "Fyrir 1 mínútu",
-"%d minutes ago" => "fyrir %d mínútum",
-"1 hour ago" => "Fyrir 1 klst.",
-"%d hours ago" => "fyrir %d klst.",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "í dag",
"yesterday" => "í gær",
-"%d days ago" => "fyrir %d dögum",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "síðasta mánuði",
-"%d months ago" => "fyrir %d mánuðum",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "síðasta ári",
"years ago" => "einhverjum árum",
"Could not find category \"%s\"" => "Fann ekki flokkinn \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index 693f86b6b80..e734fbdbb9b 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Aiuto",
"Personal" => "Personale",
"Settings" => "Impostazioni",
"Users" => "Utenti",
-"Apps" => "Applicazioni",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Aggiornamento non riuscito \"%s\".",
"web services under your control" => "servizi web nelle tue mani",
@@ -13,7 +13,6 @@
"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.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Scarica i file in blocchi più piccoli, separatamente o chiedi al tuo amministratore.",
-"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.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata.",
"Please double check the <a href='%s'>installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
"seconds ago" => "secondi fa",
-"1 minute ago" => "Un minuto fa",
-"%d minutes ago" => "%d minuti fa",
-"1 hour ago" => "1 ora fa",
-"%d hours ago" => "%d ore fa",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "oggi",
"yesterday" => "ieri",
-"%d days ago" => "%d giorni fa",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "mese scorso",
-"%d months ago" => "%d mesi fa",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "anno scorso",
"years ago" => "anni fa",
"Caused by:" => "Causato da:",
"Could not find category \"%s\"" => "Impossibile trovare la categoria \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 36d06d360b9..902170524b9 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -1,16 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "ヘルプ",
"Personal" => "個人",
"Settings" => "設定",
"Users" => "ユーザ",
-"Apps" => "アプリ",
"Admin" => "管理",
+"Failed to upgrade \"%s\"." => "\"%s\" へのアップグレードに失敗しました。",
"web services under your control" => "管理下のウェブサービス",
+"cannot open \"%s\"" => "\"%s\" が開けません",
"ZIP download is turned off." => "ZIPダウンロードは無効です。",
"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" => "測定できませんでした",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "ファイルは、小さいファイルに分割されてダウンロードされます。もしくは、管理者にお尋ねください。",
"Application is not enabled" => "アプリケーションは無効です",
"Authentication error" => "認証エラー",
"Token expired. Please reload page." => "トークンが無効になりました。ページを再読込してください。",
@@ -38,16 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。",
"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよく確認してください。",
"seconds ago" => "数秒前",
-"1 minute ago" => "1 分前",
-"%d minutes ago" => "%d 分前",
-"1 hour ago" => "1 時間前",
-"%d hours ago" => "%d 時間前",
+"_%n minute ago_::_%n minutes ago_" => array("%n 分前"),
+"_%n hour ago_::_%n hours ago_" => array("%n 時間後"),
"today" => "今日",
"yesterday" => "昨日",
-"%d days ago" => "%d 日前",
+"_%n day go_::_%n days ago_" => array("%n 日後"),
"last month" => "一月前",
-"%d months ago" => "%d 分前",
+"_%n month ago_::_%n months ago_" => array("%n カ月後"),
"last year" => "一年前",
"years ago" => "年前",
+"Caused by:" => "原因は以下:",
"Could not find category \"%s\"" => "カテゴリ \"%s\" が見つかりませんでした"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ka.php b/lib/l10n/ka.php
index e5a3e659668..04fefe8bdf1 100644
--- a/lib/l10n/ka.php
+++ b/lib/l10n/ka.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "შველა",
"Personal" => "პერსონა",
"Users" => "მომხმარებლები",
@@ -6,10 +7,11 @@
"ZIP download is turned off." => "ZIP გადმოწერა გამორთულია",
"Files" => "ფაილები",
"seconds ago" => "წამის წინ",
-"1 minute ago" => "1 წუთის წინ",
-"%d minutes ago" => "%d წუთის წინ",
-"1 hour ago" => "1 საათის წინ",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "დღეს",
"yesterday" => "გუშინ",
-"%d days ago" => "%d დღის წინ"
+"_%n day go_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php
index c6e77da2dac..8fbe34e6786 100644
--- a/lib/l10n/ka_GE.php
+++ b/lib/l10n/ka_GE.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "დახმარება",
"Personal" => "პირადი",
"Settings" => "პარამეტრები",
"Users" => "მომხმარებელი",
-"Apps" => "აპლიკაციები",
"Admin" => "ადმინისტრატორი",
"web services under your control" => "web services under your control",
"ZIP download is turned off." => "ZIP download–ი გათიშულია",
"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." => "Token–ს ვადა გაუვიდა. გთხოვთ განაახლოთ გვერდი.",
@@ -37,16 +36,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი.",
"Please double check the <a href='%s'>installation guides</a>." => "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>.",
"seconds ago" => "წამის წინ",
-"1 minute ago" => "1 წუთის წინ",
-"%d minutes ago" => "%d წუთის წინ",
-"1 hour ago" => "1 საათის წინ",
-"%d hours ago" => "%d საათის წინ",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "დღეს",
"yesterday" => "გუშინ",
-"%d days ago" => "%d დღის წინ",
+"_%n day go_::_%n days ago_" => array(""),
"last month" => "გასულ თვეში",
-"%d months ago" => "%d თვის წინ",
+"_%n month ago_::_%n months ago_" => array(""),
"last year" => "ბოლო წელს",
"years ago" => "წლის წინ",
"Could not find category \"%s\"" => "\"%s\" კატეგორიის მოძებნა ვერ მოხერხდა"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/kn.php b/lib/l10n/kn.php
new file mode 100644
index 00000000000..e7b09649a24
--- /dev/null
+++ b/lib/l10n/kn.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day go_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index 1f32ebe402a..4dab8b816bf 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "도움말",
"Personal" => "개인",
"Settings" => "설정",
"Users" => "사용자",
-"Apps" => "앱",
"Admin" => "관리자",
"web services under your control" => "내가 관리하는 웹 서비스",
"ZIP download is turned off." => "ZIP 다운로드가 비활성화되었습니다.",
"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." => "토큰이 만료되었습니다. 페이지를 새로 고치십시오.",
@@ -27,16 +26,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다.",
"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
"seconds ago" => "초 전",
-"1 minute ago" => "1분 전",
-"%d minutes ago" => "%d분 전",
-"1 hour ago" => "1시간 전",
-"%d hours ago" => "%d시간 전",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "오늘",
"yesterday" => "어제",
-"%d days ago" => "%d일 전",
+"_%n day go_::_%n days ago_" => array(""),
"last month" => "지난 달",
-"%d months ago" => "%d개월 전",
+"_%n month ago_::_%n months ago_" => array(""),
"last year" => "작년",
"years ago" => "년 전",
"Could not find category \"%s\"" => "분류 \"%s\"을(를) 찾을 수 없습니다."
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ku_IQ.php b/lib/l10n/ku_IQ.php
index 6d7461a1685..c99f9dd2a12 100644
--- a/lib/l10n/ku_IQ.php
+++ b/lib/l10n/ku_IQ.php
@@ -1,8 +1,13 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "یارمەتی",
"Settings" => "ده‌ستكاری",
"Users" => "به‌كارهێنه‌ر",
-"Apps" => "به‌رنامه‌كان",
"Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
-"web services under your control" => "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
+"web services under your control" => "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/lb.php b/lib/l10n/lb.php
index 867b0a37409..c25f5b55bd5 100644
--- a/lib/l10n/lb.php
+++ b/lib/l10n/lb.php
@@ -1,20 +1,23 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Hëllef",
"Personal" => "Perséinlech",
"Settings" => "Astellungen",
"Users" => "Benotzer",
-"Apps" => "Applikatiounen",
"Admin" => "Admin",
"web services under your control" => "Web-Servicer ënnert denger Kontroll",
"Authentication error" => "Authentifikatioun's Fehler",
"Files" => "Dateien",
"Text" => "SMS",
"seconds ago" => "Sekonnen hir",
-"1 minute ago" => "1 Minutt hir",
-"1 hour ago" => "vrun 1 Stonn",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "haut",
"yesterday" => "gëschter",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "Läschte Mount",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "Läscht Joer",
"years ago" => "Joren hier"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index 5e3a0482033..fb109b86339 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Pagalba",
"Personal" => "Asmeniniai",
"Settings" => "Nustatymai",
"Users" => "Vartotojai",
-"Apps" => "Programos",
"Admin" => "Administravimas",
"web services under your control" => "jūsų valdomos web paslaugos",
"ZIP download is turned off." => "ZIP atsisiuntimo galimybė yra išjungta.",
@@ -17,15 +17,14 @@
"Text" => "Žinučių",
"Images" => "Paveikslėliai",
"seconds ago" => "prieš sekundę",
-"1 minute ago" => "Prieš 1 minutę",
-"%d minutes ago" => "prieš %d minučių",
-"1 hour ago" => "prieš 1 valandą",
-"%d hours ago" => "prieš %d valandų",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
"today" => "šiandien",
"yesterday" => "vakar",
-"%d days ago" => "prieš %d dienų",
+"_%n day go_::_%n days ago_" => array("","",""),
"last month" => "praeitą mėnesį",
-"%d months ago" => "prieš %d mėnesių",
+"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "praeitais metais",
"years ago" => "prieš metus"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php
index 662f4d5b245..4090a36edcc 100644
--- a/lib/l10n/lv.php
+++ b/lib/l10n/lv.php
@@ -1,16 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Palīdzība",
"Personal" => "Personīgi",
"Settings" => "Iestatījumi",
"Users" => "Lietotāji",
-"Apps" => "Lietotnes",
"Admin" => "Administratori",
+"Failed to upgrade \"%s\"." => "Kļūda atjauninot \"%s\"",
"web services under your control" => "tīmekļa servisi tavā varā",
+"cannot open \"%s\"" => "Nevar atvērt \"%s\"",
"ZIP download is turned off." => "ZIP lejupielādēšana ir izslēgta.",
"Files need to be downloaded one by one." => "Datnes var lejupielādēt tikai katru atsevišķi.",
"Back to Files" => "Atpakaļ pie datnēm",
"Selected files too large to generate zip file." => "Izvēlētās datnes ir pārāk lielas, lai izveidotu zip datni.",
-"couldn't be determined" => "nevarēja noteikt",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Lejupielādējiet savus failus mazākās daļās, atsevišķi vai palūdziet tos administratoram.",
"Application is not enabled" => "Lietotne nav aktivēta",
"Authentication error" => "Autentifikācijas kļūda",
"Token expired. Please reload page." => "Pilnvarai ir beidzies termiņš. Lūdzu, pārlādējiet lapu.",
@@ -29,6 +31,7 @@
"Drop this user from MySQL" => "Izmest šo lietotāju no MySQL",
"MySQL user '%s'@'%%' already exists" => "MySQL lietotājs '%s'@'%%' jau eksistē",
"Drop this user from MySQL." => "Izmest šo lietotāju no MySQL.",
+"Oracle connection could not be established" => "Nevar izveidot savienojumu ar Oracle",
"Oracle username and/or password not valid" => "Nav derīga Oracle parole un/vai lietotājvārds",
"Offending command was: \"%s\", name: %s, password: %s" => "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s",
"PostgreSQL username and/or password not valid" => "Nav derīga PostgreSQL parole un/vai lietotājvārds",
@@ -37,16 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
"Please double check the <a href='%s'>installation guides</a>." => "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.",
"seconds ago" => "sekundes atpakaļ",
-"1 minute ago" => "pirms 1 minūtes",
-"%d minutes ago" => "pirms %d minūtēm",
-"1 hour ago" => "pirms 1 stundas",
-"%d hours ago" => "pirms %d stundām",
+"_%n minute ago_::_%n minutes ago_" => array("","","Pirms %n minūtēm"),
+"_%n hour ago_::_%n hours ago_" => array("","","Pirms %n stundām"),
"today" => "šodien",
"yesterday" => "vakar",
-"%d days ago" => "pirms %d dienām",
+"_%n day go_::_%n days ago_" => array("","","Pirms %n dienām"),
"last month" => "pagājušajā mēnesī",
-"%d months ago" => "pirms %d mēnešiem",
+"_%n month ago_::_%n months ago_" => array("","","Pirms %n mēnešiem"),
"last year" => "gājušajā gadā",
"years ago" => "gadus atpakaļ",
+"Caused by:" => "Cēlonis:",
"Could not find category \"%s\"" => "Nevarēja atrast kategoriju “%s”"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/lib/l10n/mk.php b/lib/l10n/mk.php
index 30fa9ab73c1..69d4a1cb694 100644
--- a/lib/l10n/mk.php
+++ b/lib/l10n/mk.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Помош",
"Personal" => "Лично",
"Settings" => "Подесувања",
"Users" => "Корисници",
-"Apps" => "Аппликации",
"Admin" => "Админ",
"web services under your control" => "веб сервиси под Ваша контрола",
"ZIP download is turned off." => "Преземање во ZIP е исклучено",
@@ -17,16 +17,15 @@
"Text" => "Текст",
"Images" => "Слики",
"seconds ago" => "пред секунди",
-"1 minute ago" => "пред 1 минута",
-"%d minutes ago" => "пред %d минути",
-"1 hour ago" => "пред 1 час",
-"%d hours ago" => "пред %d часови",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "денеска",
"yesterday" => "вчера",
-"%d days ago" => "пред %d денови",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "минатиот месец",
-"%d months ago" => "пред %d месеци",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "минатата година",
"years ago" => "пред години",
"Could not find category \"%s\"" => "Не можам да најдам категорија „%s“"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/lib/l10n/ml_IN.php b/lib/l10n/ml_IN.php
new file mode 100644
index 00000000000..15f78e0bce6
--- /dev/null
+++ b/lib/l10n/ml_IN.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ms_MY.php b/lib/l10n/ms_MY.php
index a2930597971..17ef07f83dd 100644
--- a/lib/l10n/ms_MY.php
+++ b/lib/l10n/ms_MY.php
@@ -1,12 +1,17 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Bantuan",
"Personal" => "Peribadi",
"Settings" => "Tetapan",
"Users" => "Pengguna",
-"Apps" => "Aplikasi",
"Admin" => "Admin",
"web services under your control" => "Perkhidmatan web di bawah kawalan anda",
"Authentication error" => "Ralat pengesahan",
"Files" => "Fail-fail",
-"Text" => "Teks"
+"Text" => "Teks",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day go_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/my_MM.php b/lib/l10n/my_MM.php
index f214a1ed794..5f4b6ddc820 100644
--- a/lib/l10n/my_MM.php
+++ b/lib/l10n/my_MM.php
@@ -1,29 +1,27 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "အကူအညီ",
"Users" => "သုံးစွဲသူ",
-"Apps" => "Apps",
"Admin" => "အက်ဒမင်",
"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
"ZIP download is turned off." => "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည်",
"Files need to be downloaded one by one." => "ဖိုင်များသည် တစ်ခုပြီး တစ်ခုဒေါင်းလုတ်ချရန်လိုအပ်သည်",
"Back to Files" => "ဖိုင်သို့ပြန်သွားမည်",
"Selected files too large to generate zip file." => "zip ဖိုင်အဖြစ်ပြုလုပ်ရန် ရွေးချယ်ထားသောဖိုင်များသည် အရမ်းကြီးလွန်းသည်",
-"couldn't be determined" => "မဆုံးဖြတ်နိုင်ပါ။",
"Authentication error" => "ခွင့်ပြုချက်မအောင်မြင်",
"Files" => "ဖိုင်များ",
"Text" => "စာသား",
"Images" => "ပုံရိပ်များ",
"seconds ago" => "စက္ကန့်အနည်းငယ်က",
-"1 minute ago" => "၁ မိနစ်အရင်က",
-"%d minutes ago" => "%d မိနစ်အရင်က",
-"1 hour ago" => "၁ နာရီ အရင်က",
-"%d hours ago" => "%d နာရီအရင်က",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "ယနေ့",
"yesterday" => "မနေ့က",
-"%d days ago" => "%d ရက် အရင်က",
+"_%n day go_::_%n days ago_" => array(""),
"last month" => "ပြီးခဲ့သောလ",
-"%d months ago" => "%d လအရင်က",
+"_%n month ago_::_%n months ago_" => array(""),
"last year" => "မနှစ်က",
"years ago" => "နှစ် အရင်က",
"Could not find category \"%s\"" => "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index ab2d4f91920..8e7d095d369 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Hjelp",
"Personal" => "Personlig",
"Settings" => "Innstillinger",
"Users" => "Brukere",
-"Apps" => "Apper",
"Admin" => "Admin",
"web services under your control" => "web tjenester du kontrollerer",
"ZIP download is turned off." => "ZIP-nedlasting av avslått",
@@ -19,16 +19,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
"Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
"seconds ago" => "sekunder siden",
-"1 minute ago" => "1 minutt siden",
-"%d minutes ago" => "%d minutter siden",
-"1 hour ago" => "1 time siden",
-"%d hours ago" => "%d timer siden",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "i dag",
"yesterday" => "i går",
-"%d days ago" => "%d dager siden",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "forrige måned",
-"%d months ago" => "%d måneder siden",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "forrige år",
"years ago" => "år siden",
"Could not find category \"%s\"" => "Kunne ikke finne kategori \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ne.php b/lib/l10n/ne.php
new file mode 100644
index 00000000000..15f78e0bce6
--- /dev/null
+++ b/lib/l10n/ne.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 0a221b11f00..338c3673c5b 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Help",
"Personal" => "Persoonlijk",
"Settings" => "Instellingen",
"Users" => "Gebruikers",
-"Apps" => "Apps",
"Admin" => "Beheerder",
"Failed to upgrade \"%s\"." => "Upgrade \"%s\" mislukt.",
"web services under your control" => "Webdiensten in eigen beheer",
@@ -13,7 +13,6 @@
"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.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Download de bestanden in kleinere brokken, appart of vraag uw administrator.",
-"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.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
"Please double check the <a href='%s'>installation guides</a>." => "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
"seconds ago" => "seconden geleden",
-"1 minute ago" => "1 minuut geleden",
-"%d minutes ago" => "%d minuten geleden",
-"1 hour ago" => "1 uur geleden",
-"%d hours ago" => "%d uren geleden",
+"_%n minute ago_::_%n minutes ago_" => array("%n minuut geleden","%n minuten geleden"),
+"_%n hour ago_::_%n hours ago_" => array("%n uur geleden","%n uur geleden"),
"today" => "vandaag",
"yesterday" => "gisteren",
-"%d days ago" => "%d dagen geleden",
+"_%n day go_::_%n days ago_" => array("%n dag terug","%n dagen geleden"),
"last month" => "vorige maand",
-"%d months ago" => "%d maanden geleden",
+"_%n month ago_::_%n months ago_" => array("%n maand geleden","%n maanden geleden"),
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
"Caused by:" => "Gekomen door:",
"Could not find category \"%s\"" => "Kon categorie \"%s\" niet vinden"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
index c1739398109..28b4f7b7d94 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Hjelp",
"Personal" => "Personleg",
"Settings" => "Innstillingar",
"Users" => "Brukarar",
-"Apps" => "Program",
"Admin" => "Administrer",
"web services under your control" => "Vev tjenester under din kontroll",
"Authentication error" => "Feil i autentisering",
@@ -12,11 +12,14 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
"Please double check the <a href='%s'>installation guides</a>." => "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
"seconds ago" => "sekund sidan",
-"1 minute ago" => "1 minutt sidan",
-"1 hour ago" => "1 time sidan",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "i dag",
"yesterday" => "i går",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "førre månad",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "i fjor",
"years ago" => "år sidan"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/oc.php b/lib/l10n/oc.php
index a72da90790a..40a527cc76c 100644
--- a/lib/l10n/oc.php
+++ b/lib/l10n/oc.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Ajuda",
"Personal" => "Personal",
"Settings" => "Configuracion",
"Users" => "Usancièrs",
-"Apps" => "Apps",
"Admin" => "Admin",
"web services under your control" => "Services web jos ton contraròtle",
"ZIP download is turned off." => "Avalcargar los ZIP es inactiu.",
@@ -12,12 +12,14 @@
"Authentication error" => "Error d'autentificacion",
"Files" => "Fichièrs",
"seconds ago" => "segonda a",
-"1 minute ago" => "1 minuta a",
-"%d minutes ago" => "%d minutas a",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "uèi",
"yesterday" => "ièr",
-"%d days ago" => "%d jorns a",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "mes passat",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "an passat",
"years ago" => "ans a"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index d06d5ba8a3e..984043aa0be 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Pomoc",
"Personal" => "Osobiste",
"Settings" => "Ustawienia",
"Users" => "Użytkownicy",
-"Apps" => "Aplikacje",
"Admin" => "Administrator",
"Failed to upgrade \"%s\"." => "Błąd przy aktualizacji \"%s\".",
"web services under your control" => "Kontrolowane serwisy",
@@ -13,7 +13,6 @@
"Back to Files" => "Wróć do plików",
"Selected files too large to generate zip file." => "Wybrane pliki są zbyt duże, aby wygenerować plik zip.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Pobierz pliki w mniejszy kawałkach, oddzielnie lub poproś administratora o zwiększenie limitu.",
-"couldn't be determined" => "nie może zostać znaleziony",
"Application is not enabled" => "Aplikacja nie jest włączona",
"Authentication error" => "Błąd uwierzytelniania",
"Token expired. Please reload page." => "Token wygasł. Proszę ponownie załadować stronę.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
"Please double check the <a href='%s'>installation guides</a>." => "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>.",
"seconds ago" => "sekund temu",
-"1 minute ago" => "1 minutę temu",
-"%d minutes ago" => "%d minut temu",
-"1 hour ago" => "1 godzinę temu",
-"%d hours ago" => "%d godzin temu",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
"today" => "dziś",
"yesterday" => "wczoraj",
-"%d days ago" => "%d dni temu",
+"_%n day go_::_%n days ago_" => array("","",""),
"last month" => "w zeszłym miesiącu",
-"%d months ago" => "%d miesiecy temu",
+"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "w zeszłym roku",
"years ago" => "lat temu",
"Caused by:" => "Spowodowane przez:",
"Could not find category \"%s\"" => "Nie można odnaleźć kategorii \"%s\""
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/pl_PL.php b/lib/l10n/pl_PL.php
index 67cf0a33259..5494e3dab25 100644
--- a/lib/l10n/pl_PL.php
+++ b/lib/l10n/pl_PL.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Settings" => "Ustawienia"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 23385e8c7d1..52329667174 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Ajuda",
"Personal" => "Pessoal",
"Settings" => "Ajustes",
"Users" => "Usuários",
-"Apps" => "Aplicações",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Falha na atualização de \"%s\".",
"web services under your control" => "serviços web sob seu controle",
@@ -13,7 +13,6 @@
"Back to Files" => "Voltar para Arquivos",
"Selected files too large to generate zip file." => "Arquivos selecionados são muito grandes para gerar arquivo zip.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Baixe os arquivos em pedaços menores, separadamente ou solicite educadamente ao seu administrador.",
-"couldn't be determined" => "não pôde ser determinado",
"Application is not enabled" => "Aplicação não está habilitada",
"Authentication error" => "Erro de autenticação",
"Token expired. Please reload page." => "Token expirou. Por favor recarregue a página.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira os <a href='%s'>guias de instalação</a>.",
"seconds ago" => "segundos atrás",
-"1 minute ago" => "1 minuto atrás",
-"%d minutes ago" => "%d minutos atrás",
-"1 hour ago" => "1 hora atrás",
-"%d hours ago" => "%d horas atrás",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "hoje",
"yesterday" => "ontem",
-"%d days ago" => "%d dias atrás",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "último mês",
-"%d months ago" => "%d meses atrás",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "último ano",
"years ago" => "anos atrás",
"Caused by:" => "Causados ​​por:",
"Could not find category \"%s\"" => "Impossível localizar categoria \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index 96cb5f65f56..c8a2f78cbf5 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Ajuda",
"Personal" => "Pessoal",
"Settings" => "Configurações",
"Users" => "Utilizadores",
-"Apps" => "Aplicações",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "A actualização \"%s\" falhou.",
"web services under your control" => "serviços web sob o seu controlo",
@@ -13,7 +13,6 @@
"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.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Descarregue os ficheiros em partes menores, separados ou peça gentilmente ao seu administrador.",
-"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.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
"seconds ago" => "Minutos atrás",
-"1 minute ago" => "Há 1 minuto",
-"%d minutes ago" => "há %d minutos",
-"1 hour ago" => "Há 1 horas",
-"%d hours ago" => "Há %d horas",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "hoje",
"yesterday" => "ontem",
-"%d days ago" => "há %d dias",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "ultímo mês",
-"%d months ago" => "Há %d meses atrás",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "ano passado",
"years ago" => "anos atrás",
"Caused by:" => "Causado por:",
"Could not find category \"%s\"" => "Não foi encontrado a categoria \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
index 5a34e9571e5..b338b349239 100644
--- a/lib/l10n/ro.php
+++ b/lib/l10n/ro.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Ajutor",
"Personal" => "Personal",
"Settings" => "Setări",
"Users" => "Utilizatori",
-"Apps" => "Aplicații",
"Admin" => "Admin",
"web services under your control" => "servicii web controlate de tine",
"ZIP download is turned off." => "Descărcarea ZIP este dezactivată.",
"Files need to be downloaded one by one." => "Fișierele trebuie descărcate unul câte unul.",
"Back to Files" => "Înapoi la fișiere",
"Selected files too large to generate zip file." => "Fișierele selectate sunt prea mari pentru a genera un fișier zip.",
-"couldn't be determined" => "nu poate fi determinat",
"Application is not enabled" => "Aplicația nu este activată",
"Authentication error" => "Eroare la autentificare",
"Token expired. Please reload page." => "Token expirat. Te rugăm să reîncarci pagina.",
@@ -18,18 +17,17 @@
"Text" => "Text",
"Images" => "Imagini",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.",
-"Please double check the <a href='%s'>installation guides</a>." => "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</ a>.",
+"Please double check the <a href='%s'>installation guides</a>." => "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>.",
"seconds ago" => "secunde în urmă",
-"1 minute ago" => "1 minut în urmă",
-"%d minutes ago" => "%d minute în urmă",
-"1 hour ago" => "Acum o ora",
-"%d hours ago" => "%d ore in urma",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
"today" => "astăzi",
"yesterday" => "ieri",
-"%d days ago" => "%d zile în urmă",
+"_%n day go_::_%n days ago_" => array("","",""),
"last month" => "ultima lună",
-"%d months ago" => "%d luni in urma",
+"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "ultimul an",
"years ago" => "ani în urmă",
"Could not find category \"%s\"" => "Cloud nu a gasit categoria \"%s\""
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index d9d1f5c53fe..c3b6a077b72 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Помощь",
"Personal" => "Личное",
"Settings" => "Конфигурация",
"Users" => "Пользователи",
-"Apps" => "Приложения",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Не смог обновить \"%s\".",
"web services under your control" => "веб-сервисы под вашим управлением",
@@ -13,7 +13,6 @@
"Back to Files" => "Назад к файлам",
"Selected files too large to generate zip file." => "Выбранные файлы слишком велики, чтобы создать zip файл.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Загрузите файл маленьшими порциями, раздельно или вежливо попросите Вашего администратора.",
-"couldn't be determined" => "Невозможно установить",
"Application is not enabled" => "Приложение не разрешено",
"Authentication error" => "Ошибка аутентификации",
"Token expired. Please reload page." => "Токен просрочен. Перезагрузите страницу.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV.",
"Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
"seconds ago" => "несколько секунд назад",
-"1 minute ago" => "1 минуту назад",
-"%d minutes ago" => "%d минут назад",
-"1 hour ago" => "час назад",
-"%d hours ago" => "%d часов назад",
+"_%n minute ago_::_%n minutes ago_" => array("%n минута назад","%n минуты назад","%n минут назад"),
+"_%n hour ago_::_%n hours ago_" => array("%n час назад","%n часа назад","%n часов назад"),
"today" => "сегодня",
"yesterday" => "вчера",
-"%d days ago" => "%d дней назад",
+"_%n day go_::_%n days ago_" => array("%n день назад","%n дня назад","%n дней назад"),
"last month" => "в прошлом месяце",
-"%d months ago" => "%d месяцев назад",
+"_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"),
"last year" => "в прошлом году",
"years ago" => "несколько лет назад",
"Caused by:" => "Вызвано:",
"Could not find category \"%s\"" => "Категория \"%s\" не найдена"
);
+$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);";
diff --git a/lib/l10n/ru_RU.php b/lib/l10n/ru_RU.php
deleted file mode 100644
index 7639a3cc97e..00000000000
--- a/lib/l10n/ru_RU.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Settings" => "Настройки",
-"Text" => "Текст"
-);
diff --git a/lib/l10n/si_LK.php b/lib/l10n/si_LK.php
index 49ded7026e0..d10804cae69 100644
--- a/lib/l10n/si_LK.php
+++ b/lib/l10n/si_LK.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "උදව්",
"Personal" => "පෞද්ගලික",
"Settings" => "සිටුවම්",
"Users" => "පරිශීලකයන්",
-"Apps" => "යෙදුම්",
"Admin" => "පරිපාලක",
"web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
"ZIP download is turned off." => "ZIP භාගත කිරීම් අක්‍රියයි",
@@ -17,12 +17,14 @@
"Text" => "පෙළ",
"Images" => "අනු රූ",
"seconds ago" => "තත්පරයන්ට පෙර",
-"1 minute ago" => "1 මිනිත්තුවකට පෙර",
-"%d minutes ago" => "%d මිනිත්තුවන්ට පෙර",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "අද",
"yesterday" => "ඊයේ",
-"%d days ago" => "%d දිනකට පෙර",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "පෙර මාසයේ",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "පෙර අවුරුද්දේ",
"years ago" => "අවුරුදු කීපයකට පෙර"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/sk.php b/lib/l10n/sk.php
new file mode 100644
index 00000000000..54812b15a6f
--- /dev/null
+++ b/lib/l10n/sk.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("","","")
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index 64ad1e540f3..4101af247c2 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -1,16 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Pomoc",
"Personal" => "Osobné",
"Settings" => "Nastavenia",
"Users" => "Používatelia",
-"Apps" => "Aplikácie",
"Admin" => "Administrátor",
+"Failed to upgrade \"%s\"." => "Zlyhala aktualizácia \"%s\".",
"web services under your control" => "webové služby pod Vašou kontrolou",
+"cannot open \"%s\"" => "nemožno otvoriť \"%s\"",
"ZIP download is turned off." => "Sťahovanie súborov ZIP je vypnuté.",
"Files need to be downloaded one by one." => "Súbory musia byť nahrávané jeden za druhým.",
"Back to Files" => "Späť na súbory",
"Selected files too large to generate zip file." => "Zvolené súbory sú príliš veľké na vygenerovanie zip súboru.",
-"couldn't be determined" => "nedá sa zistiť",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Stiahnite súbory po menších častiach, samostatne, alebo sa obráťte na správcu.",
"Application is not enabled" => "Aplikácia nie je zapnutá",
"Authentication error" => "Chyba autentifikácie",
"Token expired. Please reload page." => "Token vypršal. Obnovte, prosím, stránku.",
@@ -38,16 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
"Please double check the <a href='%s'>installation guides</a>." => "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
"seconds ago" => "pred sekundami",
-"1 minute ago" => "pred minútou",
-"%d minutes ago" => "pred %d minútami",
-"1 hour ago" => "Pred 1 hodinou",
-"%d hours ago" => "Pred %d hodinami.",
+"_%n minute ago_::_%n minutes ago_" => array("","","pred %n minútami"),
+"_%n hour ago_::_%n hours ago_" => array("","","pred %n hodinami"),
"today" => "dnes",
"yesterday" => "včera",
-"%d days ago" => "pred %d dňami",
+"_%n day go_::_%n days ago_" => array("","","pred %n dňami"),
"last month" => "minulý mesiac",
-"%d months ago" => "Pred %d mesiacmi.",
+"_%n month ago_::_%n months ago_" => array("","","pred %n mesiacmi"),
"last year" => "minulý rok",
"years ago" => "pred rokmi",
+"Caused by:" => "Príčina:",
"Could not find category \"%s\"" => "Nemožno nájsť danú kategóriu \"%s\""
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index a5b4decd61a..5722191aedf 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Pomoč",
"Personal" => "Osebno",
"Settings" => "Nastavitve",
"Users" => "Uporabniki",
-"Apps" => "Programi",
"Admin" => "Skrbništvo",
"web services under your control" => "spletne storitve pod vašim nadzorom",
"ZIP download is turned off." => "Prejemanje datotek v paketu ZIP je onemogočeno.",
"Files need to be downloaded one by one." => "Datoteke je mogoče prejeti le posamično.",
"Back to Files" => "Nazaj na datoteke",
"Selected files too large to generate zip file." => "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip.",
-"couldn't be determined" => "ni mogoče določiti",
"Application is not enabled" => "Program ni omogočen",
"Authentication error" => "Napaka pri overjanju",
"Token expired. Please reload page." => "Žeton je potekel. Stran je treba ponovno naložiti.",
@@ -38,16 +37,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena.",
"Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.",
"seconds ago" => "pred nekaj sekundami",
-"1 minute ago" => "pred minuto",
-"%d minutes ago" => "pred %d minutami",
-"1 hour ago" => "Pred 1 uro",
-"%d hours ago" => "Pred %d urami",
+"_%n minute ago_::_%n minutes ago_" => array("","","",""),
+"_%n hour ago_::_%n hours ago_" => array("","","",""),
"today" => "danes",
"yesterday" => "včeraj",
-"%d days ago" => "pred %d dnevi",
+"_%n day go_::_%n days ago_" => array("","","",""),
"last month" => "zadnji mesec",
-"%d months ago" => "Pred %d meseci",
+"_%n month ago_::_%n months ago_" => array("","","",""),
"last year" => "lansko leto",
"years ago" => "let nazaj",
"Could not find category \"%s\"" => "Kategorije \"%s\" ni mogoče najti."
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php
index df5e2a31743..c2447b7ea23 100644
--- a/lib/l10n/sq.php
+++ b/lib/l10n/sq.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Ndihmë",
"Personal" => "Personale",
"Settings" => "Parametra",
"Users" => "Përdoruesit",
-"Apps" => "App",
"Admin" => "Admin",
"web services under your control" => "shërbime web nën kontrollin tënd",
"ZIP download is turned off." => "Shkarimi i skedarëve ZIP është i çaktivizuar.",
"Files need to be downloaded one by one." => "Skedarët duhet të shkarkohen një nga një.",
"Back to Files" => "Kthehu tek skedarët",
"Selected files too large to generate zip file." => "Skedarët e selektuar janë shumë të mëdhenj për të krijuar një skedar ZIP.",
-"couldn't be determined" => "nuk u vendos dot",
"Application is not enabled" => "Programi nuk është i aktivizuar.",
"Authentication error" => "Veprim i gabuar gjatë vërtetimit të identitetit",
"Token expired. Please reload page." => "Përmbajtja ka skaduar. Ju lutemi ringarkoni faqen.",
@@ -37,16 +36,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar.",
"Please double check the <a href='%s'>installation guides</a>." => "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>.",
"seconds ago" => "sekonda më parë",
-"1 minute ago" => "1 minutë më parë",
-"%d minutes ago" => "%d minuta më parë",
-"1 hour ago" => "1 orë më parë",
-"%d hours ago" => "%d orë më parë",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "sot",
"yesterday" => "dje",
-"%d days ago" => "%d ditë më parë",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "muajin e shkuar",
-"%d months ago" => "%d muaj më parë",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "vitin e shkuar",
"years ago" => "vite më parë",
"Could not find category \"%s\"" => "Kategoria \"%s\" nuk u gjet"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/sr.php b/lib/l10n/sr.php
index 71d627e7890..9441d0578fc 100644
--- a/lib/l10n/sr.php
+++ b/lib/l10n/sr.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Помоћ",
"Personal" => "Лично",
"Settings" => "Поставке",
"Users" => "Корисници",
-"Apps" => "Апликације",
"Admin" => "Администратор",
"web services under your control" => "веб сервиси под контролом",
"ZIP download is turned off." => "Преузимање ZIP-а је искључено.",
"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." => "Жетон је истекао. Поново учитајте страницу.",
@@ -20,16 +19,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно.",
"Please double check the <a href='%s'>installation guides</a>." => "Погледајте <a href='%s'>водиче за инсталацију</a>.",
"seconds ago" => "пре неколико секунди",
-"1 minute ago" => "пре 1 минут",
-"%d minutes ago" => "пре %d минута",
-"1 hour ago" => "Пре једног сата",
-"%d hours ago" => "пре %d сата/и",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
"today" => "данас",
"yesterday" => "јуче",
-"%d days ago" => "пре %d дана",
+"_%n day go_::_%n days ago_" => array("","",""),
"last month" => "прошлог месеца",
-"%d months ago" => "пре %d месеца/и",
+"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "прошле године",
"years ago" => "година раније",
"Could not find category \"%s\"" => "Не могу да пронађем категорију „%s“."
);
+$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);";
diff --git a/lib/l10n/sr@latin.php b/lib/l10n/sr@latin.php
index 13cedc83279..5ba51bc0ba7 100644
--- a/lib/l10n/sr@latin.php
+++ b/lib/l10n/sr@latin.php
@@ -1,11 +1,16 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Pomoć",
"Personal" => "Lično",
"Settings" => "Podešavanja",
"Users" => "Korisnici",
-"Apps" => "Programi",
"Admin" => "Adninistracija",
"Authentication error" => "Greška pri autentifikaciji",
"Files" => "Fajlovi",
-"Text" => "Tekst"
+"Text" => "Tekst",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("","",""),
+"_%n month ago_::_%n months ago_" => array("","","")
);
+$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);";
diff --git a/lib/l10n/string.php b/lib/l10n/string.php
index 8eef10071e6..88c85b32e70 100644
--- a/lib/l10n/string.php
+++ b/lib/l10n/string.php
@@ -7,19 +7,50 @@
*/
class OC_L10N_String{
+ /**
+ * @var OC_L10N
+ */
protected $l10n;
- public function __construct($l10n, $text, $parameters) {
+
+ /**
+ * @var string
+ */
+ protected $text;
+
+ /**
+ * @var array
+ */
+ protected $parameters;
+
+ /**
+ * @var integer
+ */
+ protected $count;
+
+ public function __construct($l10n, $text, $parameters, $count = 1) {
$this->l10n = $l10n;
$this->text = $text;
$this->parameters = $parameters;
-
+ $this->count = $count;
}
public function __toString() {
$translations = $this->l10n->getTranslations();
+
+ $text = $this->text;
if(array_key_exists($this->text, $translations)) {
- return vsprintf($translations[$this->text], $this->parameters);
+ if(is_array($translations[$this->text])) {
+ $fn = $this->l10n->getPluralFormFunction();
+ $id = $fn($this->count);
+ $text = $translations[$this->text][$id];
+ }
+ else{
+ $text = $translations[$this->text];
+ }
}
- return vsprintf($this->text, $this->parameters);
+
+ // Replace %n first (won't interfere with vsprintf)
+ $text = str_replace('%n', $this->count, $text);
+ return vsprintf($text, $this->parameters);
}
}
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 0e2e806b4f6..dd54e6ca5d3 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Hjälp",
"Personal" => "Personligt",
"Settings" => "Inställningar",
"Users" => "Användare",
-"Apps" => "Program",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Misslyckades med att uppgradera \"%s\".",
"web services under your control" => "webbtjänster under din kontroll",
@@ -13,7 +13,6 @@
"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.",
"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Ladda ner filerna i mindre bitar, separat eller fråga din administratör.",
-"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.",
@@ -41,17 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
"Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
"seconds ago" => "sekunder sedan",
-"1 minute ago" => "1 minut sedan",
-"%d minutes ago" => "%d minuter sedan",
-"1 hour ago" => "1 timme sedan",
-"%d hours ago" => "%d timmar sedan",
+"_%n minute ago_::_%n minutes ago_" => array("%n minut sedan","%n minuter sedan"),
+"_%n hour ago_::_%n hours ago_" => array("%n timme sedan","%n timmar sedan"),
"today" => "i dag",
"yesterday" => "i går",
-"%d days ago" => "%d dagar sedan",
+"_%n day go_::_%n days ago_" => array("%n dag sedan","%n dagar sedan"),
"last month" => "förra månaden",
-"%d months ago" => "%d månader sedan",
+"_%n month ago_::_%n months ago_" => array("%n månad sedan","%n månader sedan"),
"last year" => "förra året",
"years ago" => "år sedan",
"Caused by:" => "Orsakad av:",
"Could not find category \"%s\"" => "Kunde inte hitta kategorin \"%s\""
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/sw_KE.php b/lib/l10n/sw_KE.php
new file mode 100644
index 00000000000..15f78e0bce6
--- /dev/null
+++ b/lib/l10n/sw_KE.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ta_LK.php b/lib/l10n/ta_LK.php
index 9193f6f1d2f..e70e65845be 100644
--- a/lib/l10n/ta_LK.php
+++ b/lib/l10n/ta_LK.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "உதவி",
"Personal" => "தனிப்பட்ட",
"Settings" => "அமைப்புகள்",
"Users" => "பயனாளர்",
-"Apps" => "செயலிகள்",
"Admin" => "நிர்வாகம்",
"web services under your control" => "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது",
"ZIP download is turned off." => "வீசொலிப் பூட்டு பதிவிறக்கம் நிறுத்தப்பட்டுள்ளது.",
@@ -17,16 +17,15 @@
"Text" => "உரை",
"Images" => "படங்கள்",
"seconds ago" => "செக்கன்களுக்கு முன்",
-"1 minute ago" => "1 நிமிடத்திற்கு முன் ",
-"%d minutes ago" => "%d நிமிடங்களுக்கு முன்",
-"1 hour ago" => "1 மணித்தியாலத்திற்கு முன்",
-"%d hours ago" => "%d மணித்தியாலத்திற்கு முன்",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "இன்று",
"yesterday" => "நேற்று",
-"%d days ago" => "%d நாட்களுக்கு முன்",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "கடந்த மாதம்",
-"%d months ago" => "%d மாதத்திற்கு முன்",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "கடந்த வருடம்",
"years ago" => "வருடங்களுக்கு முன்",
"Could not find category \"%s\"" => "பிரிவு \"%s\" ஐ கண்டுப்பிடிக்க முடியவில்லை"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/te.php b/lib/l10n/te.php
index 87c73d790e2..524ea0c6024 100644
--- a/lib/l10n/te.php
+++ b/lib/l10n/te.php
@@ -1,13 +1,17 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "సహాయం",
"Settings" => "అమరికలు",
"Users" => "వాడుకరులు",
"seconds ago" => "క్షణాల క్రితం",
-"1 minute ago" => "1 నిమిషం క్రితం",
-"1 hour ago" => "1 గంట క్రితం",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
"today" => "ఈరోజు",
"yesterday" => "నిన్న",
+"_%n day go_::_%n days ago_" => array("",""),
"last month" => "పోయిన నెల",
+"_%n month ago_::_%n months ago_" => array("",""),
"last year" => "పోయిన సంవత్సరం",
"years ago" => "సంవత్సరాల క్రితం"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
index 4ec6ef55f4e..3344d0bb18e 100644
--- a/lib/l10n/th_TH.php
+++ b/lib/l10n/th_TH.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "ช่วยเหลือ",
"Personal" => "ส่วนตัว",
"Settings" => "ตั้งค่า",
"Users" => "ผู้ใช้งาน",
-"Apps" => "แอปฯ",
"Admin" => "ผู้ดูแล",
"web services under your control" => "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้",
"ZIP download is turned off." => "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้",
"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." => "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง",
@@ -18,16 +17,15 @@
"Text" => "ข้อความ",
"Images" => "รูปภาพ",
"seconds ago" => "วินาที ก่อนหน้านี้",
-"1 minute ago" => "1 นาทีก่อนหน้านี้",
-"%d minutes ago" => "%d นาทีที่ผ่านมา",
-"1 hour ago" => "1 ชั่วโมงก่อนหน้านี้",
-"%d hours ago" => "%d ชั่วโมงก่อนหน้านี้",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "วันนี้",
"yesterday" => "เมื่อวานนี้",
-"%d days ago" => "%d วันที่ผ่านมา",
+"_%n day go_::_%n days ago_" => array(""),
"last month" => "เดือนที่แล้ว",
-"%d months ago" => "%d เดือนมาแล้ว",
+"_%n month ago_::_%n months ago_" => array(""),
"last year" => "ปีที่แล้ว",
"years ago" => "ปี ที่ผ่านมา",
"Could not find category \"%s\"" => "ไม่พบหมวดหมู่ \"%s\""
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 6325ad9886a..498469ea8b1 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -1,16 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Yardım",
"Personal" => "Kişisel",
"Settings" => "Ayarlar",
"Users" => "Kullanıcılar",
-"Apps" => "Uygulamalar",
"Admin" => "Yönetici",
+"Failed to upgrade \"%s\"." => "\"%s\" yükseltme başarısız oldu.",
"web services under your control" => "Bilgileriniz güvenli ve şifreli",
+"cannot open \"%s\"" => "\"%s\" açılamıyor",
"ZIP download is turned off." => "ZIP indirmeleri kapatılmıştır.",
"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",
+"Download the files in smaller chunks, seperately or kindly ask your administrator." => "Dosyaları ayrı ayrı, küçük parçalar halinde indirin ya da yöneticinizden yardım isteyin. ",
"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.",
@@ -38,16 +40,16 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor.",
"Please double check the <a href='%s'>installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin.",
"seconds ago" => "saniye önce",
-"1 minute ago" => "1 dakika önce",
-"%d minutes ago" => "%d dakika önce",
-"1 hour ago" => "1 saat önce",
-"%d hours ago" => "%d saat önce",
+"_%n minute ago_::_%n minutes ago_" => array("","%n dakika önce"),
+"_%n hour ago_::_%n hours ago_" => array("","%n saat önce"),
"today" => "bugün",
"yesterday" => "dün",
-"%d days ago" => "%d gün önce",
+"_%n day go_::_%n days ago_" => array("","%n gün önce"),
"last month" => "geçen ay",
-"%d months ago" => "%d ay önce",
+"_%n month ago_::_%n months ago_" => array("","%n ay önce"),
"last year" => "geçen yıl",
"years ago" => "yıl önce",
+"Caused by:" => "Neden olan:",
"Could not find category \"%s\"" => "\"%s\" kategorisi bulunamadı"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/ug.php b/lib/l10n/ug.php
index 62d91616c1d..731ad904d7e 100644
--- a/lib/l10n/ug.php
+++ b/lib/l10n/ug.php
@@ -1,19 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "ياردەم",
"Personal" => "شەخسىي",
"Settings" => "تەڭشەكلەر",
"Users" => "ئىشلەتكۈچىلەر",
-"Apps" => "ئەپلەر",
"Authentication error" => "سالاھىيەت دەلىللەش خاتالىقى",
"Files" => "ھۆججەتلەر",
"Text" => "قىسقا ئۇچۇر",
"Images" => "سۈرەتلەر",
-"1 minute ago" => "1 مىنۇت ئىلگىرى",
-"%d minutes ago" => "%d مىنۇت ئىلگىرى",
-"1 hour ago" => "1 سائەت ئىلگىرى",
-"%d hours ago" => "%d سائەت ئىلگىرى",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "بۈگۈن",
"yesterday" => "تۈنۈگۈن",
-"%d days ago" => "%d كۈن ئىلگىرى",
-"%d months ago" => "%d ئاي ئىلگىرى"
+"_%n day go_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 7ff7829e1a2..c1513c5bb79 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Допомога",
"Personal" => "Особисте",
"Settings" => "Налаштування",
"Users" => "Користувачі",
-"Apps" => "Додатки",
"Admin" => "Адмін",
"web services under your control" => "підконтрольні Вам веб-сервіси",
"ZIP download is turned off." => "ZIP завантаження вимкнено.",
"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." => "Строк дії токена скінчився. Будь ласка, перезавантажте сторінку.",
@@ -37,16 +36,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.",
"Please double check the <a href='%s'>installation guides</a>." => "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
"seconds ago" => "секунди тому",
-"1 minute ago" => "1 хвилину тому",
-"%d minutes ago" => "%d хвилин тому",
-"1 hour ago" => "1 годину тому",
-"%d hours ago" => "%d годин тому",
+"_%n minute ago_::_%n minutes ago_" => array("","",""),
+"_%n hour ago_::_%n hours ago_" => array("","",""),
"today" => "сьогодні",
"yesterday" => "вчора",
-"%d days ago" => "%d днів тому",
+"_%n day go_::_%n days ago_" => array("","",""),
"last month" => "минулого місяця",
-"%d months ago" => "%d місяців тому",
+"_%n month ago_::_%n months ago_" => array("","",""),
"last year" => "минулого року",
"years ago" => "роки тому",
"Could not find category \"%s\"" => "Не вдалося знайти категорію \"%s\""
);
+$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);";
diff --git a/lib/l10n/ur_PK.php b/lib/l10n/ur_PK.php
index 21e711c6df5..7dc967ccd93 100644
--- a/lib/l10n/ur_PK.php
+++ b/lib/l10n/ur_PK.php
@@ -1,9 +1,14 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "مدد",
"Personal" => "ذاتی",
"Settings" => "سیٹینگز",
"Users" => "یوزرز",
-"Apps" => "ایپز",
"Admin" => "ایڈمن",
-"web services under your control" => "آپ کے اختیار میں ویب سروسیز"
+"web services under your control" => "آپ کے اختیار میں ویب سروسیز",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/vi.php b/lib/l10n/vi.php
index f2a7d669b8f..dc0045c35ca 100644
--- a/lib/l10n/vi.php
+++ b/lib/l10n/vi.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "Giúp đỡ",
"Personal" => "Cá nhân",
"Settings" => "Cài đặt",
"Users" => "Người dùng",
-"Apps" => "Ứng dụng",
"Admin" => "Quản trị",
"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn",
"ZIP download is turned off." => "Tải về ZIP đã bị tắt.",
"Files need to be downloaded one by one." => "Tập tin cần phải được tải về từng người một.",
"Back to Files" => "Trở lại tập tin",
"Selected files too large to generate zip file." => "Tập tin được chọn quá lớn để tạo tập tin ZIP.",
-"couldn't be determined" => "không thể phát hiện được",
"Application is not enabled" => "Ứng dụng không được BẬT",
"Authentication error" => "Lỗi xác thực",
"Token expired. Please reload page." => "Mã Token đã hết hạn. Hãy tải lại trang.",
@@ -18,16 +17,15 @@
"Text" => "Văn bản",
"Images" => "Hình ảnh",
"seconds ago" => "vài giây trước",
-"1 minute ago" => "1 phút trước",
-"%d minutes ago" => "%d phút trước",
-"1 hour ago" => "1 giờ trước",
-"%d hours ago" => "%d giờ trước",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "hôm nay",
"yesterday" => "hôm qua",
-"%d days ago" => "%d ngày trước",
+"_%n day go_::_%n days ago_" => array(""),
"last month" => "tháng trước",
-"%d months ago" => "%d tháng trước",
+"_%n month ago_::_%n months ago_" => array(""),
"last year" => "năm trước",
"years ago" => "năm trước",
"Could not find category \"%s\"" => "không thể tìm thấy mục \"%s\""
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/zh_CN.GB2312.php b/lib/l10n/zh_CN.GB2312.php
index 4780a69eb34..bc81ff8fe1b 100644
--- a/lib/l10n/zh_CN.GB2312.php
+++ b/lib/l10n/zh_CN.GB2312.php
@@ -1,9 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "帮助",
"Personal" => "私人",
"Settings" => "设置",
"Users" => "用户",
-"Apps" => "程序",
"Admin" => "管理员",
"web services under your control" => "您控制的网络服务",
"ZIP download is turned off." => "ZIP 下载已关闭",
@@ -19,13 +19,14 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "因WebDAV接口故障,您的网络服务器好像并未允许文件同步。",
"Please double check the <a href='%s'>installation guides</a>." => "请双击<a href='%s'>安装向导</a>。",
"seconds ago" => "秒前",
-"1 minute ago" => "1 分钟前",
-"%d minutes ago" => "%d 分钟前",
-"1 hour ago" => "1小时前",
+"_%n minute ago_::_%n minutes ago_" => array("%n 分钟以前"),
+"_%n hour ago_::_%n hours ago_" => array("%n 小时以前"),
"today" => "今天",
"yesterday" => "昨天",
-"%d days ago" => "%d 天前",
+"_%n day go_::_%n days ago_" => array("%n 天以前"),
"last month" => "上个月",
+"_%n month ago_::_%n months ago_" => array("%n 个月以前"),
"last year" => "去年",
"years ago" => "年前"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index 7630f885c4a..03bd48de74b 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "帮助",
"Personal" => "个人",
"Settings" => "设置",
"Users" => "用户",
-"Apps" => "应用",
"Admin" => "管理",
"web services under your control" => "您控制的web服务",
"ZIP download is turned off." => "ZIP 下载已经关闭",
"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." => "Token 过期,请刷新页面。",
@@ -38,16 +37,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
"Please double check the <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
"seconds ago" => "秒前",
-"1 minute ago" => "一分钟前",
-"%d minutes ago" => "%d 分钟前",
-"1 hour ago" => "1小时前",
-"%d hours ago" => "%d小时前",
+"_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "今天",
"yesterday" => "昨天",
-"%d days ago" => "%d 天前",
+"_%n day go_::_%n days ago_" => array(""),
"last month" => "上月",
-"%d months ago" => "%d 月前",
+"_%n month ago_::_%n months ago_" => array(""),
"last year" => "去年",
"years ago" => "年前",
"Could not find category \"%s\"" => "无法找到分类 \"%s\""
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/zh_HK.php b/lib/l10n/zh_HK.php
index cfa33ec36f5..ca3e6d504e7 100644
--- a/lib/l10n/zh_HK.php
+++ b/lib/l10n/zh_HK.php
@@ -1,13 +1,18 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "幫助",
"Personal" => "個人",
"Settings" => "設定",
"Users" => "用戶",
-"Apps" => "軟件",
"Admin" => "管理",
"Files" => "文件",
"Text" => "文字",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "今日",
"yesterday" => "昨日",
-"last month" => "前一月"
+"_%n day go_::_%n days ago_" => array(""),
+"last month" => "前一月",
+"_%n month ago_::_%n months ago_" => array("")
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index afd196f7c82..f405eb88ae9 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -1,16 +1,15 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Help" => "說明",
"Personal" => "個人",
"Settings" => "設定",
"Users" => "使用者",
-"Apps" => "應用程式",
"Admin" => "管理",
"web services under your control" => "由您控制的網路服務",
"ZIP download is turned off." => "ZIP 下載已關閉。",
"Files need to be downloaded one by one." => "檔案需要逐一下載。",
"Back to Files" => "回到檔案列表",
"Selected files too large to generate zip file." => "選擇的檔案太大以致於無法產生壓縮檔。",
-"couldn't be determined" => "無法判斷",
"Application is not enabled" => "應用程式未啟用",
"Authentication error" => "認證錯誤",
"Token expired. Please reload page." => "Token 過期,請重新整理頁面。",
@@ -38,16 +37,15 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的網頁伺服器尚未被正確設定來進行檔案同步,因為您的 WebDAV 界面似乎無法使用。",
"Please double check the <a href='%s'>installation guides</a>." => "請參考<a href='%s'>安裝指南</a>。",
"seconds ago" => "幾秒前",
-"1 minute ago" => "1 分鐘前",
-"%d minutes ago" => "%d 分鐘前",
-"1 hour ago" => "1 小時之前",
-"%d hours ago" => "%d 小時之前",
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
"today" => "今天",
"yesterday" => "昨天",
-"%d days ago" => "%d 天前",
+"_%n day go_::_%n days ago_" => array(""),
"last month" => "上個月",
-"%d months ago" => "%d 個月之前",
+"_%n month ago_::_%n months ago_" => array(""),
"last year" => "去年",
"years ago" => "幾年前",
"Could not find category \"%s\"" => "找不到分類:\"%s\""
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/memcache/factory.php b/lib/memcache/factory.php
index 4c1b1ab207f..fde7d947567 100644
--- a/lib/memcache/factory.php
+++ b/lib/memcache/factory.php
@@ -37,4 +37,33 @@ class Factory {
public function isAvailable() {
return XCache::isAvailable() || APCu::isAvailable() || APC::isAvailable() || Memcached::isAvailable();
}
+
+ /**
+ * get a in-server cache instance, will return null if no backend is available
+ *
+ * @param string $prefix
+ * @return \OC\Memcache\Cache
+ */
+ public static function createLowLatency($prefix = '') {
+ if (XCache::isAvailable()) {
+ return new XCache($prefix);
+ } elseif (APCu::isAvailable()) {
+ return new APCu($prefix);
+ } elseif (APC::isAvailable()) {
+ return new APC($prefix);
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * check if there is a in-server backend available
+ *
+ * @return bool
+ */
+ public static function isAvailableLowLatency() {
+ return XCache::isAvailable() || APCu::isAvailable() || APC::isAvailable();
+ }
+
+
}
diff --git a/lib/ocs/result.php b/lib/ocs/result.php
index 729c39056d9..84f06fa01c7 100644
--- a/lib/ocs/result.php
+++ b/lib/ocs/result.php
@@ -94,4 +94,4 @@ class OC_OCS_Result{
}
-} \ No newline at end of file
+}
diff --git a/lib/public/groupinterface.php b/lib/public/groupinterface.php
index 97833028118..5603faa8265 100644
--- a/lib/public/groupinterface.php
+++ b/lib/public/groupinterface.php
@@ -28,4 +28,4 @@
namespace OCP;
-interface GroupInterface extends \OC_Group_Interface {} \ No newline at end of file
+interface GroupInterface extends \OC_Group_Interface {}
diff --git a/lib/public/share.php b/lib/public/share.php
index 63645e6fa34..b38208bc67f 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -209,7 +209,7 @@ class Share {
}
}
}
-
+
// let's get the parent for the next round
$meta = $cache->get((int)$source);
if($meta !== false) {
@@ -840,7 +840,11 @@ class Share {
// Get filesystem root to add it to the file target and remove from the
// file source, match file_source with the file cache
if ($itemType == 'file' || $itemType == 'folder') {
- $root = \OC\Files\Filesystem::getRoot();
+ if(!is_null($uidOwner)) {
+ $root = \OC\Files\Filesystem::getRoot();
+ } else {
+ $root = '';
+ }
$where = 'INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid`';
if (!isset($item)) {
$where .= ' WHERE `file_target` IS NOT NULL';
@@ -1303,11 +1307,11 @@ class Share {
'run' => &$run,
'error' => &$error
));
-
+
if ($run === false) {
throw new \Exception($error);
}
-
+
if (isset($fileSource)) {
if ($parentFolder) {
if ($parentFolder === true) {
@@ -1398,11 +1402,11 @@ class Share {
'run' => &$run,
'error' => &$error
));
-
+
if ($run === false) {
throw new \Exception($error);
}
-
+
if (isset($fileSource)) {
if ($parentFolder) {
if ($parentFolder === true) {
diff --git a/lib/public/userinterface.php b/lib/public/userinterface.php
index b73a8f8d8b0..53d9faf7a5e 100644
--- a/lib/public/userinterface.php
+++ b/lib/public/userinterface.php
@@ -28,4 +28,4 @@
namespace OCP;
-interface UserInterface extends \OC_User_Interface {} \ No newline at end of file
+interface UserInterface extends \OC_User_Interface {}
diff --git a/lib/public/util.php b/lib/public/util.php
index 693805946ea..b33f07b55e6 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -123,6 +123,14 @@ class Util {
}
/**
+ * @brief check if some encrypted files are stored
+ * @return bool
+ */
+ public static function encryptedFiles() {
+ return \OC_Util::encryptedFiles();
+ }
+
+ /**
* @brief Creates an absolute url
* @param string $app app
* @param string $file file
diff --git a/lib/template/functions.php b/lib/template/functions.php
index 2d43cae1c0c..717e197c1cb 100644
--- a/lib/template/functions.php
+++ b/lib/template/functions.php
@@ -78,15 +78,13 @@ function relative_modified_date($timestamp) {
$diffmonths = round($diffdays/31);
if($timediff < 60) { return $l->t('seconds ago'); }
- else if($timediff < 120) { return $l->t('1 minute ago'); }
- else if($timediff < 3600) { return $l->t('%d minutes ago', $diffminutes); }
- else if($timediff < 7200) { return $l->t('1 hour ago'); }
- else if($timediff < 86400) { return $l->t('%d hours ago', $diffhours); }
+ else if($timediff < 3600) { return $l->n('%n minute ago', '%n minutes ago', $diffminutes); }
+ else if($timediff < 86400) { return $l->n('%n hour ago', '%n hours ago', $diffhours); }
else if((date('G')-$diffhours) > 0) { return $l->t('today'); }
else if((date('G')-$diffhours) > -24) { return $l->t('yesterday'); }
- else if($timediff < 2678400) { return $l->t('%d days ago', $diffdays); }
+ else if($timediff < 2678400) { return $l->n('%n day go', '%n days ago', $diffdays); }
else if($timediff < 5184000) { return $l->t('last month'); }
- else if((date('n')-$diffmonths) > 0) { return $l->t('%d months ago', $diffmonths); }
+ else if((date('n')-$diffmonths) > 0) { return $l->n('%n month ago', '%n months ago', $diffmonths); }
else if($timediff < 63113852) { return $l->t('last year'); }
else { return $l->t('years ago'); }
}
diff --git a/lib/user.php b/lib/user.php
index ee20f2e0971..93c7c9d4cd5 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -137,7 +137,6 @@ class OC_User {
*/
public static function useBackend($backend = 'database') {
if ($backend instanceof OC_User_Interface) {
- OC_Log::write('core', 'Adding user backend instance of ' . get_class($backend) . '.', OC_Log::DEBUG);
self::$_usedBackends[get_class($backend)] = $backend;
self::getManager()->registerBackend($backend);
} else {
diff --git a/lib/user/http.php b/lib/user/http.php
index 944ede73a0b..1e044ed4188 100644
--- a/lib/user/http.php
+++ b/lib/user/http.php
@@ -103,4 +103,4 @@ class OC_User_HTTP extends OC_User_Backend {
return false;
}
}
-} \ No newline at end of file
+}
diff --git a/lib/user/interface.php b/lib/user/interface.php
index b1e19aea7fb..c72bdfaf3fd 100644
--- a/lib/user/interface.php
+++ b/lib/user/interface.php
@@ -77,4 +77,4 @@ interface OC_User_Interface {
* @return boolean if users can be listed or not
*/
public function hasUserListings();
-} \ No newline at end of file
+}
diff --git a/lib/util.php b/lib/util.php
index b7dc2207e6c..e03667b0794 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -46,6 +46,16 @@ class OC_Util {
}
if( $user != "" ) { //if we aren't logged in, there is no use to set up the filesystem
+ $quota = self::getUserQuota($user);
+ if ($quota !== \OC\Files\SPACE_UNLIMITED) {
+ \OC\Files\Filesystem::addStorageWrapper(function($mountPoint, $storage) use ($quota, $user) {
+ if ($mountPoint === '/' . $user . '/'){
+ return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota));
+ } else {
+ return $storage;
+ }
+ });
+ }
$user_dir = '/'.$user.'/files';
$user_root = OC_User::getHome($user);
$userdirectory = $user_root . '/files';
@@ -55,9 +65,7 @@ class OC_Util {
//jail the user into his "home" directory
\OC\Files\Filesystem::init($user, $user_dir);
- $quotaProxy=new OC_FileProxy_Quota();
$fileOperationProxy = new OC_FileProxy_FileOperations();
- OC_FileProxy::register($quotaProxy);
OC_FileProxy::register($fileOperationProxy);
OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $user_dir));
@@ -65,6 +73,18 @@ class OC_Util {
return true;
}
+ public static function getUserQuota($user){
+ $userQuota = OC_Preferences::getValue($user, 'files', 'quota', 'default');
+ if($userQuota === 'default') {
+ $userQuota = OC_AppConfig::getValue('files', 'default_quota', 'none');
+ }
+ if($userQuota === 'none') {
+ return \OC\Files\SPACE_UNLIMITED;
+ }else{
+ return OC_Helper::computerFileSize($userQuota);
+ }
+ }
+
public static function tearDownFS() {
\OC\Files\Filesystem::tearDown();
self::$fsSetup=false;
@@ -168,6 +188,10 @@ class OC_Util {
* @return array arrays with error messages and hints
*/
public static function checkServer() {
+ // Assume that if checkServer() succeeded before in this session, then all is fine.
+ if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded'))
+ return array();
+
$errors=array();
$defaults = new \OC_Defaults();
@@ -309,10 +333,30 @@ class OC_Util {
'hint'=>'Please ask your server administrator to restart the web server.');
}
+ // Cache the result of this function
+ \OC::$session->set('checkServer_suceeded', count($errors) == 0);
+
return $errors;
}
/**
+ * @brief check if there are still some encrypted files stored
+ * @return boolean
+ */
+ public static function encryptedFiles() {
+ //check if encryption was enabled in the past
+ $encryptedFiles = false;
+ if (OC_App::isEnabled('files_encryption') === false) {
+ $view = new OC\Files\View('/' . OCP\User::getUser());
+ if ($view->file_exists('/files_encryption/keyfiles')) {
+ $encryptedFiles = true;
+ }
+ }
+
+ return $encryptedFiles;
+ }
+
+ /**
* Check for correct file permissions of data directory
* @return array arrays with error messages and hints
*/
diff --git a/lib/vobject/compoundproperty.php b/lib/vobject/compoundproperty.php
index d702ab802e0..7fe42574bed 100644
--- a/lib/vobject/compoundproperty.php
+++ b/lib/vobject/compoundproperty.php
@@ -67,4 +67,4 @@ class CompoundProperty extends \Sabre\VObject\Property\Compound {
}
-} \ No newline at end of file
+}
diff --git a/lib/vobject/stringproperty.php b/lib/vobject/stringproperty.php
index b98a8f26c2b..a9d63a0a789 100644
--- a/lib/vobject/stringproperty.php
+++ b/lib/vobject/stringproperty.php
@@ -77,4 +77,4 @@ class StringProperty extends \Sabre\VObject\Property {
}
-} \ No newline at end of file
+}
diff --git a/ocs/routes.php b/ocs/routes.php
index 5fcf05e4f99..1ea698c7a83 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -74,4 +74,4 @@ OC_API::register(
array('OC_OCS_Cloud', 'getCapabilities'),
'core',
OC_API::USER_AUTH
- ); \ No newline at end of file
+ );
diff --git a/public.php b/public.php
index 0154b59cce3..1781632bc78 100644
--- a/public.php
+++ b/public.php
@@ -28,4 +28,4 @@ try {
OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
OC_Template::printExceptionErrorPage($ex);
-} \ No newline at end of file
+}
diff --git a/remote.php b/remote.php
index ec0f2ecef72..2d0088cd903 100644
--- a/remote.php
+++ b/remote.php
@@ -46,4 +46,4 @@ try {
OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
OC_Template::printExceptionErrorPage($ex);
-} \ No newline at end of file
+}
diff --git a/search/css/results.css b/search/css/results.css
index 30cc352fd7b..4ae7d67afb3 100644
--- a/search/css/results.css
+++ b/search/css/results.css
@@ -66,4 +66,4 @@
#searchresults tr.current {
background-color:#ddd;
-} \ No newline at end of file
+}
diff --git a/settings/admin.php b/settings/admin.php
index 10e239204f2..869729a9e41 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -18,7 +18,7 @@ $forms=OC_App::getForms('admin');
$htaccessworking=OC_Util::ishtaccessworking();
$entries=OC_Log_Owncloud::getEntries(3);
-$entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
+$entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3;
$tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
$tmpl->assign('entries', $entries);
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index 205958f88d3..ccc2a5d402e 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -41,7 +41,7 @@ try {
OC_JSON::success(array("data" =>
array(
"username" => $username,
- "groups" => implode( ", ", OC_Group::getUserGroups( $username )))));
+ "groups" => OC_Group::getUserGroups( $username ))));
} catch (Exception $exception) {
OC_JSON::error(array("data" => array( "message" => $exception->getMessage())));
}
diff --git a/settings/ajax/decryptall.php b/settings/ajax/decryptall.php
new file mode 100644
index 00000000000..e53067931e8
--- /dev/null
+++ b/settings/ajax/decryptall.php
@@ -0,0 +1,25 @@
+<?php
+
+//encryption app needs to be loaded
+OC_App::loadApp('files_encryption');
+
+// init encryption app
+$params = array('uid' => \OCP\User::getUser(),
+ 'password' => $_POST['password']);
+
+$view = new OC_FilesystemView('/');
+$util = new \OCA\Encryption\Util($view, \OCP\User::getUser());
+
+$result = $util->initEncryption($params);
+
+if ($result !== false) {
+ $successful = $util->decryptAll();
+ if ($successful === true) {
+ \OCP\JSON::success(array('data' => array('message' => 'Files decrypted successfully')));
+ } else {
+ \OCP\JSON::error(array('data' => array('message' => 'Couldn\'t decrypt your files, please check your owncloud.log or ask your administrator')));
+ }
+} else {
+ \OCP\JSON::error(array('data' => array('message' => 'Couldn\'t decrypt your files, check your password and try again')));
+}
+
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index e7151419286..34c8d3ce467 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -16,6 +16,6 @@ $data = array();
OC_JSON::success(
array(
"data" => $entries,
- "remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $count)) !== 0) ? true : false
+ "remain" => count(OC_Log_Owncloud::getEntries(1, $offset + $count)) !== 0,
)
);
diff --git a/settings/ajax/setsecurity.php b/settings/ajax/setsecurity.php
index 16a85aade81..675d7eced47 100644
--- a/settings/ajax/setsecurity.php
+++ b/settings/ajax/setsecurity.php
@@ -10,4 +10,4 @@ OCP\JSON::callCheck();
OC_Config::setValue( 'forcessl', filter_var($_POST['enforceHTTPS'], FILTER_VALIDATE_BOOLEAN));
-echo 'true'; \ No newline at end of file
+echo 'true';
diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php
index 300e8642515..91c342d5d07 100644
--- a/settings/ajax/updateapp.php
+++ b/settings/ajax/updateapp.php
@@ -12,4 +12,4 @@ if($result !== false) {
} else {
$l = OC_L10N::get('settings');
OC_JSON::error(array("data" => array( "message" => $l->t("Couldn't update app.") )));
-} \ No newline at end of file
+}
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 67aab4a461b..20df5d86d65 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -9,10 +9,10 @@ input#openid, input#webdav { width:20em; }
/* PERSONAL */
/* Sync clients */
-.clientsbox { margin:12px; text-align:center; }
+.clientsbox { margin:12px; }
.clientsbox h1 { font-size:40px; font-weight:bold; margin:50px 0 20px; }
.clientsbox h2 { font-size:20px; font-weight:bold; margin:35px 0 10px; }
-.clientsbox center { margin-top:10px; }
+.clientsbox .center { margin-top:10px; }
#passworderror { display:none; }
#passwordchanged { display:none; }
diff --git a/settings/help.php b/settings/help.php
index 713b23f7857..88693939b84 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -14,11 +14,11 @@ OC_App::setActiveNavigationEntry( "help" );
if(isset($_GET['mode']) and $_GET['mode'] === 'admin') {
- $url=OC_Helper::linkToAbsolute( 'core', 'doc/admin' );
+ $url=OC_Helper::linkToAbsolute( 'core', 'doc/admin/index.html' );
$style1='';
$style2=' pressed';
}else{
- $url=OC_Helper::linkToAbsolute( 'core', 'doc/user' );
+ $url=OC_Helper::linkToAbsolute( 'core', 'doc/user/index.html' );
$style1=' pressed';
$style2='';
}
diff --git a/settings/img/apps.png b/settings/img/apps.png
index 2b18f678a02..6dc8d4c8a6e 100644
--- a/settings/img/apps.png
+++ b/settings/img/apps.png
Binary files differ
diff --git a/settings/img/apps.svg b/settings/img/apps.svg
index e2cc48f2956..338938f256e 100644
--- a/settings/img/apps.svg
+++ b/settings/img/apps.svg
@@ -1,8 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
- <g>
- <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m2 2v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm-8 7v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm1 1h2v2h-2v-2z"/>
- <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m2 3v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm-8 7v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm1 1h2v2h-2v-2z" fill="#fff"/>
- </g>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs></defs>
+ <path fill="#000" d="m14,5,0,8-8,0,0,4,8,0,0,8,4,0,0-8,8,0,0-4-8,0,0-8-4,0z"/>
+ <path fill="#FFF" d="M14,6v8h-8v4h8v8h4v-8h8v-4h-8v-8h-4z"/>
+ <path opacity="0.1" d="m14,7,0,8-8,0,0,4,8,0,0,8,4,0,0-8,8,0,0-4-8,0,0-8-4,0z" fill="#FFF"/>
</svg>
diff --git a/settings/js/apps-custom.php b/settings/js/apps-custom.php
index d827dfc7058..c25148cdde5 100644
--- a/settings/js/apps-custom.php
+++ b/settings/js/apps-custom.php
@@ -23,4 +23,4 @@ foreach($combinedApps as $app) {
echo("\n");
}
-echo ("var appid =".json_encode($_GET['appid']).";"); \ No newline at end of file
+echo ("var appid =".json_encode($_GET['appid']).";");
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 0540d9b1c58..cf8cd91bd40 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -54,7 +54,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
enableApp:function(appid, active, element) {
console.log('enableApp:', appid, active, element);
var appitem=$('#leftcontent li[data-id="'+appid+'"]');
- appData = appitem.data('app');
+ var appData = appitem.data('app');
appData.active = !active;
appitem.data('app', appData);
element.val(t('settings','Please wait....'));
@@ -152,7 +152,13 @@ OC.Settings.Apps = OC.Settings.Apps || {
a.prepend(filename);
a.prepend(img);
li.append(a);
- container.append(li);
+ // prepend the new app before the 'More apps' function
+ $('#apps-management').before(li);
+ // scroll the app navigation down so the newly added app is seen
+ $('#navigation').animate({ scrollTop: $('#apps').height() }, 'slow');
+ // draw attention to the newly added app entry by flashing it twice
+ container.children('li[data-id="'+entry.id+'"]').animate({opacity:.3}).animate({opacity:1}).animate({opacity:.3}).animate({opacity:1});
+
if (!SVGSupport() && entry.icon.match(/\.svg$/i)) {
$(img).addClass('svg');
replaceSVG();
diff --git a/settings/js/isadmin.php b/settings/js/isadmin.php
index 8b31f8a7cf9..13a8ba1d312 100644
--- a/settings/js/isadmin.php
+++ b/settings/js/isadmin.php
@@ -17,4 +17,4 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
echo("var isadmin = true;");
} else {
echo("var isadmin = false;");
-} \ No newline at end of file
+}
diff --git a/settings/js/log.js b/settings/js/log.js
index 1ef9b419cdb..5832c698ad5 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -35,8 +35,9 @@ OC.Log={
$('#moreLog').show();
// remove all non-remaining items
$('#log tr').slice(OC.Log.loaded).remove();
- if(OC.Log.loaded <= 3)
+ if(OC.Log.loaded <= 3) {
$('#lessLog').hide();
+ }
},
addEntries:function(entries){
for(var i=0;i<entries.length;i++){
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 099c1426dc0..8ad26c086b5 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -8,7 +8,7 @@
* Post the email address change to the server.
*/
function changeEmailAddress(){
- emailInfo = $('#email');
+ var emailInfo = $('#email');
if (emailInfo.val() === emailInfo.defaultValue){
return;
}
@@ -110,8 +110,62 @@ $(document).ready(function(){
});
return false;
});
+
+ $('button:button[name="submitDecryptAll"]').click(function() {
+ var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val();
+ OC.Encryption.decryptAll(privateKeyPassword);
+ });
+
+ $('#decryptAll input:password[name="privateKeyPassword"]').keyup(function(event) {
+ var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val();
+ if (privateKeyPassword !== '' ) {
+ $('#decryptAll button:button[name="submitDecryptAll"]').removeAttr("disabled");
+ if(event.which === 13) {
+ OC.Encryption.decryptAll(privateKeyPassword);
+ }
+ } else {
+ $('#decryptAll button:button[name="submitDecryptAll"]').attr("disabled", "true");
+ }
+ });
+
} );
+OC.Encryption = {
+ decryptAll: function(password) {
+ OC.Encryption.msg.startDecrypting('#decryptAll .msg');
+ $.post('ajax/decryptall.php', {password:password}, function(data) {
+ if (data.status === "error") {
+ OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data);
+ } else {
+ OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data);
+ }
+ }
+ );
+ }
+}
+
+OC.Encryption.msg={
+ startDecrypting:function(selector){
+ $(selector)
+ .html( t('files_encryption', 'Decrypting files... Please wait, this can take some time.') )
+ .removeClass('success')
+ .removeClass('error')
+ .stop(true, true)
+ .show();
+ },
+ finishedDecrypting:function(selector, data){
+ if( data.status === "success" ){
+ $(selector).html( data.data.message )
+ .addClass('success')
+ .stop(true, true)
+ .delay(3000)
+ .fadeOut(900);
+ }else{
+ $(selector).html( data.data.message ).addClass('error');
+ }
+ }
+};
+
OC.msg={
startSaving:function(selector){
$(selector)
diff --git a/settings/js/users.js b/settings/js/users.js
index 6a8afc4ca36..ab08d7099c6 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -89,10 +89,15 @@ var UserList = {
tr.attr('data-displayName', displayname);
tr.find('td.name').text(username);
tr.find('td.displayName > span').text(displayname);
- var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
+ var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>')
+ .attr('data-username', username)
+ .attr('data-user-groups', [groups]);
tr.find('td.groups').empty();
if (tr.find('td.subadmins').length > 0) {
- var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
+ var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">')
+ .attr('data-username', username)
+ .attr('data-user-groups', [groups])
+ .attr('data-subadmin', [subadmin]);
tr.find('td.subadmins').empty();
}
$.each(this.availableGroups, function (i, group) {
@@ -166,7 +171,9 @@ var UserList = {
var c = Number(aa[x]), d = Number(bb[x]);
if (c === aa[x] && d === bb[x]) {
return c - d;
- } else return (aa[x] > bb[x]) ? 1 : -1;
+ } else {
+ return (aa[x] > bb[x]) ? 1 : -1;
+ }
}
}
return aa.length - bb.length;
@@ -227,7 +234,7 @@ var UserList = {
var user = element.attr('data-username');
if ($(element).attr('class') === 'groupsselect') {
if (element.data('userGroups')) {
- checked = String(element.data('userGroups')).split(', ');
+ checked = element.data('userGroups');
}
if (user) {
var checkHandeler = function (group) {
@@ -244,11 +251,12 @@ var UserList = {
group: group
},
function (response) {
- if(response.status === 'success') {
- if(UserList.availableGroups.indexOf(response.data.groupname) === -1 && response.data.action === 'add') {
- UserList.availableGroups.push(response.data.groupname);
- }
- } else {
+ if(response.status === 'success'
+ && UserList.availableGroups.indexOf(response.data.groupname) === -1
+ && response.data.action === 'add') {
+ UserList.availableGroups.push(response.data.groupname);
+ }
+ if(response.data.message) {
OC.Notification.show(response.data.message);
}
}
@@ -262,7 +270,7 @@ var UserList = {
if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
}
- })
+ });
};
var label;
if (isadmin) {
@@ -282,7 +290,7 @@ var UserList = {
}
if ($(element).attr('class') === 'subadminsselect') {
if (element.data('subadmin')) {
- checked = String(element.data('subadmin')).split(', ');
+ checked = element.data('subadmin');
}
var checkHandeler = function (group) {
if (group === 'admin') {
@@ -304,7 +312,7 @@ var UserList = {
if ($(element).find('option[value="' + group + '"]').length === 0) {
$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
}
- })
+ });
};
element.multiSelect({
createCallback: addSubAdmin,
@@ -321,7 +329,7 @@ var UserList = {
$(document).ready(function () {
UserList.doSort();
- UserList.availableGroups = $('#content table').attr('data-groups').split(', ');
+ UserList.availableGroups = $('#content table').data('groups');
$('tbody tr:last').bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
OC.Router.registerLoadedCallback(function () {
UserList.update();
@@ -450,7 +458,7 @@ $(document).ready(function () {
t('settings', 'Error creating user'));
} else {
if (result.data.groups) {
- var addedGroups = result.data.groups.split(', ');
+ var addedGroups = result.data.groups;
UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
}
if($('tr[data-uid="' + username + '"]').length === 0) {
@@ -469,7 +477,7 @@ $(document).ready(function () {
}
OC.Notification.hide();
});
- UserList.useUndo = ('onbeforeunload' in window)
+ UserList.useUndo = ('onbeforeunload' in window);
$(window).bind('beforeunload', function () {
UserList.finishDelete(null);
});
diff --git a/settings/l10n/af_ZA.php b/settings/l10n/af_ZA.php
index f89e0062928..b6c50252667 100644
--- a/settings/l10n/af_ZA.php
+++ b/settings/l10n/af_ZA.php
@@ -1,5 +1,7 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Wagwoord",
"New password" => "Nuwe wagwoord",
"Username" => "Gebruikersnaam"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 74580ea2030..97fcc6fd182 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "فشل تحميل القائمة من الآب ستور",
"Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
"Unable to change display name" => "تعذر تغيير اسم الحساب",
@@ -89,6 +90,7 @@
"Language" => "اللغة",
"Help translate" => "ساعد في الترجمه",
"WebDAV" => "WebDAV",
+"Encryption" => "التشفير",
"Login Name" => "اسم الدخول",
"Create" => "انشئ",
"Default Storage" => "وحدة التخزين الافتراضية",
@@ -100,3 +102,4 @@
"set new password" => "اعداد كلمة مرور جديدة",
"Default" => "افتراضي"
);
+$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;";
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 72b8accef12..717cf6baae5 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Authentication error" => "Възникна проблем с идентификацията",
"Group already exists" => "Групата вече съществува",
"Unable to add group" => "Невъзможно добавяне на група",
@@ -51,6 +52,7 @@
"Language" => "Език",
"Help translate" => "Помогнете с превода",
"WebDAV" => "WebDAV",
+"Encryption" => "Криптиране",
"Login Name" => "Потребител",
"Create" => "Създаване",
"Default Storage" => "Хранилище по подразбиране",
@@ -60,3 +62,4 @@
"Storage" => "Хранилище",
"Default" => "По подразбиране"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index c5116af7463..6145c187ce3 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "অ্যাপস্টোর থেকে তালিকা লোড করতে সক্ষম নয়",
"Authentication error" => "অনুমোদন ঘটিত সমস্যা",
"Group already exists" => "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
@@ -53,6 +54,7 @@
"Language" => "ভাষা",
"Help translate" => "অনুবাদ করতে সহায়তা করুন",
"WebDAV" => "WebDAV",
+"Encryption" => "সংকেতায়ন",
"Create" => "তৈরী কর",
"Default Storage" => "পূর্বনির্ধারিত সংরক্ষণাগার",
"Unlimited" => "অসীম",
@@ -61,3 +63,4 @@
"Storage" => "সংরক্ষণাগার",
"Default" => "পূর্বনির্ধারিত"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/bs.php b/settings/l10n/bs.php
index 774f081673d..708e045adeb 100644
--- a/settings/l10n/bs.php
+++ b/settings/l10n/bs.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Saving..." => "Spašavam..."
);
+$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);";
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index fe29bdda13c..ab7004c2d31 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "No s'ha pogut carregar la llista des de l'App Store",
"Authentication error" => "Error d'autenticació",
"Your display name has been changed." => "El nom a mostrar ha canviat.",
@@ -24,6 +25,7 @@
"Updating...." => "Actualitzant...",
"Error while updating app" => "Error en actualitzar l'aplicació",
"Updated" => "Actualitzada",
+"Decrypting files... Please wait, this can take some time." => "Desencriptant fitxers... Espereu, això pot trigar una estona.",
"Saving..." => "Desant...",
"deleted" => "esborrat",
"undo" => "desfés",
@@ -101,6 +103,10 @@
"Help translate" => "Ajudeu-nos amb la traducció",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Useu aquesta adreça per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
+"Encryption" => "Xifrat",
+"The encryption app is no longer enabled, decrypt all your file" => "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers.",
+"Log-in password" => "Contrasenya d'accés",
+"Decrypt all Files" => "Desencripta tots els fitxers",
"Login Name" => "Nom d'accés",
"Create" => "Crea",
"Admin Recovery Password" => "Recuperació de contrasenya d'administrador",
@@ -114,3 +120,4 @@
"set new password" => "estableix nova contrasenya",
"Default" => "Per defecte"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 350a77a09f0..99be4b73b0f 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Nelze načíst seznam z App Store",
"Authentication error" => "Chyba přihlášení",
"Your display name has been changed." => "Vaše zobrazované jméno bylo změněno.",
@@ -24,6 +25,7 @@
"Updating...." => "Aktualizuji...",
"Error while updating app" => "Chyba při aktualizaci aplikace",
"Updated" => "Aktualizováno",
+"Decrypting files... Please wait, this can take some time." => "Probíhá odšifrování souborů... Prosíme počkejte, tato operace může trvat několik minut.",
"Saving..." => "Ukládám...",
"deleted" => "smazáno",
"undo" => "vrátit zpět",
@@ -101,6 +103,10 @@
"Help translate" => "Pomoci s překladem",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>",
+"Encryption" => "Šifrování",
+"The encryption app is no longer enabled, decrypt all your file" => "Šifrovací aplikace již není spuštěna, odšifrujte všechny své soubory",
+"Log-in password" => "Heslo",
+"Decrypt all Files" => "Odšifrovat všechny soubory",
"Login Name" => "Přihlašovací jméno",
"Create" => "Vytvořit",
"Admin Recovery Password" => "Heslo obnovy správce",
@@ -114,3 +120,4 @@
"set new password" => "nastavit nové heslo",
"Default" => "Výchozí"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
index 2dcfd502c4e..da8d02a9e40 100644
--- a/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Authentication error" => "Gwall dilysu",
"Invalid request" => "Cais annilys",
"Error" => "Gwall",
@@ -11,6 +12,8 @@
"Password" => "Cyfrinair",
"New password" => "Cyfrinair newydd",
"Email" => "E-bost",
+"Encryption" => "Amgryptiad",
"Other" => "Arall",
"Username" => "Enw defnyddiwr"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index b614ece4a0a..2d549ed86bf 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store",
"Authentication error" => "Adgangsfejl",
"Your display name has been changed." => "Dit skærmnavn blev ændret.",
@@ -24,6 +25,7 @@
"Updating...." => "Opdaterer....",
"Error while updating app" => "Der opstod en fejl under app opgraderingen",
"Updated" => "Opdateret",
+"Decrypting files... Please wait, this can take some time." => "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
"Saving..." => "Gemmer...",
"deleted" => "Slettet",
"undo" => "fortryd",
@@ -101,6 +103,10 @@
"Help translate" => "Hjælp med oversættelsen",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Anvend denne adresse til at <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tilgå dine filer via WebDAV</a>",
+"Encryption" => "Kryptering",
+"The encryption app is no longer enabled, decrypt all your file" => "Krypterings app'en er ikke længere aktiv. Dekrypter alle dine filer. ",
+"Log-in password" => "Log-in kodeord",
+"Decrypt all Files" => "Dekrypter alle Filer ",
"Login Name" => "Loginnavn",
"Create" => "Ny",
"Admin Recovery Password" => "Administrator gendannelse kodeord",
@@ -114,3 +120,4 @@
"set new password" => "skift kodeord",
"Default" => "Standard"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index dbe2f0c96db..110eaaf52dd 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
"Authentication error" => "Fehler bei der Anmeldung",
"Your display name has been changed." => "Dein Anzeigename ist geändert worden.",
@@ -24,6 +25,7 @@
"Updating...." => "Aktualisierung...",
"Error while updating app" => "Fehler beim Aktualisieren der App",
"Updated" => "Aktualisiert",
+"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
"Saving..." => "Speichern...",
"deleted" => "gelöscht",
"undo" => "rückgängig machen",
@@ -101,6 +103,10 @@
"Help translate" => "Hilf bei der Übersetzung",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
+"Encryption" => "Verschlüsselung",
+"The encryption app is no longer enabled, decrypt all your file" => "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt.",
+"Log-in password" => "Login-Passwort",
+"Decrypt all Files" => "Alle Dateien entschlüsseln",
"Login Name" => "Loginname",
"Create" => "Anlegen",
"Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
@@ -114,3 +120,4 @@
"set new password" => "Neues Passwort setzen",
"Default" => "Standard"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
new file mode 100644
index 00000000000..b4c6f98edc3
--- /dev/null
+++ b/settings/l10n/de_CH.php
@@ -0,0 +1,119 @@
+<?php
+$TRANSLATIONS = array(
+"Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
+"Authentication error" => "Authentifizierungs-Fehler",
+"Your display name has been changed." => "Dein Anzeigename ist geändert worden.",
+"Unable to change display name" => "Das Ändern des Anzeigenamens ist nicht möglich",
+"Group already exists" => "Die Gruppe existiert bereits",
+"Unable to add group" => "Die Gruppe konnte nicht angelegt werden",
+"Could not enable app. " => "Die Anwendung konnte nicht aktiviert werden.",
+"Email saved" => "E-Mail-Adresse gespeichert",
+"Invalid email" => "Ungültige E-Mail-Adresse",
+"Unable to delete group" => "Die Gruppe konnte nicht gelöscht werden",
+"Unable to delete user" => "Der Benutzer konnte nicht gelöscht werden",
+"Language changed" => "Sprache geändert",
+"Invalid request" => "Ungültige Anforderung",
+"Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
+"Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
+"Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
+"Couldn't update app." => "Die App konnte nicht aktualisiert werden.",
+"Update to {appversion}" => "Update zu {appversion}",
+"Disable" => "Deaktivieren",
+"Enable" => "Aktivieren",
+"Please wait...." => "Bitte warten....",
+"Error" => "Fehler",
+"Updating...." => "Update...",
+"Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
+"Updated" => "Aktualisiert",
+"Saving..." => "Speichern...",
+"deleted" => "gelöscht",
+"undo" => "rückgängig machen",
+"Unable to remove user" => "Der Benutzer konnte nicht entfernt werden.",
+"Groups" => "Gruppen",
+"Group Admin" => "Gruppenadministrator",
+"Delete" => "Löschen",
+"add group" => "Gruppe hinzufügen",
+"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
+"Error creating user" => "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
+"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
+"__language_name__" => "Deutsch (Förmlich: Sie)",
+"Security Warning" => "Sicherheitshinweis",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file 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." => "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
+"Setup Warning" => "Einrichtungswarnung",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte überprüfen Sie die <a href=\"%s\">Instalationsanleitungen</a>.",
+"Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
+"Locale not working" => "Die Lokalisierung funktioniert nicht",
+"System locale can't be set to %s. 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 %s." => "Die System-Ländereinstellung kann nicht auf %s geändert werden. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen, die für %s benötigten Pakete auf ihrem System zu installieren.",
+"Internet connection not working" => "Keine Internetverbindung",
+"This 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." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Eine Aufgabe bei jedem Laden der Seite ausführen",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php ist als Webcron-Dienst registriert, der die cron.php minütlich per HTTP aufruft.",
+"Use systems cron service to call the cron.php file once a minute." => "Benutzen Sie den System-Crondienst um die cron.php minütlich aufzurufen.",
+"Sharing" => "Teilen",
+"Enable Share API" => "Share-API aktivieren",
+"Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
+"Allow links" => "Links erlauben",
+"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
+"Allow public uploads" => "Erlaube öffentliches hochladen",
+"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen",
+"Allow resharing" => "Erlaube Weiterverteilen",
+"Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
+"Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
+"Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen",
+"Security" => "Sicherheit",
+"Enforce HTTPS" => "HTTPS erzwingen",
+"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
+"Log" => "Log",
+"Log level" => "Log-Level",
+"More" => "Mehr",
+"Less" => "Weniger",
+"Version" => "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>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
+"Add your App" => "Fügen Sie Ihre Anwendung hinzu",
+"More Apps" => "Weitere Anwendungen",
+"Select an App" => "Wählen Sie eine Anwendung aus",
+"See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
+"Update" => "Update durchführen",
+"User Documentation" => "Dokumentation für Benutzer",
+"Administrator Documentation" => "Dokumentation für Administratoren",
+"Online Documentation" => "Online-Dokumentation",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Kommerzieller Support",
+"Get the apps to sync your files" => "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
+"Show First Run Wizard again" => "Den Einrichtungsassistenten erneut anzeigen",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
+"Password" => "Passwort",
+"Your password was changed" => "Ihr Passwort wurde geändert.",
+"Unable to change your password" => "Das Passwort konnte nicht geändert werden",
+"Current password" => "Aktuelles Passwort",
+"New password" => "Neues Passwort",
+"Change password" => "Passwort ändern",
+"Display Name" => "Anzeigename",
+"Email" => "E-Mail",
+"Your email address" => "Ihre E-Mail-Adresse",
+"Fill in an email address to enable password recovery" => "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Language" => "Sprache",
+"Help translate" => "Helfen Sie bei der Übersetzung",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>.",
+"Encryption" => "Verschlüsselung",
+"Login Name" => "Loginname",
+"Create" => "Erstellen",
+"Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
+"Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+"Default Storage" => "Standard-Speicher",
+"Unlimited" => "Unbegrenzt",
+"Other" => "Andere",
+"Username" => "Benutzername",
+"Storage" => "Speicher",
+"change display name" => "Anzeigenamen ändern",
+"set new password" => "Neues Passwort setzen",
+"Default" => "Standard"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 8558b8ba43b..cbf4e01c6a2 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
"Authentication error" => "Authentifizierungs-Fehler",
"Your display name has been changed." => "Dein Anzeigename ist geändert worden.",
@@ -24,6 +25,7 @@
"Updating...." => "Update...",
"Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
"Updated" => "Aktualisiert",
+"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
"Saving..." => "Speichern...",
"deleted" => "gelöscht",
"undo" => "rückgängig machen",
@@ -101,6 +103,10 @@
"Help translate" => "Helfen Sie bei der Übersetzung",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>.",
+"Encryption" => "Verschlüsselung",
+"The encryption app is no longer enabled, decrypt all your file" => "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt. ",
+"Log-in password" => "Login-Passwort",
+"Decrypt all Files" => "Alle Dateien entschlüsseln",
"Login Name" => "Loginname",
"Create" => "Erstellen",
"Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
@@ -114,3 +120,4 @@
"set new password" => "Neues Passwort setzen",
"Default" => "Standard"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 3ea16f8c7d9..2c4bdffb742 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Σφάλμα στην φόρτωση της λίστας από το App Store",
"Authentication error" => "Σφάλμα πιστοποίησης",
"Your display name has been changed." => "Το όνομα σας στην οθόνη άλλαξε. ",
@@ -91,6 +92,7 @@
"Help translate" => "Βοηθήστε στη μετάφραση",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Χρήση αυτής της διεύθυνσης για <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">πρόσβαση των αρχείων σας μέσω WebDAV</a>",
+"Encryption" => "Κρυπτογράφηση",
"Login Name" => "Όνομα Σύνδεσης",
"Create" => "Δημιουργία",
"Admin Recovery Password" => "Κωδικός Επαναφοράς Διαχειριστή ",
@@ -104,3 +106,4 @@
"set new password" => "επιλογή νέου κωδικού",
"Default" => "Προκαθορισμένο"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/en@pirate.php b/settings/l10n/en@pirate.php
index 482632f3fda..e269c57c3d0 100644
--- a/settings/l10n/en@pirate.php
+++ b/settings/l10n/en@pirate.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "Passcode"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 04f3567e58d..693db4710de 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Ne eblis ŝargi liston el aplikaĵovendejo",
"Authentication error" => "Aŭtentiga eraro",
"Group already exists" => "La grupo jam ekzistas",
@@ -67,6 +68,7 @@
"Language" => "Lingvo",
"Help translate" => "Helpu traduki",
"WebDAV" => "WebDAV",
+"Encryption" => "Ĉifrado",
"Create" => "Krei",
"Default Storage" => "Defaŭlta konservejo",
"Unlimited" => "Senlima",
@@ -75,3 +77,4 @@
"Storage" => "Konservejo",
"Default" => "Defaŭlta"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 6975103a488..9f214c54808 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
"Authentication error" => "Error de autenticación",
"Your display name has been changed." => "Su nombre fue cambiado.",
@@ -101,6 +102,7 @@
"Help translate" => "Ayúdnos a traducir",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>",
+"Encryption" => "Cifrado",
"Login Name" => "Nombre de usuario",
"Create" => "Crear",
"Admin Recovery Password" => "Recuperación de la contraseña de administración",
@@ -114,3 +116,4 @@
"set new password" => "Configurar nueva contraseña",
"Default" => "Predeterminado"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 2ea9138e2c8..fdf0f75fe08 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
"Authentication error" => "Error al autenticar",
"Your display name has been changed." => "El nombre mostrado que usás fue cambiado.",
@@ -93,6 +94,7 @@
"Help translate" => "Ayudanos a traducir",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Usá esta dirección para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a tus archivos a través de WebDAV</a>",
+"Encryption" => "Encriptación",
"Login Name" => "Nombre de Usuario",
"Create" => "Crear",
"Admin Recovery Password" => "Recuperación de contraseña de administrador",
@@ -106,3 +108,4 @@
"set new password" => "Configurar nueva contraseña",
"Default" => "Predeterminado"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 58e1a5ecce8..a01c939f2dc 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "App Store'i nimekirja laadimine ebaõnnestus",
"Authentication error" => "Autentimise viga",
"Your display name has been changed." => "Sinu näidatav nimi on muudetud.",
@@ -24,6 +25,7 @@
"Updating...." => "Uuendamine...",
"Error while updating app" => "Viga rakenduse uuendamisel",
"Updated" => "Uuendatud",
+"Decrypting files... Please wait, this can take some time." => "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
"Saving..." => "Salvestamine...",
"deleted" => "kustutatud",
"undo" => "tagasi",
@@ -101,6 +103,10 @@
"Help translate" => "Aita tõlkida",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Kasuta seda aadressi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
+"Encryption" => "Krüpteerimine",
+"The encryption app is no longer enabled, decrypt all your file" => "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid",
+"Log-in password" => "Sisselogimise parool",
+"Decrypt all Files" => "Dekrüpteeri kõik failid",
"Login Name" => "Kasutajanimi",
"Create" => "Lisa",
"Admin Recovery Password" => "Admin taasteparool",
@@ -114,3 +120,4 @@
"set new password" => "määra uus parool",
"Default" => "Vaikeväärtus"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index aaec604d756..73ca1338a57 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
"Authentication error" => "Autentifikazio errorea",
"Your display name has been changed." => "Zure bistaratze izena aldatu egin da.",
@@ -98,6 +99,7 @@
"Help translate" => "Lagundu itzultzen",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
+"Encryption" => "Enkriptazioa",
"Login Name" => "Sarrera Izena",
"Create" => "Sortu",
"Admin Recovery Password" => "Kudeatzaile pasahitz berreskuratzea",
@@ -111,3 +113,4 @@
"set new password" => "ezarri pasahitz berria",
"Default" => "Lehenetsia"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index fbb6a63f074..2fd79235549 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "قادر به بارگذاری لیست از فروشگاه اپ نیستم",
"Authentication error" => "خطا در اعتبار سنجی",
"Your display name has been changed." => "نام نمایش شما تغییر یافته است.",
@@ -91,6 +92,7 @@
"Help translate" => "به ترجمه آن کمک کنید",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "استفاده ابن آدرس <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\"> برای دسترسی فایل های شما از طریق WebDAV </a>",
+"Encryption" => "رمزگذاری",
"Login Name" => "نام کاربری",
"Create" => "ایجاد کردن",
"Admin Recovery Password" => "مدیریت بازیابی رمز عبور",
@@ -104,3 +106,4 @@
"set new password" => "تنظیم کلمه عبور جدید",
"Default" => "پیش فرض"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 4c5fc76fa83..5e80017d3de 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)",
"Authentication error" => "Tunnistautumisvirhe",
"Your display name has been changed." => "Näyttönimesi on muutettu.",
@@ -24,6 +25,7 @@
"Updating...." => "Päivitetään...",
"Error while updating app" => "Virhe sovellusta päivittäessä",
"Updated" => "Päivitetty",
+"Decrypting files... Please wait, this can take some time." => "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
"Saving..." => "Tallennetaan...",
"deleted" => "poistettu",
"undo" => "kumoa",
@@ -86,6 +88,9 @@
"Help translate" => "Auta kääntämisessä",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Käytä tätä osoitetta <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">päästäksesi käsiksi tiedostoihisi WebDAVin kautta</a>",
+"Encryption" => "Salaus",
+"The encryption app is no longer enabled, decrypt all your file" => "Salaussovellus ei ole enää käytössä, pura kaikkien tiedostojesi salaus",
+"Decrypt all Files" => "Pura kaikkien tiedostojen salaus",
"Login Name" => "Kirjautumisnimi",
"Create" => "Luo",
"Default Storage" => "Oletustallennustila",
@@ -97,3 +102,4 @@
"set new password" => "aseta uusi salasana",
"Default" => "Oletus"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 2c7e9d1cdbf..3e1f5ddb5ef 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
"Authentication error" => "Erreur d'authentification",
"Your display name has been changed." => "Votre nom d'affichage a bien été modifié.",
@@ -91,6 +92,7 @@
"Help translate" => "Aidez à traduire",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilisez cette adresse pour <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accéder à vos fichiers via WebDAV</a>",
+"Encryption" => "Chiffrement",
"Login Name" => "Nom de la connexion",
"Create" => "Créer",
"Admin Recovery Password" => "Récupération du mot de passe administrateur",
@@ -104,3 +106,4 @@
"set new password" => "Changer le mot de passe",
"Default" => "Défaut"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index c0a42a38805..10f90c89b1a 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Non foi posíbel cargar a lista desde a App Store",
"Authentication error" => "Produciuse un erro de autenticación",
"Your display name has been changed." => "O seu nome visíbel foi cambiado",
@@ -24,6 +25,7 @@
"Updating...." => "Actualizando...",
"Error while updating app" => "Produciuse un erro mentres actualizaba o aplicativo",
"Updated" => "Actualizado",
+"Decrypting files... Please wait, this can take some time." => "Descifrando ficheiros... isto pode levar un anaco.",
"Saving..." => "Gardando...",
"deleted" => "eliminado",
"undo" => "desfacer",
@@ -101,6 +103,10 @@
"Help translate" => "Axude na tradución",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Empregue esta ligazón <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>",
+"Encryption" => "Cifrado",
+"The encryption app is no longer enabled, decrypt all your file" => "o aplicativo de cifrado non está activado, descifrar todos os ficheiros",
+"Log-in password" => "Contrasinal de acceso",
+"Decrypt all Files" => "Descifrar todos os ficheiros",
"Login Name" => "Nome de acceso",
"Create" => "Crear",
"Admin Recovery Password" => "Contrasinal de recuperación do administrador",
@@ -114,3 +120,4 @@
"set new password" => "estabelecer un novo contrasinal",
"Default" => "Predeterminado"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 83f7fd8a5fa..c8ef28a261b 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "לא ניתן לטעון רשימה מה־App Store",
"Authentication error" => "שגיאת הזדהות",
"Your display name has been changed." => "שם התצוגה שלך הוחלף.",
@@ -88,6 +89,7 @@
"Language" => "פה",
"Help translate" => "עזרה בתרגום",
"WebDAV" => "WebDAV",
+"Encryption" => "הצפנה",
"Login Name" => "שם כניסה",
"Create" => "יצירה",
"Admin Recovery Password" => "ססמת השחזור של המנהל",
@@ -100,3 +102,4 @@
"set new password" => "הגדרת ססמה חדשה",
"Default" => "בררת מחדל"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
index eb3fcc251f4..094a9dba298 100644
--- a/settings/l10n/hi.php
+++ b/settings/l10n/hi.php
@@ -1,7 +1,9 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "त्रुटि",
"Update" => "अद्यतन",
"Password" => "पासवर्ड",
"New password" => "नया पासवर्ड",
"Username" => "प्रयोक्ता का नाम"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 4bfbc2d3d50..4a225ed4b8a 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Nemogićnost učitavanja liste sa Apps Stora",
"Authentication error" => "Greška kod autorizacije",
"Email saved" => "Email spremljen",
@@ -35,3 +36,4 @@
"Other" => "ostali",
"Username" => "Korisničko ime"
);
+$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;";
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 8e29c6c779a..997c699ddbb 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
"Authentication error" => "Azonosítási hiba",
"Your display name has been changed." => "Az Ön megjelenítési neve megváltozott.",
@@ -101,6 +102,7 @@
"Help translate" => "Segítsen a fordításban!",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Ezt a címet használja, ha <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV-on keresztül szeretné elérni az állományait</a>",
+"Encryption" => "Titkosítás",
"Login Name" => "Bejelentkezési név",
"Create" => "Létrehozás",
"Admin Recovery Password" => "A jelszóvisszaállítás adminisztrációja",
@@ -114,3 +116,4 @@
"set new password" => "új jelszó beállítása",
"Default" => "Alapértelmezett"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hy.php b/settings/l10n/hy.php
index 9a9e46085ef..d73cb37a765 100644
--- a/settings/l10n/hy.php
+++ b/settings/l10n/hy.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Delete" => "Ջնջել",
"Other" => "Այլ"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index d6d1c9eb86e..3f61ff8eefe 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Language changed" => "Linguage cambiate",
"Invalid request" => "Requesta invalide",
"Error" => "Error",
@@ -24,3 +25,4 @@
"Other" => "Altere",
"Username" => "Nomine de usator"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index f832a85fbd4..abc19560d37 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Tidak dapat memuat daftar dari App Store",
"Authentication error" => "Galat saat autentikasi",
"Unable to change display name" => "Tidak dapat mengubah nama tampilan",
@@ -89,6 +90,7 @@
"Language" => "Bahasa",
"Help translate" => "Bantu menerjemahkan",
"WebDAV" => "WebDAV",
+"Encryption" => "Enkripsi",
"Login Name" => "Nama Masuk",
"Create" => "Buat",
"Default Storage" => "Penyimpanan Baku",
@@ -100,3 +102,4 @@
"set new password" => "setel sandi baru",
"Default" => "Baku"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index 782c4e5f806..f803da8756d 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Ekki tókst að hlaða lista frá forrita síðu",
"Authentication error" => "Villa við auðkenningu",
"Group already exists" => "Hópur er þegar til",
@@ -57,6 +58,7 @@
"Language" => "Tungumál",
"Help translate" => "Hjálpa við þýðingu",
"WebDAV" => "WebDAV",
+"Encryption" => "Dulkóðun",
"Create" => "Búa til",
"Default Storage" => "Sjálfgefin gagnageymsla",
"Unlimited" => "Ótakmarkað",
@@ -65,3 +67,4 @@
"Storage" => "gagnapláss",
"Default" => "Sjálfgefið"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 8c726fa0950..003fc5c7bb1 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Impossibile caricare l'elenco dall'App Store",
"Authentication error" => "Errore di autenticazione",
"Your display name has been changed." => "Il tuo nome visualizzato è stato cambiato.",
@@ -101,6 +102,7 @@
"Help translate" => "Migliora la traduzione",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilizza questo indirizzo per <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accedere ai tuoi file via WebDAV</a>",
+"Encryption" => "Cifratura",
"Login Name" => "Nome utente",
"Create" => "Crea",
"Admin Recovery Password" => "Password di ripristino amministrativa",
@@ -114,3 +116,4 @@
"set new password" => "imposta una nuova password",
"Default" => "Predefinito"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 7d327ebc243..6a090c4e01c 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "アプリストアからリストをロードできません",
"Authentication error" => "認証エラー",
"Your display name has been changed." => "表示名を変更しました。",
@@ -24,6 +25,7 @@
"Updating...." => "更新中....",
"Error while updating app" => "アプリの更新中にエラーが発生",
"Updated" => "更新済み",
+"Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
"Saving..." => "保存中...",
"deleted" => "削除",
"undo" => "元に戻す",
@@ -101,6 +103,10 @@
"Help translate" => "翻訳に協力する",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">WebDAV経由でファイルにアクセス</a>するにはこのアドレスを利用してください",
+"Encryption" => "暗号化",
+"The encryption app is no longer enabled, decrypt all your file" => "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
+"Log-in password" => "ログインパスワード",
+"Decrypt all Files" => "すべてのファイルを複合する",
"Login Name" => "ログイン名",
"Create" => "作成",
"Admin Recovery Password" => "管理者復旧パスワード",
@@ -114,3 +120,4 @@
"set new password" => "新しいパスワードを設定",
"Default" => "デフォルト"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ka.php b/settings/l10n/ka.php
index 63425e555b0..e9024a3c1c9 100644
--- a/settings/l10n/ka.php
+++ b/settings/l10n/ka.php
@@ -1,3 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Password" => "პაროლი"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index ee58004b0db..6519f239b82 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "აპლიკაციების სია ვერ ჩამოიტვირთა App Store",
"Authentication error" => "ავთენტიფიკაციის შეცდომა",
"Your display name has been changed." => "თქვენი დისფლეის სახელი უკვე შეიცვალა",
@@ -90,6 +91,7 @@
"Language" => "ენა",
"Help translate" => "თარგმნის დახმარება",
"WebDAV" => "WebDAV",
+"Encryption" => "ენკრიპცია",
"Login Name" => "მომხმარებლის სახელი",
"Create" => "შექმნა",
"Default Storage" => "საწყისი საცავი",
@@ -101,3 +103,4 @@
"set new password" => "დააყენეთ ახალი პაროლი",
"Default" => "საწყისი პარამეტრები"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index b88e1b735a0..0f8f80537f1 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "앱 스토어에서 목록을 가져올 수 없습니다",
"Authentication error" => "인증 오류",
"Your display name has been changed." => "표시 이름이 변경되었습니다.",
@@ -90,6 +91,7 @@
"Language" => "언어",
"Help translate" => "번역 돕기",
"WebDAV" => "WebDAV",
+"Encryption" => "암호화",
"Login Name" => "로그인 이름",
"Create" => "만들기",
"Admin Recovery Password" => "관리자 복구 암호",
@@ -103,3 +105,4 @@
"set new password" => "새 암호 설정",
"Default" => "기본값"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index 244aba63a2c..956df725a77 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Enable" => "چالاککردن",
"Error" => "هه‌ڵه",
"Saving..." => "پاشکه‌وتده‌کات...",
@@ -6,5 +7,7 @@
"Password" => "وشەی تێپەربو",
"New password" => "وشەی نهێنی نوێ",
"Email" => "ئیمه‌یل",
+"Encryption" => "نهێنیکردن",
"Username" => "ناوی به‌کارهێنه‌ر"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 7060d41537a..7902e37a4f9 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Konnt Lescht net vum App Store lueden",
"Authentication error" => "Authentifikatioun's Fehler",
"Email saved" => "E-mail gespäichert",
@@ -42,3 +43,4 @@
"Other" => "Aner",
"Username" => "Benotzernumm"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 75b3fe25c91..016a4fe6472 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Neįmanoma įkelti sąrašo iš Programų Katalogo",
"Authentication error" => "Autentikacijos klaida",
"Group already exists" => "Grupė jau egzistuoja",
@@ -64,6 +65,7 @@
"Language" => "Kalba",
"Help translate" => "Padėkite išversti",
"WebDAV" => "WebDAV",
+"Encryption" => "Šifravimas",
"Login Name" => "Vartotojo vardas",
"Create" => "Sukurti",
"Unlimited" => "Neribota",
@@ -72,3 +74,4 @@
"set new password" => "nustatyti naują slaptažodį",
"Default" => "Numatytasis"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 84b4349d7b2..e9e4b335d9d 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Nevar lejupielādēt sarakstu no lietotņu veikala",
"Authentication error" => "Autentifikācijas kļūda",
+"Your display name has been changed." => "Jūsu redzamais vārds ir mainīts.",
"Unable to change display name" => "Nevarēja mainīt redzamo vārdu",
"Group already exists" => "Grupa jau eksistē",
"Unable to add group" => "Nevar pievienot grupu",
@@ -36,25 +38,35 @@
"A valid password must be provided" => "Jānorāda derīga parole",
"__language_name__" => "__valodas_nosaukums__",
"Security Warning" => "Brīdinājums par drošību",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file 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." => "Jūsu datu direktorija un faili visticamāk ir pieejami no interneta. .htaccess fails nedarbojas. Ir rekomendēts konfigurēt serveri tā lai jūsu datu direktorija nav lasāma vai pārvietot to ārpus tīmekļa servera dokumentu mapes.",
"Setup Warning" => "Iestatīšanas brīdinājums",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Lūdzu kārtīgi izlasiet <a href=\"%s\">uzstādīšanas norādījumus</a>.",
"Module 'fileinfo' missing" => "Trūkst modulis “fileinfo”",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus.",
"Locale not working" => "Lokāle nestrādā",
+"System locale can't be set to %s. 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 %s." => "Sistēmas lokalizāciju nevar nomainīt uz %s. Tas nozīmē ka var rasties sarežģījumi ar dažu burtu attēlošanu failu nosaukumos. Ir rekomendēts uzstādīt nepieciešamās pakotnes lai atbalstītu %s lokalizāciju.",
"Internet connection not working" => "Interneta savienojums nedarbojas",
+"This 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." => "Šim serverim nav savienojums ar internetu. Tas nozīmē ka nebūs tādas iespējas kā ārējo datu nesēju montēšana, paziņojumi par atjauninājumiem vai citu izstrādātāju programmu uzstādīšana. Attālināta failu piekļuve vai paziņojumu epastu sūtīšana iespējams arī nedarbosies. Ir rekomendēts iespējot interneta savienojumu lai gūtu iespēju izmantotu visus risinājumus.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Izpildīt vienu uzdevumu ar katru ielādēto lapu",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php ir reģistrēts webcron servisā lai izsauktu cron.php vienreiz minūtē caur http.",
+"Use systems cron service to call the cron.php file once a minute." => "Izmantojiet sistēmas cron servisu lai izsauktu cron.php reizi minūtē.",
"Sharing" => "Dalīšanās",
"Enable Share API" => "Aktivēt koplietošanas API",
"Allow apps to use the Share API" => "Ļauj lietotnēm izmantot koplietošanas API",
"Allow links" => "Atļaut saites",
"Allow users to share items to the public with links" => "Ļaut lietotājiem publiski dalīties ar vienumiem, izmantojot saites",
+"Allow public uploads" => "Atļaut publisko augšupielādi",
+"Allow users to enable others to upload into their publicly shared folders" => "Ļaut lietotājiem iespējot atļaut citiem augšupielādēt failus viņu publiskajās mapēs",
"Allow resharing" => "Atļaut atkārtotu koplietošanu",
"Allow users to share items shared with them again" => "Ļaut lietotājiem dalīties ar vienumiem atkārtoti",
"Allow users to share with anyone" => "Ļaut lietotājiem dalīties ar visiem",
"Allow users to only share with users in their groups" => "Ļaut lietotājiem dalīties ar lietotājiem to grupās",
"Security" => "Drošība",
"Enforce HTTPS" => "Uzspiest HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu",
"Log" => "Žurnāls",
"Log level" => "Žurnāla līmenis",
"More" => "Vairāk",
@@ -89,8 +101,12 @@
"Language" => "Valoda",
"Help translate" => "Palīdzi tulkot",
"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Lietojiet šo adresi <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">lai piekļūtu saviem failiem ar WebDAV</a>",
+"Encryption" => "Šifrēšana",
"Login Name" => "Ierakstīšanās vārds",
"Create" => "Izveidot",
+"Admin Recovery Password" => "Administratora atgūšanas parole",
+"Enter the recovery password in order to recover the users files during password change" => "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā.",
"Default Storage" => "Noklusējuma krātuve",
"Unlimited" => "Neierobežota",
"Other" => "Cits",
@@ -100,3 +116,4 @@
"set new password" => "iestatīt jaunu paroli",
"Default" => "Noklusējuma"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 66405a82434..9d74b69ccd1 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Неможам да вчитам листа од App Store",
"Authentication error" => "Грешка во автентикација",
"Group already exists" => "Групата веќе постои",
@@ -53,7 +54,9 @@
"Language" => "Јазик",
"Help translate" => "Помогни во преводот",
"WebDAV" => "WebDAV",
+"Encryption" => "Енкрипција",
"Create" => "Создај",
"Other" => "Останато",
"Username" => "Корисничко име"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index d151cba29f9..a65afb8ada1 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Authentication error" => "Ralat pengesahan",
"Email saved" => "Emel disimpan",
"Invalid email" => "Emel tidak sah",
@@ -34,3 +35,4 @@
"Other" => "Lain",
"Username" => "Nama pengguna"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/my_MM.php b/settings/l10n/my_MM.php
index 9459a2e53fe..f49a9c18023 100644
--- a/settings/l10n/my_MM.php
+++ b/settings/l10n/my_MM.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Authentication error" => "ခွင့်ပြုချက်မအောင်မြင်",
"Invalid request" => "တောင်းဆိုချက်မမှန်ကန်ပါ",
"Security Warning" => "လုံခြုံရေးသတိပေးချက်",
@@ -6,3 +7,4 @@
"New password" => "စကားဝှက်အသစ်",
"Username" => "သုံးစွဲသူအမည်"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 4d37872d18a..a31c6e0cd7f 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
"Authentication error" => "Autentiseringsfeil",
"Your display name has been changed." => "Ditt visningsnavn er blitt endret.",
@@ -91,6 +92,7 @@
"Help translate" => "Bidra til oversettelsen",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressen for å <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">få tilgang til filene dine via WebDAV</a>",
+"Encryption" => "Kryptering",
"Login Name" => "Logginn navn",
"Create" => "Opprett",
"Default Storage" => "Standard lager",
@@ -102,3 +104,4 @@
"set new password" => "sett nytt passord",
"Default" => "Standard"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index d80157904fe..c32f616c0e0 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Kan de lijst niet van de App store laden",
"Authentication error" => "Authenticatie fout",
"Your display name has been changed." => "Uw weergavenaam is gewijzigd.",
@@ -24,6 +25,7 @@
"Updating...." => "Bijwerken....",
"Error while updating app" => "Fout bij bijwerken app",
"Updated" => "Bijgewerkt",
+"Decrypting files... Please wait, this can take some time." => "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
"Saving..." => "Opslaan",
"deleted" => "verwijderd",
"undo" => "ongedaan maken",
@@ -37,26 +39,35 @@
"A valid password must be provided" => "Er moet een geldig wachtwoord worden opgegeven",
"__language_name__" => "Nederlands",
"Security Warning" => "Beveiligingswaarschuwing",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file 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." => "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar. Het .htaccess-bestand werkt niet. We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datamap niet bereikbaar is vanaf het internet of om uw datamap te verplaatsen naar een locatie buiten de document root van de webserver.",
"Setup Warning" => "Instellingswaarschuwing",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Conntroleer de <a href='%s'>installatie handleiding</a> goed.",
"Module 'fileinfo' missing" => "Module 'fileinfo' ontbreekt",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
"Locale not working" => "Taalbestand werkt niet",
+"System locale can't be set to %s. 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 %s." => "De systeemtaal kan niet worden ingesteld op %s. Hierdoor kunnen er problemen optreden met bepaalde karakters in bestandsnamen. Het wordt sterk aangeraden om de vereiste pakketen op uw systeem te installeren, zodat %s ondersteund wordt.",
"Internet connection not working" => "Internet verbinding werkt niet",
+"This 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." => "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Bij laden van elke pagina één taak uitvoeren",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php is geregistreerd bij een webcron service om cron.php eens per minuut aan te roepen via http.",
+"Use systems cron service to call the cron.php file once a minute." => "Gebruik de systeem cron service om het bestand cron.php eens per minuut aan te roepen.",
"Sharing" => "Delen",
"Enable Share API" => "Activeren Share API",
"Allow apps to use the Share API" => "Apps toestaan de Share API te gebruiken",
"Allow links" => "Toestaan links",
"Allow users to share items to the public with links" => "Toestaan dat gebruikers objecten met links delen met anderen",
"Allow public uploads" => "Sta publieke uploads toe",
+"Allow users to enable others to upload into their publicly shared folders" => "Sta gebruikers toe anderen in hun publiek gedeelde mappen bestanden te uploaden",
"Allow resharing" => "Toestaan opnieuw delen",
"Allow users to share items shared with them again" => "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen",
"Allow users to share with anyone" => "Toestaan dat gebruikers met iedereen delen",
"Allow users to only share with users in their groups" => "Instellen dat gebruikers alleen met leden binnen hun groepen delen",
"Security" => "Beveiliging",
"Enforce HTTPS" => "Afdwingen HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Dwingt de clients om een versleutelde verbinding te maken met %s",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen.",
"Log" => "Log",
"Log level" => "Log niveau",
"More" => "Meer",
@@ -92,6 +103,10 @@
"Help translate" => "Help met vertalen",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Gebruik dit adres <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">toegang tot uw bestanden via WebDAV</a>",
+"Encryption" => "Versleuteling",
+"The encryption app is no longer enabled, decrypt all your file" => "De encryptie-appplicatie is niet meer aanwezig, decodeer al uw bestanden",
+"Log-in password" => "Inlog-wachtwoord",
+"Decrypt all Files" => "Decodeer alle bestanden",
"Login Name" => "Inlognaam",
"Create" => "Creëer",
"Admin Recovery Password" => "Beheer herstel wachtwoord",
@@ -105,3 +120,4 @@
"set new password" => "Instellen nieuw wachtwoord",
"Default" => "Standaard"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index f95416331ba..5c7a0756d53 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Klarer ikkje å lasta inn liste fra app-butikken",
"Authentication error" => "Autentiseringsfeil",
"Your display name has been changed." => "Visingsnamnet ditt er endra.",
@@ -101,3 +102,4 @@
"set new password" => "lag nytt passord",
"Default" => "Standard"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index b0860ee451d..bcc8d2d0337 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Pas possible de cargar la tièra dempuèi App Store",
"Authentication error" => "Error d'autentificacion",
"Group already exists" => "Lo grop existís ja",
@@ -48,3 +49,4 @@
"Other" => "Autres",
"Username" => "Non d'usancièr"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 7b3d44975bc..eb8422631f9 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Nie można wczytać listy aplikacji",
"Authentication error" => "Błąd uwierzytelniania",
"Your display name has been changed." => "Twoje wyświetlana nazwa została zmieniona.",
@@ -39,6 +40,7 @@
"Security Warning" => "Ostrzeżenie o zabezpieczeniach",
"Setup Warning" => "Ostrzeżenia konfiguracji",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Proszę sprawdź ponownie <a href=\"%s\">przewodnik instalacji</a>.",
"Module 'fileinfo' missing" => "Brak modułu „fileinfo”",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
"Locale not working" => "Lokalizacja nie działa",
@@ -57,6 +59,7 @@
"Allow users to only share with users in their groups" => "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup",
"Security" => "Bezpieczeństwo",
"Enforce HTTPS" => "Wymuś HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
"Log" => "Logi",
"Log level" => "Poziom logów",
"More" => "Więcej",
@@ -91,6 +94,7 @@
"Language" => "Język",
"Help translate" => "Pomóż w tłumaczeniu",
"WebDAV" => "WebDAV",
+"Encryption" => "Szyfrowanie",
"Login Name" => "Login",
"Create" => "Utwórz",
"Admin Recovery Password" => "Odzyskiwanie hasła administratora",
@@ -104,3 +108,4 @@
"set new password" => "ustaw nowe hasło",
"Default" => "Domyślny"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/pl_PL.php b/settings/l10n/pl_PL.php
index 7dcd2fdfae8..91ae517f236 100644
--- a/settings/l10n/pl_PL.php
+++ b/settings/l10n/pl_PL.php
@@ -1,4 +1,6 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Update" => "Uaktualnienie",
"Email" => "Email"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 4c0d5fb5238..dfd4649772c 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Não foi possível carregar lista da App Store",
"Authentication error" => "Erro de autenticação",
"Your display name has been changed." => "A exibição de seu nome foi alterada.",
@@ -24,6 +25,7 @@
"Updating...." => "Atualizando...",
"Error while updating app" => "Erro ao atualizar aplicativo",
"Updated" => "Atualizado",
+"Decrypting files... Please wait, this can take some time." => "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
"Saving..." => "Salvando...",
"deleted" => "excluído",
"undo" => "desfazer",
@@ -101,6 +103,10 @@
"Help translate" => "Ajude a traduzir",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Use esse endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acessar seus arquivos via WebDAV</a>",
+"Encryption" => "Criptografia",
+"The encryption app is no longer enabled, decrypt all your file" => "O aplicativo de encriptação não está mais ativo, decripti todos os seus arquivos",
+"Log-in password" => "Senha de login",
+"Decrypt all Files" => "Decripti todos os Arquivos",
"Login Name" => "Nome de Login",
"Create" => "Criar",
"Admin Recovery Password" => "Recuperação da Senha do Administrador",
@@ -114,3 +120,4 @@
"set new password" => "definir nova senha",
"Default" => "Padrão"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 776424f3b6c..2962fb7f5ab 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
"Authentication error" => "Erro na autenticação",
"Your display name has been changed." => "O seu nome foi alterado",
@@ -101,6 +102,7 @@
"Help translate" => "Ajude a traduzir",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">aceder aos seus ficheiros via WebDav</a>",
+"Encryption" => "Encriptação",
"Login Name" => "Nome de utilizador",
"Create" => "Criar",
"Admin Recovery Password" => "Recuperar password de administrador",
@@ -114,3 +116,4 @@
"set new password" => "definir nova palavra-passe",
"Default" => "Padrão"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index f11cb2903f4..839ddf645f8 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Imposibil de actualizat lista din App Store.",
"Authentication error" => "Eroare la autentificare",
"Your display name has been changed." => "Numele afişat a fost schimbat.",
@@ -87,6 +88,7 @@
"Language" => "Limba",
"Help translate" => "Ajută la traducere",
"WebDAV" => "WebDAV",
+"Encryption" => "Încriptare",
"Create" => "Crează",
"Default Storage" => "Stocare implicită",
"Unlimited" => "Nelimitată",
@@ -95,3 +97,4 @@
"Storage" => "Stocare",
"Default" => "Implicită"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 8e7920f35c9..16f8f67481e 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Не удалось загрузить список из App Store",
"Authentication error" => "Ошибка аутентификации",
"Your display name has been changed." => "Ваше отображаемое имя было изменено.",
@@ -101,6 +102,7 @@
"Help translate" => "Помочь с переводом",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Используйте этот адрес чтобы получить доступ к вашим файлам через WebDav - <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">",
+"Encryption" => "Шифрование",
"Login Name" => "Имя пользователя",
"Create" => "Создать",
"Admin Recovery Password" => "Восстановление Пароля Администратора",
@@ -114,3 +116,4 @@
"set new password" => "установить новый пароль",
"Default" => "По умолчанию"
);
+$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);";
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
deleted file mode 100644
index d80f7b08734..00000000000
--- a/settings/l10n/ru_RU.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error" => "Ошибка",
-"Saving..." => "Сохранение",
-"deleted" => "удалено",
-"Groups" => "Группы",
-"Delete" => "Удалить",
-"Email" => "Email",
-"Other" => "Другое"
-);
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 7c5a8114f0b..c45d67daa74 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Authentication error" => "සත්‍යාපන දෝෂයක්",
"Group already exists" => "කණ්ඩායම දැනටමත් තිබේ",
"Unable to add group" => "කාණඩයක් එක් කළ නොහැකි විය",
@@ -45,7 +46,9 @@
"Fill in an email address to enable password recovery" => "මුරපද ප්‍රතිස්ථාපනය සඳහා විද්‍යුත් තැපැල් විස්තර ලබා දෙන්න",
"Language" => "භාෂාව",
"Help translate" => "පරිවර්ථන සහය",
+"Encryption" => "ගුප්ත කේතනය",
"Create" => "තනන්න",
"Other" => "වෙනත්",
"Username" => "පරිශීලක නම"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 83cfb499de5..bd7cdd46951 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Nie je možné nahrať zoznam z App Store",
"Authentication error" => "Chyba autentifikácie",
"Your display name has been changed." => "Vaše zobrazované meno bolo zmenené.",
@@ -24,6 +25,7 @@
"Updating...." => "Aktualizujem...",
"Error while updating app" => "chyba pri aktualizácii aplikácie",
"Updated" => "Aktualizované",
+"Decrypting files... Please wait, this can take some time." => "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
"Saving..." => "Ukladám...",
"deleted" => "zmazané",
"undo" => "vrátiť",
@@ -37,25 +39,35 @@
"A valid password must be provided" => "Musíte zadať platné heslo",
"__language_name__" => "Slovensky",
"Security Warning" => "Bezpečnostné varovanie",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file 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." => "Váš priečinok s dátami aj vaše súbory sú pravdepodobne prístupné z internetu. Súbor .htaccess nefunguje. Odporúčame nakonfigurovať webový server tak, aby priečinok s dátami nebol naďalej prístupný, alebo presunúť priečinok s dátami mimo priestor sprístupňovaný webovým serverom.",
"Setup Warning" => "Nastavenia oznámení",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Skontrolujte prosím znovu <a href=\"%s\">inštalačnú príručku</a>.",
"Module 'fileinfo' missing" => "Chýba modul 'fileinfo'",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu.",
"Locale not working" => "Lokalizácia nefunguje",
+"System locale can't be set to %s. 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 %s." => "Systémové nastavenie lokalizácie nemohlo byť nastavené na %s. To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov. Odporúčame nainštalovať do vášho systému balíčky potrebné pre podporu %s.",
"Internet connection not working" => "Pripojenie na internet nefunguje",
+"This 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." => "Server nemá funkčné pripojenie k internetu. Niektoré moduly ako napr. externé úložisko, oznámenie o dostupných aktualizáciách alebo inštalácia aplikácií tretích strán nebudú fungovať. Prístup k súborom z iných miest a odosielanie oznamovacích emailov tiež nemusí fungovať. Ak chcete využívať všetky vlastnosti ownCloudu, odporúčame povoliť pripojenie k internetu tomuto serveru.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Vykonať jednu úlohu s každým načítaní stránky",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php je registrovaný v službe webcron na zavolanie stránky cron.php raz za minútu cez HTTP.",
+"Use systems cron service to call the cron.php file once a minute." => "Použiť systémovú službu cron na spustenie súboru cron.php raz za minútu.",
"Sharing" => "Zdieľanie",
"Enable Share API" => "Povoliť API zdieľania",
"Allow apps to use the Share API" => "Povoliť aplikáciám používať API na zdieľanie",
"Allow links" => "Povoliť odkazy",
"Allow users to share items to the public with links" => "Povoliť používateľom zdieľať položky pre verejnosť cez odkazy",
+"Allow public uploads" => "Povoliť verejné nahrávanie súborov",
+"Allow users to enable others to upload into their publicly shared folders" => "Povoliť používateľom umožniť iným používateľom nahrávať do ich zdieľaného priečinka",
"Allow resharing" => "Povoliť zdieľanie ďalej",
"Allow users to share items shared with them again" => "Povoliť používateľom ďalej zdieľať zdieľané položky",
"Allow users to share with anyone" => "Povoliť používateľom zdieľať s kýmkoľvek",
"Allow users to only share with users in their groups" => "Povoliť používateľom zdieľať len s používateľmi v ich skupinách",
"Security" => "Zabezpečenie",
"Enforce HTTPS" => "Vynútiť HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Vynúti pripájanie klientov k %s šifrovaným pripojením.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL.",
"Log" => "Záznam",
"Log level" => "Úroveň záznamu",
"More" => "Viac",
@@ -91,6 +103,9 @@
"Help translate" => "Pomôcť s prekladom",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použite túto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prístup k súborom cez WebDAV</a>",
+"Encryption" => "Šifrovanie",
+"Log-in password" => "Prihlasovacie heslo",
+"Decrypt all Files" => "Dešifrovať všetky súbory",
"Login Name" => "Prihlasovacie meno",
"Create" => "Vytvoriť",
"Admin Recovery Password" => "Obnovenie hesla administrátora",
@@ -104,3 +119,4 @@
"set new password" => "nastaviť nové heslo",
"Default" => "Predvolené"
);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 7cd143127cd..eaf975048ce 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Ni mogoče naložiti seznama iz programskega središča",
"Authentication error" => "Napaka med overjanjem",
"Your display name has been changed." => "Prikazano ime je bilo spremenjeno.",
@@ -90,6 +91,7 @@
"Language" => "Jezik",
"Help translate" => "Sodelujte pri prevajanju",
"WebDAV" => "WebDAV",
+"Encryption" => "Šifriranje",
"Login Name" => "Prijavno ime",
"Create" => "Ustvari",
"Admin Recovery Password" => "Obnovitev administratorjevega gesla",
@@ -103,3 +105,4 @@
"set new password" => "nastavi novo geslo",
"Default" => "Privzeto"
);
+$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index 78c051d1011..1a8b588c0bd 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Authentication error" => "Veprim i gabuar gjatë vërtetimit të identitetit",
"Error" => "Veprim i gabuar",
"undo" => "anulo",
@@ -12,3 +13,4 @@
"Email" => "Email-i",
"Username" => "Përdoruesi"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 4c1443a8d7c..86872df36c5 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Грешка приликом учитавања списка из Складишта Програма",
"Authentication error" => "Грешка при провери идентитета",
"Unable to change display name" => "Не могу да променим име за приказ",
@@ -88,6 +89,7 @@
"Language" => "Језик",
"Help translate" => " Помозите у превођењу",
"WebDAV" => "WebDAV",
+"Encryption" => "Шифровање",
"Login Name" => "Корисничко име",
"Create" => "Направи",
"Default Storage" => "Подразумевано складиште",
@@ -99,3 +101,4 @@
"set new password" => "постави нову лозинку",
"Default" => "Подразумевано"
);
+$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);";
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 8e375a7f23c..f23e665bb27 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Authentication error" => "Greška pri autentifikaciji",
"Language changed" => "Jezik je izmenjen",
"Invalid request" => "Neispravan zahtev",
@@ -16,3 +17,4 @@
"Other" => "Drugo",
"Username" => "Korisničko ime"
);
+$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);";
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 3ab574bd449..9600b68ff24 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Kan inte ladda listan från App Store",
"Authentication error" => "Fel vid autentisering",
"Your display name has been changed." => "Ditt visningsnamn har ändrats.",
@@ -24,6 +25,7 @@
"Updating...." => "Uppdaterar...",
"Error while updating app" => "Fel uppstod vid uppdatering av appen",
"Updated" => "Uppdaterad",
+"Decrypting files... Please wait, this can take some time." => "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
"Saving..." => "Sparar...",
"deleted" => "raderad",
"undo" => "ångra",
@@ -101,6 +103,10 @@
"Help translate" => "Hjälp att översätta",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Använd denna adress för att <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">komma åt dina filer via WebDAV</a>",
+"Encryption" => "Kryptering",
+"The encryption app is no longer enabled, decrypt all your file" => "Appen för kryptering är inte längre aktiverad, dekryptera alla dina filer",
+"Log-in password" => "Inloggningslösenord",
+"Decrypt all Files" => "Dekryptera alla filer",
"Login Name" => "Inloggningsnamn",
"Create" => "Skapa",
"Admin Recovery Password" => "Admin återställningslösenord",
@@ -114,3 +120,4 @@
"set new password" => "ange nytt lösenord",
"Default" => "Förvald"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 4dfad2aa2b4..e65feedbc95 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "செயலி சேமிப்பிலிருந்து பட்டியலை ஏற்றமுடியாதுள்ளது",
"Authentication error" => "அத்தாட்சிப்படுத்தலில் வழு",
"Group already exists" => "குழு ஏற்கனவே உள்ளது",
@@ -43,7 +44,9 @@
"Fill in an email address to enable password recovery" => "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக",
"Language" => "மொழி",
"Help translate" => "மொழிபெயர்க்க உதவி",
+"Encryption" => "மறைக்குறியீடு",
"Create" => "உருவாக்குக",
"Other" => "மற்றவை",
"Username" => "பயனாளர் பெயர்"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/te.php b/settings/l10n/te.php
index 3a85a015205..21caa79912a 100644
--- a/settings/l10n/te.php
+++ b/settings/l10n/te.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "పొరపాటు",
"Delete" => "తొలగించు",
"More" => "మరిన్ని",
@@ -9,3 +10,4 @@
"Language" => "భాష",
"Username" => "వాడుకరి పేరు"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 006b666ff63..861528742f8 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "ไม่สามารถโหลดรายการจาก App Store ได้",
"Authentication error" => "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
"Group already exists" => "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
@@ -74,6 +75,7 @@
"Language" => "ภาษา",
"Help translate" => "ช่วยกันแปล",
"WebDAV" => "WebDAV",
+"Encryption" => "การเข้ารหัส",
"Login Name" => "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
"Create" => "สร้าง",
"Default Storage" => "พื้นที่จำกัดข้อมูลเริ่มต้น",
@@ -85,3 +87,4 @@
"set new password" => "ตั้งค่ารหัสผ่านใหม่",
"Default" => "ค่าเริ่มต้น"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 7ce0af1a28d..e391d39fa5d 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "App Store'dan liste yüklenemiyor",
"Authentication error" => "Kimlik doğrulama hatası",
"Your display name has been changed." => "Görüntülenen isminiz değiştirildi.",
@@ -37,25 +38,34 @@
"A valid password must be provided" => "Geçerli bir parola mutlaka sağlanmalı",
"__language_name__" => "Türkçe",
"Security Warning" => "Güvenlik Uyarisi",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file 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. .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.",
"Setup Warning" => "Kurulum Uyarısı",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> tekrar kontrol edin.",
"Module 'fileinfo' missing" => "Modül 'fileinfo' kayıp",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modülü 'fileinfo' kayıp. MIME-tip tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
"Locale not working" => "Locale çalışmıyor.",
+"System locale can't be set to %s. 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 %s." => "Sistem yereli %s olarak değiştirilemedi. Bu, dosya adlarındaki bazı karakterlerde sorun olabileceği anlamına gelir. %s desteklemek için gerekli paketleri kurmanızı şiddetle öneririz.",
"Internet connection not working" => "İnternet bağlantısı çalışmıyor",
+"This 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." => "Bu sunucunun çalışan bir internet bağlantısı yok. Bu, harici depolama alanı bağlama, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacak demektir. Uzak dosyalara erişim ve e-posta ile bildirim gönderme de çalışmayacaktır. Eğer bu özelliklerin tamamını kullanmak istiyorsanız, sunucu için internet bağlantısını etkinleştirmenizi öneriyoruz.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Yüklenen her sayfa ile bir görev çalıştır",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "Http üzerinden dakikada bir çalıştırılmak üzere, cron.php bir webcron hizmetine kaydedildi.",
+"Use systems cron service to call the cron.php file once a minute." => "cron.php dosyasını dakikada bir çağırmak için sistemin cron hizmetini kullan. ",
"Sharing" => "Paylaşım",
"Enable Share API" => "Paylaşım API'sini etkinleştir.",
"Allow apps to use the Share API" => "Uygulamaların paylaşım API'sini kullanmasına izin ver",
"Allow links" => "Bağlantıları izin ver.",
"Allow users to share items to the public with links" => "Kullanıcıların nesneleri paylaşımı için herkese açık bağlantılara izin ver",
+"Allow public uploads" => "Herkes tarafından yüklemeye izin ver",
"Allow resharing" => "Paylaşıma izin ver",
"Allow users to share items shared with them again" => "Kullanıcıların kendileri ile paylaşılan öğeleri yeniden paylaşmasına izin ver",
"Allow users to share with anyone" => "Kullanıcıların herşeyi paylaşmalarına izin ver",
"Allow users to only share with users in their groups" => "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver",
"Security" => "Güvenlik",
"Enforce HTTPS" => "HTTPS bağlantısına zorla",
+"Forces the clients to connect to %s via an encrypted connection." => "İstemcileri %s a şifreli bir bağlantı ile bağlanmaya zorlar.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen ,%s a HTTPS ile bağlanın.",
"Log" => "Kayıtlar",
"Log level" => "Günlük seviyesi",
"More" => "Daha fazla",
@@ -91,6 +101,7 @@
"Help translate" => "Çevirilere yardım edin",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => " <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">Dosyalarınıza WebDAV üzerinen erişme </a> için bu adresi kullanın",
+"Encryption" => "Şifreleme",
"Login Name" => "Giriş Adı",
"Create" => "Oluştur",
"Admin Recovery Password" => "Yönetici kurtarma parolası",
@@ -104,3 +115,4 @@
"set new password" => "yeni parola belirle",
"Default" => "Varsayılan"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index abed87ef0d4..2c5e1a6786c 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "ئەپ بازىرىدىن تىزىمنى يۈكلىيەلمىدى",
"Authentication error" => "سالاھىيەت دەلىللەش خاتالىقى",
"Your display name has been changed." => "كۆرسىتىدىغان ئىسمىڭىز ئۆزگەردى.",
@@ -59,6 +60,7 @@
"Language" => "تىل",
"Help translate" => "تەرجىمىگە ياردەم",
"WebDAV" => "WebDAV",
+"Encryption" => "شىفىرلاش",
"Login Name" => "تىزىمغا كىرىش ئاتى",
"Create" => "قۇر",
"Default Storage" => "كۆڭۈلدىكى ساقلىغۇچ",
@@ -70,3 +72,4 @@
"set new password" => "يېڭى ئىم تەڭشە",
"Default" => "كۆڭۈلدىكى"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index cb4aa109651..e58a8b7139c 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Не вдалося завантажити список з App Store",
"Authentication error" => "Помилка автентифікації",
"Unable to change display name" => "Не вдалося змінити зображене ім'я",
@@ -89,6 +90,7 @@
"Language" => "Мова",
"Help translate" => "Допомогти з перекладом",
"WebDAV" => "WebDAV",
+"Encryption" => "Шифрування",
"Login Name" => "Ім'я Логіну",
"Create" => "Створити",
"Default Storage" => "сховище за замовчуванням",
@@ -100,3 +102,4 @@
"set new password" => "встановити новий пароль",
"Default" => "За замовчуванням"
);
+$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);";
diff --git a/settings/l10n/ur_PK.php b/settings/l10n/ur_PK.php
index ce1d425c970..ff3eb3d11ca 100644
--- a/settings/l10n/ur_PK.php
+++ b/settings/l10n/ur_PK.php
@@ -1,6 +1,8 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "ایرر",
"Password" => "پاسورڈ",
"New password" => "نیا پاسورڈ",
"Username" => "یوزر نیم"
);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 1c929746a3f..832001a02a7 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "Không thể tải danh sách ứng dụng từ App Store",
"Authentication error" => "Lỗi xác thực",
"Unable to change display name" => "Không thể thay đổi tên hiển thị",
@@ -75,6 +76,7 @@
"Language" => "Ngôn ngữ",
"Help translate" => "Hỗ trợ dịch thuật",
"WebDAV" => "WebDAV",
+"Encryption" => "Mã hóa",
"Login Name" => "Tên đăng nhập",
"Create" => "Tạo",
"Default Storage" => "Bộ nhớ mặc định",
@@ -86,3 +88,4 @@
"set new password" => "đặt mật khẩu mới",
"Default" => "Mặc định"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index 1853bae9207..dc760e965f5 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "不能从App Store 中加载列表",
"Authentication error" => "验证错误",
"Your display name has been changed." => "您的显示名称已修改",
@@ -101,6 +102,7 @@
"Help translate" => "帮助翻译",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "访问WebDAV请点击 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">此处</a>",
+"Encryption" => "加密",
"Login Name" => "登录名",
"Create" => "新建",
"Admin Recovery Password" => "管理员恢复密码",
@@ -114,3 +116,4 @@
"set new password" => "设置新的密码",
"Default" => "默认"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 47fcc54f430..385c77645cd 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "无法从应用商店载入列表",
"Authentication error" => "认证出错",
"Your display name has been changed." => "您的显示名字已经改变",
@@ -37,25 +38,35 @@
"A valid password must be provided" => "必须提供合法的密码",
"__language_name__" => "简体中文",
"Security Warning" => "安全警告",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file 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." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器,以使数据文件夹不可被访问,或者将数据文件夹移到web服务器以外。",
"Setup Warning" => "设置警告",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
"Module 'fileinfo' missing" => "模块'文件信息'丢失",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
"Locale not working" => "本地化无法工作",
+"System locale can't be set to %s. 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 %s." => "服务器无法设置系统本地化到%s. 这意味着可能文件名中有一些字符会引起问题. 我们强烈建议在你系统上安装所需的软件包来支持%s",
"Internet connection not working" => "因特网连接无法工作",
+"This 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." => "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作,例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
"Cron" => "计划任务",
"Execute one task with each page loaded" => "每个页面加载后执行一个任务",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php已被注册到网络定时任务服务。通过http每分钟调用owncloud根目录的cron.php网页。",
+"Use systems cron service to call the cron.php file once a minute." => "使用系统定时任务服务。每分钟通过系统定时任务调用owncloud文件夹中的cron.php文件",
"Sharing" => "共享",
"Enable Share API" => "启用共享API",
"Allow apps to use the Share API" => "允许应用软件使用共享API",
"Allow links" => "允许链接",
"Allow users to share items to the public with links" => "允许用户使用连接公开共享项目",
+"Allow public uploads" => "允许公开上传",
+"Allow users to enable others to upload into their publicly shared folders" => "用户可让其他人上传到他的公开共享文件夹",
"Allow resharing" => "允许再次共享",
"Allow users to share items shared with them again" => "允许用户将共享给他们的项目再次共享",
"Allow users to share with anyone" => "允许用户向任何人共享",
"Allow users to only share with users in their groups" => "允许用户只向同组用户共享",
"Security" => "安全",
"Enforce HTTPS" => "强制使用 HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "强制客户端通过加密连接连接到%s。",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL.",
"Log" => "日志",
"Log level" => "日志级别",
"More" => "更多",
@@ -90,6 +101,8 @@
"Language" => "语言",
"Help translate" => "帮助翻译",
"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "使用该链接 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">通过WebDAV访问你的文件</a>",
+"Encryption" => "加密",
"Login Name" => "登录名称",
"Create" => "创建",
"Admin Recovery Password" => "管理恢复密码",
@@ -103,3 +116,4 @@
"set new password" => "设置新密码",
"Default" => "默认"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
index 8da97462751..10fce11fb58 100644
--- a/settings/l10n/zh_HK.php
+++ b/settings/l10n/zh_HK.php
@@ -1,9 +1,12 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Error" => "錯誤",
"Groups" => "群組",
"Delete" => "刪除",
"Password" => "密碼",
"New password" => "新密碼",
"Email" => "電郵",
+"Encryption" => "加密",
"Username" => "用戶名稱"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index b4590859dae..7c1a8963cca 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "無法從 App Store 讀取清單",
"Authentication error" => "認證錯誤",
"Your display name has been changed." => "已更改顯示名稱",
@@ -101,6 +102,7 @@
"Help translate" => "幫助翻譯",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "使用<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">這個網址</a>來透過 WebDAV 存取您的檔案",
+"Encryption" => "加密",
"Login Name" => "登入名稱",
"Create" => "建立",
"Admin Recovery Password" => "管理者復原密碼",
@@ -114,3 +116,4 @@
"set new password" => "設定新密碼",
"Default" => "預設"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index 40213b3a7e5..3613ee4fe97 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -61,7 +61,6 @@ return array(
'pl_PL'=>'Polski',
'ka_GE'=>'Georgian for Georgia',
'ku_IQ'=>'Kurdish Iraq',
-'ru_RU'=>'Русский язык',
'si_LK'=>'Sinhala',
'be'=>'Belarusian',
'ka'=>'Kartuli (Georgian)',
diff --git a/settings/personal.php b/settings/personal.php
index 1e2e1cf6723..e69898f6f8f 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -24,6 +24,9 @@ $email=OC_Preferences::getValue(OC_User::getUser(), 'settings', 'email', '');
$userLang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
$languageCodes=OC_L10N::findAvailableLanguages();
+//check if encryption was enabled in the past
+$enableDecryptAll = OC_Util::encryptedFiles();
+
// array of common languages
$commonlangcodes = array(
'en', 'es', 'fr', 'de', 'de_DE', 'ja_JP', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'zh_CN', 'ko'
@@ -80,6 +83,7 @@ $tmpl->assign('activelanguage', $userLang);
$tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser()));
$tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
$tmpl->assign('displayName', OC_User::getDisplayName());
+$tmpl->assign('enableDecryptAll' , $enableDecryptAll);
$forms=OC_App::getForms('personal');
$tmpl->assign('forms', array());
diff --git a/settings/routes.php b/settings/routes.php
index b20119b5803..73ee70d1d5c 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -46,6 +46,8 @@ $this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php')
->actionInclude('settings/ajax/lostpassword.php');
$this->create('settings_ajax_setlanguage', '/settings/ajax/setlanguage.php')
->actionInclude('settings/ajax/setlanguage.php');
+$this->create('settings_ajax_decryptall', '/settings/ajax/decryptall.php')
+ ->actionInclude('settings/ajax/decryptall.php');
// apps
$this->create('settings_ajax_apps_ocs', '/settings/ajax/apps/ocs.php')
->actionInclude('settings/ajax/apps/ocs.php');
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 2b14c1460d6..e54586b80df 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -90,38 +90,30 @@ if (!$_['internetconnectionworking']) {
<fieldset class="personalblock" id="backgroundjobs">
<legend><strong><?php p($l->t('Cron'));?></strong></legend>
- <table class="nostyle">
- <tr>
- <td>
+ <p>
<input type="radio" name="mode" value="ajax"
id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
print_unescaped('checked="checked"');
} ?>>
<label for="backgroundjobs_ajax">AJAX</label><br/>
<em><?php p($l->t("Execute one task with each page loaded")); ?></em>
- </td>
- </tr>
- <tr>
- <td>
+ </p>
+ <p>
<input type="radio" name="mode" value="webcron"
id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] === "webcron") {
print_unescaped('checked="checked"');
} ?>>
<label for="backgroundjobs_webcron">Webcron</label><br/>
<em><?php p($l->t("cron.php is registered at a webcron service to call cron.php once a minute over http.")); ?></em>
- </td>
- </tr>
- <tr>
- <td>
+ </p>
+ <p>
<input type="radio" name="mode" value="cron"
id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] === "cron") {
print_unescaped('checked="checked"');
} ?>>
<label for="backgroundjobs_cron">Cron</label><br/>
<em><?php p($l->t("Use systems cron service to call the cron.php file once a minute.")); ?></em>
- </td>
- </tr>
- </table>
+ </p>
</fieldset>
<fieldset class="personalblock" id="shareAPI">
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index b9d9b09f5d0..bad88142da9 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -4,7 +4,7 @@
* See the COPYING-README file.
*/?>
-<div class="clientsbox">
+<div class="clientsbox center">
<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
<a href="<?php p($_['clients']['desktop']); ?>" target="_blank">
<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'desktopapp.png')); ?>" />
@@ -16,7 +16,7 @@
<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'appstore.png')); ?>" />
</a>
<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
- <center><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></center>
+ <p class="center"><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p>
<?php }?>
</div>
@@ -110,6 +110,32 @@ if($_['passwordChangeSupported']) {
print_unescaped($form);
};?>
+<?php if($_['enableDecryptAll']): ?>
+<form id="decryptAll">
+ <fieldset class="personalblock">
+ <legend>
+ <?php p( $l->t( 'Encryption' ) ); ?>
+ </legend>
+ <?php p($l->t( "The encryption app is no longer enabled, decrypt all your file" )); ?>
+ <p>
+ <input
+ type="password"
+ name="privateKeyPassword"
+ id="privateKeyPassword" />
+ <label for="privateKeyPassword"><?php p($l->t( "Log-in password" )); ?></label>
+ <br />
+ <button
+ type="button"
+ disabled
+ name="submitDecryptAll"><?php p($l->t( "Decrypt all Files" )); ?>
+ </button>
+ <span class="msg"></span>
+ </p>
+ <br />
+ </fieldset>
+</form>
+<?php endif; ?>
+
<fieldset class="personalblock">
<legend><strong><?php p($l->t('Version'));?></strong></legend>
<strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getVersionString()); ?><br/>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 4ddef3ff1b5..22450fdf25f 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -78,7 +78,7 @@ $_['subadmingroups'] = array_flip($items);
</div>
</div>
-<table class="hascontrols" data-groups="<?php p(implode(', ', $allGroups));?>">
+<table class="hascontrols" data-groups="<?php p(json_encode($allGroups));?>">
<thead>
<tr>
<th id='headerName'><?php p($l->t('Username'))?></th>
@@ -108,7 +108,7 @@ $_['subadmingroups'] = array_flip($items);
<td class="groups"><select
class="groupsselect"
data-username="<?php p($user['name']) ;?>"
- data-user-groups="<?php p($user['groups']) ;?>"
+ data-user-groups="<?php p(json_encode($user['groups'])) ;?>"
data-placeholder="groups" title="<?php p($l->t('Groups'))?>"
multiple="multiple">
<?php foreach($_["groups"] as $group): ?>
@@ -120,7 +120,7 @@ $_['subadmingroups'] = array_flip($items);
<td class="subadmins"><select
class="subadminsselect"
data-username="<?php p($user['name']) ;?>"
- data-subadmin="<?php p($user['subadmin']);?>"
+ data-subadmin="<?php p(json_encode($user['subadmin']));?>"
data-placeholder="subadmins" title="<?php p($l->t('Group Admin'))?>"
multiple="multiple">
<?php foreach($_["subadmingroups"] as $group): ?>
diff --git a/settings/users.php b/settings/users.php
index ba79ae93b28..213d1eecfda 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -54,15 +54,16 @@ foreach($accessibleusers as $uid => $displayName) {
$name = $displayName;
if ( $displayName !== $uid ) {
$name = $name . ' ('.$uid.')';
- }
-
+ }
+
$users[] = array(
"name" => $uid,
- "displayName" => $displayName,
- "groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($uid)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
- 'quota'=>$quota,
- 'isQuotaUserDefined'=>$isQuotaUserDefined,
- 'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($uid)));
+ "displayName" => $displayName,
+ "groups" => OC_Group::getUserGroups($uid),
+ 'quota' => $quota,
+ 'isQuotaUserDefined' => $isQuotaUserDefined,
+ 'subadmin' => OC_SubAdmin::getSubAdminsGroups($uid),
+ );
}
foreach( $accessiblegroups as $i ) {
diff --git a/status.php b/status.php
index bac01c11b28..179fe3f49f2 100644
--- a/status.php
+++ b/status.php
@@ -39,4 +39,4 @@ try {
} catch (Exception $ex) {
OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
-} \ No newline at end of file
+}
diff --git a/tests/data/l10n/cs.php b/tests/data/l10n/cs.php
new file mode 100644
index 00000000000..1c5907bc148
--- /dev/null
+++ b/tests/data/l10n/cs.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+ "_%n window__%n windows_" => array("%n okno", "%n okna", "%n oken")
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/tests/data/l10n/de.php b/tests/data/l10n/de.php
new file mode 100644
index 00000000000..858ec8af49c
--- /dev/null
+++ b/tests/data/l10n/de.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+ "_%n file__%n files_" => array("%n Datei", "%n Dateien")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/tests/data/l10n/ru.php b/tests/data/l10n/ru.php
new file mode 100644
index 00000000000..dd46293db6c
--- /dev/null
+++ b/tests/data/l10n/ru.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+ "_%n file__%n files_" => array("%n файл", "%n файла", "%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);";
diff --git a/tests/lib/app.php b/tests/lib/app.php
index 5396db8143e..52eade90a6e 100644
--- a/tests/lib/app.php
+++ b/tests/lib/app.php
@@ -79,4 +79,4 @@ class Test_App extends PHPUnit_Framework_TestCase {
$this->assertFalse(OC_App::isAppVersionCompatible($oc, $app));
}
-} \ No newline at end of file
+}
diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php
index e049a899d88..195e3450f3f 100644
--- a/tests/lib/archive/zip.php
+++ b/tests/lib/archive/zip.php
@@ -19,4 +19,4 @@ class Test_Archive_ZIP extends Test_Archive {
return new OC_Archive_ZIP(OCP\Files::tmpFile('.zip'));
}
}
-} \ No newline at end of file
+}
diff --git a/tests/lib/db.php b/tests/lib/db.php
index 79e05f30a1c..51edbf7b309 100644
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@ -76,13 +76,11 @@ class Test_DB extends PHPUnit_Framework_TestCase {
$query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (?,?)');
$result1 = OC_DB::executeAudited($query, array('insertid 1','uri_1'));
$id1 = OC_DB::insertid('*PREFIX*'.$this->table2);
- $this->assertInternalType('int', $id1);
// we don't know the id we should expect, so insert another row
$result2 = OC_DB::executeAudited($query, array('insertid 2','uri_2'));
$id2 = OC_DB::insertid('*PREFIX*'.$this->table2);
// now we can check if the two ids are in correct order
- $this->assertInternalType('int', $id2);
$this->assertGreaterThan($id1, $id2);
}
diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index 263ceadccc7..f6deb93a49e 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -143,6 +143,24 @@ class Scanner extends \PHPUnit_Framework_TestCase {
$newData = $this->cache->get('');
$this->assertEquals($oldData['etag'], $newData['etag']);
$this->assertEquals(-1, $newData['size']);
+
+ $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE);
+ $oldData = $this->cache->get('');
+ $this->assertNotEquals(-1, $oldData['size']);
+ $this->scanner->scanFile('', \OC\Files\Cache\Scanner::REUSE_ETAG + \OC\Files\Cache\Scanner::REUSE_SIZE);
+ $newData = $this->cache->get('');
+ $this->assertEquals($oldData['etag'], $newData['etag']);
+ $this->assertEquals($oldData['size'], $newData['size']);
+
+ $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG + \OC\Files\Cache\Scanner::REUSE_SIZE);
+ $newData = $this->cache->get('');
+ $this->assertEquals($oldData['etag'], $newData['etag']);
+ $this->assertEquals($oldData['size'], $newData['size']);
+
+ $this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG + \OC\Files\Cache\Scanner::REUSE_SIZE);
+ $newData = $this->cache->get('');
+ $this->assertEquals($oldData['etag'], $newData['etag']);
+ $this->assertEquals($oldData['size'], $newData['size']);
}
public function testRemovedFile() {
diff --git a/tests/lib/files/storage/wrapper/quota.php b/tests/lib/files/storage/wrapper/quota.php
new file mode 100644
index 00000000000..3702f8154f5
--- /dev/null
+++ b/tests/lib/files/storage/wrapper/quota.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright (c) 2013 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 Test\Files\Storage\Wrapper;
+
+//ensure the constants are loaded
+\OC::$loader->load('\OC\Files\Filesystem');
+
+class Quota extends \Test\Files\Storage\Storage {
+ /**
+ * @var string tmpDir
+ */
+ private $tmpDir;
+
+ public function setUp() {
+ $this->tmpDir = \OC_Helper::tmpFolder();
+ $storage = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir));
+ $this->instance = new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => 10000000));
+ }
+
+ public function tearDown() {
+ \OC_Helper::rmdirr($this->tmpDir);
+ }
+
+ protected function getLimitedStorage($limit) {
+ $storage = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir));
+ $storage->getScanner()->scan('');
+ return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $limit));
+ }
+
+ public function testFilePutContentsNotEnoughSpace() {
+ $instance = $this->getLimitedStorage(3);
+ $this->assertFalse($instance->file_put_contents('foo', 'foobar'));
+ }
+
+ public function testCopyNotEnoughSpace() {
+ $instance = $this->getLimitedStorage(9);
+ $this->assertEquals(6, $instance->file_put_contents('foo', 'foobar'));
+ $instance->getScanner()->scan('');
+ $this->assertFalse($instance->copy('foo', 'bar'));
+ }
+
+ public function testFreeSpace() {
+ $instance = $this->getLimitedStorage(9);
+ $this->assertEquals(9, $instance->free_space(''));
+ }
+
+ public function testFWriteNotEnoughSpace() {
+ $instance = $this->getLimitedStorage(9);
+ $stream = $instance->fopen('foo', 'w+');
+ $this->assertEquals(6, fwrite($stream, 'foobar'));
+ $this->assertEquals(3, fwrite($stream, 'qwerty'));
+ fclose($stream);
+ $this->assertEquals('foobarqwe', $instance->file_get_contents('foo'));
+ }
+}
diff --git a/tests/lib/files/storage/wrapper.php b/tests/lib/files/storage/wrapper/wrapper.php
index 2794a0a6263..e31abfc7324 100644
--- a/tests/lib/files/storage/wrapper.php
+++ b/tests/lib/files/storage/wrapper/wrapper.php
@@ -6,9 +6,9 @@
* See the COPYING-README file.
*/
-namespace Test\Files\Storage;
+namespace Test\Files\Storage\Wrapper;
-class Wrapper extends Storage {
+class Wrapper extends \Test\Files\Storage\Storage {
/**
* @var string tmpDir
*/
diff --git a/tests/lib/files/stream/quota.php b/tests/lib/files/stream/quota.php
new file mode 100644
index 00000000000..22d3e93592c
--- /dev/null
+++ b/tests/lib/files/stream/quota.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright (c) 2013 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 Test\Files\Stream;
+
+class Quota extends \PHPUnit_Framework_TestCase {
+ public function tearDown() {
+ \OC\Files\Stream\Quota::clear();
+ }
+
+ protected function getStream($mode, $limit) {
+ $source = fopen('php://temp', $mode);
+ return \OC\Files\Stream\Quota::wrap($source, $limit);
+ }
+
+ public function testWriteEnoughSpace() {
+ $stream = $this->getStream('w+', 100);
+ $this->assertEquals(6, fwrite($stream, 'foobar'));
+ rewind($stream);
+ $this->assertEquals('foobar', fread($stream, 100));
+ }
+
+ public function testWriteNotEnoughSpace() {
+ $stream = $this->getStream('w+', 3);
+ $this->assertEquals(3, fwrite($stream, 'foobar'));
+ rewind($stream);
+ $this->assertEquals('foo', fread($stream, 100));
+ }
+
+ public function testWriteNotEnoughSpaceSecondTime() {
+ $stream = $this->getStream('w+', 9);
+ $this->assertEquals(6, fwrite($stream, 'foobar'));
+ $this->assertEquals(3, fwrite($stream, 'qwerty'));
+ rewind($stream);
+ $this->assertEquals('foobarqwe', fread($stream, 100));
+ }
+
+ public function testWriteEnoughSpaceRewind() {
+ $stream = $this->getStream('w+', 6);
+ $this->assertEquals(6, fwrite($stream, 'foobar'));
+ rewind($stream);
+ $this->assertEquals(3, fwrite($stream, 'qwe'));
+ rewind($stream);
+ $this->assertEquals('qwebar', fread($stream, 100));
+ }
+
+ public function testWriteNotEnoughSpaceRead() {
+ $stream = $this->getStream('w+', 6);
+ $this->assertEquals(6, fwrite($stream, 'foobar'));
+ rewind($stream);
+ $this->assertEquals('foobar', fread($stream, 6));
+ $this->assertEquals(0, fwrite($stream, 'qwe'));
+ }
+
+ public function testWriteNotEnoughSpaceExistingStream() {
+ $source = fopen('php://temp', 'w+');
+ fwrite($source, 'foobar');
+ $stream = \OC\Files\Stream\Quota::wrap($source, 3);
+ $this->assertEquals(3, fwrite($stream, 'foobar'));
+ rewind($stream);
+ $this->assertEquals('foobarfoo', fread($stream, 100));
+ }
+
+ public function testWriteNotEnoughSpaceExistingStreamRewind() {
+ $source = fopen('php://temp', 'w+');
+ fwrite($source, 'foobar');
+ $stream = \OC\Files\Stream\Quota::wrap($source, 3);
+ rewind($stream);
+ $this->assertEquals(6, fwrite($stream, 'qwerty'));
+ rewind($stream);
+ $this->assertEquals('qwerty', fread($stream, 100));
+ }
+}
diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php
new file mode 100644
index 00000000000..a021d215ae5
--- /dev/null
+++ b/tests/lib/files/utils/scanner.php
@@ -0,0 +1,74 @@
+<?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 Test\Files\Utils;
+
+use OC\Files\Mount\Mount;
+use OC\Files\Storage\Temporary;
+
+class TestScanner extends \OC\Files\Utils\Scanner {
+ /**
+ * @var \OC\Files\Mount\Mount[] $mounts
+ */
+ private $mounts = array();
+
+ /**
+ * @param \OC\Files\Mount\Mount $mount
+ */
+ public function addMount($mount) {
+ $this->mounts[] = $mount;
+ }
+
+ protected function getMounts($dir) {
+ return $this->mounts;
+ }
+}
+
+class Scanner extends \PHPUnit_Framework_TestCase {
+ public function testReuseExistingRoot() {
+ $storage = new Temporary(array());
+ $mount = new Mount($storage, '');
+ $cache = $storage->getCache();
+
+ $storage->mkdir('folder');
+ $storage->file_put_contents('foo.txt', 'qwerty');
+ $storage->file_put_contents('folder/bar.txt', 'qwerty');
+
+ $scanner = new TestScanner('');
+ $scanner->addMount($mount);
+
+ $scanner->scan('');
+ $this->assertTrue($cache->inCache('folder/bar.txt'));
+ $oldRoot = $cache->get('');
+
+ $scanner->scan('');
+ $newRoot = $cache->get('');
+ $this->assertEquals($oldRoot, $newRoot);
+ }
+
+ public function testReuseExistingFile() {
+ $storage = new Temporary(array());
+ $mount = new Mount($storage, '');
+ $cache = $storage->getCache();
+
+ $storage->mkdir('folder');
+ $storage->file_put_contents('foo.txt', 'qwerty');
+ $storage->file_put_contents('folder/bar.txt', 'qwerty');
+
+ $scanner = new TestScanner('');
+ $scanner->addMount($mount);
+
+ $scanner->scan('');
+ $this->assertTrue($cache->inCache('folder/bar.txt'));
+ $old = $cache->get('folder/bar.txt');
+
+ $scanner->scan('');
+ $new = $cache->get('folder/bar.txt');
+ $this->assertEquals($old, $new);
+ }
+}
diff --git a/tests/lib/geo.php b/tests/lib/geo.php
index 2c3611c092e..1c56a976129 100644
--- a/tests/lib/geo.php
+++ b/tests/lib/geo.php
@@ -20,4 +20,4 @@ class Test_Geo extends PHPUnit_Framework_TestCase {
$expected = 'Pacific/Enderbury';
$this->assertEquals($expected, $result);
}
-} \ No newline at end of file
+}
diff --git a/tests/lib/l10n.php b/tests/lib/l10n.php
new file mode 100644
index 00000000000..12eac818f84
--- /dev/null
+++ b/tests/lib/l10n.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_L10n extends PHPUnit_Framework_TestCase {
+
+ public function testGermanPluralTranslations() {
+ $l = new OC_L10N('test');
+ $transFile = OC::$SERVERROOT.'/tests/data/l10n/de.php';
+
+ $l->load($transFile);
+ $this->assertEquals('1 Datei', (string)$l->n('%n file', '%n files', 1));
+ $this->assertEquals('2 Dateien', (string)$l->n('%n file', '%n files', 2));
+ }
+
+ public function testRussianPluralTranslations() {
+ $l = new OC_L10N('test');
+ $transFile = OC::$SERVERROOT.'/tests/data/l10n/ru.php';
+
+ $l->load($transFile);
+ $this->assertEquals('1 файл', (string)$l->n('%n file', '%n files', 1));
+ $this->assertEquals('2 файла', (string)$l->n('%n file', '%n files', 2));
+ $this->assertEquals('6 файлов', (string)$l->n('%n file', '%n files', 6));
+ $this->assertEquals('21 файл', (string)$l->n('%n file', '%n files', 21));
+ $this->assertEquals('22 файла', (string)$l->n('%n file', '%n files', 22));
+ $this->assertEquals('26 файлов', (string)$l->n('%n file', '%n files', 26));
+
+ /*
+ 1 file 1 файл 1 папка
+ 2-4 files 2-4 файла 2-4 папки
+ 5-20 files 5-20 файлов 5-20 папок
+ 21 files 21 файл 21 папка
+ 22-24 files 22-24 файла 22-24 папки
+ 25-30 files 25-30 файлов 25-30 папок
+ etc
+ 100 files 100 файлов, 100 папок
+ 1000 files 1000 файлов 1000 папок
+ */
+ }
+
+ public function testCzechPluralTranslations() {
+ $l = new OC_L10N('test');
+ $transFile = OC::$SERVERROOT.'/tests/data/l10n/cs.php';
+
+ $l->load($transFile);
+ $this->assertEquals('1 okno', (string)$l->n('%n window', '%n windows', 1));
+ $this->assertEquals('2 okna', (string)$l->n('%n window', '%n windows', 2));
+ $this->assertEquals('5 oken', (string)$l->n('%n window', '%n windows', 5));
+ }
+
+ /**
+ * Issue #4360: Do not call strtotime() on numeric strings.
+ */
+ public function testNumericStringToDateTime() {
+ $l = new OC_L10N('test');
+ $this->assertSame('February 13, 2009 23:31', $l->l('datetime', '1234567890'));
+ }
+
+ public function testNumericToDateTime() {
+ $l = new OC_L10N('test');
+ $this->assertSame('February 13, 2009 23:31', $l->l('datetime', 1234567890));
+ }
+}
diff --git a/tests/lib/preferences.php b/tests/lib/preferences.php
index d39555aa01d..612cc81926b 100644
--- a/tests/lib/preferences.php
+++ b/tests/lib/preferences.php
@@ -7,7 +7,7 @@
*/
class Test_Preferences extends PHPUnit_Framework_TestCase {
- private function fillDb() {
+ public static function setUpBeforeClass() {
$query = \OC_DB::prepare('INSERT INTO `*PREFIX*preferences` VALUES(?, ?, ?, ?)');
$query->execute(array("Someuser", "someapp", "somekey", "somevalue"));
@@ -28,9 +28,14 @@ class Test_Preferences extends PHPUnit_Framework_TestCase {
$query->execute(array("Deleteuser", "someapp", "somekey", "somevalue"));
}
- public function testGetUsers() {
- $this->fillDb();
+ public static function tearDownAfterClass() {
+ $query = \OC_DB::prepare('DELETE FROM `*PREFIX*preferences` WHERE `userid` = ?');
+ $query->execute(array('Someuser'));
+ $query->execute(array('Anotheruser'));
+ $query->execute(array('Anuser'));
+ }
+ public function testGetUsers() {
$query = \OC_DB::prepare('SELECT DISTINCT `userid` FROM `*PREFIX*preferences`');
$result = $query->execute();
$expected = array();
diff --git a/tests/lib/vobject.php b/tests/lib/vobject.php
index f28d22a1fcd..db5b0f99f06 100644
--- a/tests/lib/vobject.php
+++ b/tests/lib/vobject.php
@@ -35,4 +35,4 @@ class Test_VObject extends PHPUnit_Framework_TestCase {
$parts = $property->getParts();
$this->assertEquals('Marketing;Sales', $parts[2]);
}
-} \ No newline at end of file
+}