summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--3rdparty/MDB2/Driver/Reverse/oci8.php48
-rw-r--r--3rdparty/MDB2/Driver/oci8.php53
-rw-r--r--AUTHORS3
-rw-r--r--apps/files/ajax/delete.php6
-rw-r--r--apps/files/ajax/newfile.php2
-rw-r--r--apps/files/ajax/upload.php2
-rw-r--r--apps/files/css/files.css14
-rw-r--r--apps/files/js/fileactions.js1
-rw-r--r--apps/files/js/filelist.js59
-rw-r--r--apps/files/js/files.js23
-rw-r--r--apps/files/l10n/ca.php4
-rw-r--r--apps/files/l10n/cs_CZ.php4
-rw-r--r--apps/files/l10n/da.php4
-rw-r--r--apps/files/l10n/de.php9
-rw-r--r--apps/files/l10n/el.php25
-rw-r--r--apps/files/l10n/eo.php5
-rw-r--r--apps/files/l10n/es.php4
-rw-r--r--apps/files/l10n/et_EE.php5
-rw-r--r--apps/files/l10n/eu.php7
-rw-r--r--apps/files/l10n/fr.php3
-rw-r--r--apps/files/l10n/gl.php7
-rw-r--r--apps/files/l10n/he.php1
-rw-r--r--apps/files/l10n/it.php4
-rw-r--r--apps/files/l10n/ja_JP.php5
-rw-r--r--apps/files/l10n/nb_NO.php1
-rw-r--r--apps/files/l10n/nl.php3
-rw-r--r--apps/files/l10n/pl.php4
-rw-r--r--apps/files/l10n/ro.php24
-rw-r--r--apps/files/l10n/ru.php4
-rw-r--r--apps/files/l10n/ru_RU.php56
-rw-r--r--apps/files/l10n/sk_SK.php20
-rw-r--r--apps/files/l10n/sl.php4
-rw-r--r--apps/files/l10n/sv.php4
-rw-r--r--apps/files/l10n/th_TH.php4
-rw-r--r--apps/files/l10n/vi.php25
-rw-r--r--apps/files/l10n/zh_CN.GB2312.php7
-rw-r--r--apps/files/l10n/zh_CN.php4
-rw-r--r--apps/files/templates/index.php4
-rw-r--r--apps/files_encryption/l10n/da.php6
-rw-r--r--apps/files_encryption/l10n/gl.php6
-rw-r--r--apps/files_encryption/l10n/ro.php6
-rw-r--r--apps/files_encryption/l10n/ru_RU.php6
-rw-r--r--apps/files_encryption/l10n/vi.php6
-rw-r--r--apps/files_encryption/l10n/zh_CN.GB2312.php6
-rw-r--r--apps/files_encryption/l10n/zh_CN.php1
-rw-r--r--apps/files_external/ajax/addRootCertificate.php26
-rw-r--r--apps/files_external/js/dropbox.js1
-rw-r--r--apps/files_external/l10n/el.php12
-rw-r--r--apps/files_external/l10n/et_EE.php8
-rw-r--r--apps/files_external/l10n/eu.php1
-rw-r--r--apps/files_external/l10n/gl.php18
-rw-r--r--apps/files_external/l10n/ro.php18
-rw-r--r--apps/files_external/l10n/ru_RU.php18
-rw-r--r--apps/files_external/l10n/uk.php5
-rw-r--r--apps/files_external/l10n/vi.php18
-rw-r--r--apps/files_external/l10n/zh_CN.GB2312.php18
-rwxr-xr-xapps/files_external/lib/config.php1
-rw-r--r--apps/files_external/settings.php2
-rw-r--r--apps/files_sharing/appinfo/update.php65
-rw-r--r--apps/files_sharing/appinfo/version2
-rw-r--r--apps/files_sharing/css/public.css7
-rw-r--r--apps/files_sharing/js/public.js17
-rw-r--r--apps/files_sharing/l10n/da.php7
-rw-r--r--apps/files_sharing/l10n/de.php2
-rw-r--r--apps/files_sharing/l10n/el.php5
-rw-r--r--apps/files_sharing/l10n/eo.php5
-rw-r--r--apps/files_sharing/l10n/et_EE.php6
-rw-r--r--apps/files_sharing/l10n/gl.php7
-rw-r--r--apps/files_sharing/l10n/ro.php7
-rw-r--r--apps/files_sharing/l10n/ru.php1
-rw-r--r--apps/files_sharing/l10n/ru_RU.php7
-rw-r--r--apps/files_sharing/l10n/uk.php4
-rw-r--r--apps/files_sharing/l10n/vi.php7
-rw-r--r--apps/files_sharing/l10n/zh_CN.GB2312.php7
-rw-r--r--apps/files_sharing/l10n/zh_TW.php6
-rw-r--r--apps/files_sharing/lib/share/file.php14
-rw-r--r--apps/files_sharing/lib/share/folder.php22
-rw-r--r--apps/files_sharing/public.php102
-rw-r--r--[-rwxr-xr-x]apps/files_sharing/templates/public.php34
-rw-r--r--apps/files_versions/js/versions.js67
-rw-r--r--apps/files_versions/l10n/ca.php3
-rw-r--r--apps/files_versions/l10n/cs_CZ.php3
-rw-r--r--apps/files_versions/l10n/da.php5
-rw-r--r--apps/files_versions/l10n/de.php4
-rw-r--r--apps/files_versions/l10n/el.php5
-rw-r--r--apps/files_versions/l10n/eo.php3
-rw-r--r--apps/files_versions/l10n/es.php3
-rw-r--r--apps/files_versions/l10n/et_EE.php3
-rw-r--r--apps/files_versions/l10n/eu.php3
-rw-r--r--apps/files_versions/l10n/fa.php3
-rw-r--r--apps/files_versions/l10n/fi_FI.php3
-rw-r--r--apps/files_versions/l10n/fr.php3
-rw-r--r--apps/files_versions/l10n/gl.php7
-rw-r--r--apps/files_versions/l10n/he.php3
-rw-r--r--apps/files_versions/l10n/it.php3
-rw-r--r--apps/files_versions/l10n/ja_JP.php3
-rw-r--r--apps/files_versions/l10n/lt_LT.php3
-rw-r--r--apps/files_versions/l10n/nl.php3
-rw-r--r--apps/files_versions/l10n/pl.php3
-rw-r--r--apps/files_versions/l10n/pt_BR.php3
-rw-r--r--apps/files_versions/l10n/ro.php7
-rw-r--r--apps/files_versions/l10n/ru.php3
-rw-r--r--apps/files_versions/l10n/ru_RU.php6
-rw-r--r--apps/files_versions/l10n/sl.php3
-rw-r--r--apps/files_versions/l10n/sv.php3
-rw-r--r--apps/files_versions/l10n/th_TH.php3
-rw-r--r--apps/files_versions/l10n/vi.php5
-rw-r--r--apps/files_versions/l10n/zh_CN.GB2312.php7
-rw-r--r--apps/files_versions/l10n/zh_CN.php3
-rw-r--r--apps/files_versions/lib/versions.php114
-rw-r--r--apps/files_versions/templates/settings.php3
-rw-r--r--apps/user_ldap/l10n/de.php2
-rw-r--r--apps/user_ldap/l10n/el.php11
-rw-r--r--apps/user_ldap/l10n/et_EE.php22
-rw-r--r--apps/user_ldap/l10n/ru_RU.php22
-rw-r--r--apps/user_ldap/l10n/uk.php4
-rw-r--r--apps/user_ldap/l10n/vi.php13
-rw-r--r--apps/user_ldap/l10n/zh_CN.GB2312.php37
-rw-r--r--apps/user_ldap/l10n/zh_CN.php9
-rw-r--r--apps/user_ldap/lib/access.php59
-rw-r--r--apps/user_ldap/lib/connection.php4
-rw-r--r--apps/user_ldap/lib/jobs.php2
-rw-r--r--core/ajax/share.php44
-rw-r--r--core/css/share.css4
-rw-r--r--core/css/styles.css9
-rw-r--r--core/img/actions/clock.pngbin0 -> 466 bytes
-rwxr-xr-xcore/img/actions/clock.svg20
-rw-r--r--core/img/actions/lock.pngbin0 -> 346 bytes
-rwxr-xr-xcore/img/actions/lock.svg8
-rw-r--r--core/js/js.js49
-rw-r--r--core/js/oc-dialogs.js14
-rw-r--r--core/js/share.js207
-rw-r--r--core/l10n/ar.php2
-rw-r--r--core/l10n/bg_BG.php2
-rw-r--r--core/l10n/ca.php2
-rw-r--r--core/l10n/cs_CZ.php2
-rw-r--r--core/l10n/da.php2
-rw-r--r--core/l10n/de.php14
-rw-r--r--core/l10n/el.php3
-rw-r--r--core/l10n/eo.php3
-rw-r--r--core/l10n/es.php2
-rw-r--r--core/l10n/et_EE.php2
-rw-r--r--core/l10n/eu.php3
-rw-r--r--core/l10n/fa.php2
-rw-r--r--core/l10n/fi_FI.php2
-rw-r--r--core/l10n/fr.php2
-rw-r--r--core/l10n/gl.php2
-rw-r--r--core/l10n/he.php3
-rw-r--r--core/l10n/hi.php2
-rw-r--r--core/l10n/hr.php2
-rw-r--r--core/l10n/hu_HU.php2
-rw-r--r--core/l10n/ia.php2
-rw-r--r--core/l10n/id.php2
-rw-r--r--core/l10n/it.php2
-rw-r--r--core/l10n/ja_JP.php2
-rw-r--r--core/l10n/ko.php2
-rw-r--r--core/l10n/lb.php2
-rw-r--r--core/l10n/lt_LT.php2
-rw-r--r--core/l10n/lv.php2
-rw-r--r--core/l10n/mk.php2
-rw-r--r--core/l10n/ms_MY.php2
-rw-r--r--core/l10n/nb_NO.php2
-rw-r--r--core/l10n/nl.php2
-rw-r--r--core/l10n/nn_NO.php2
-rw-r--r--core/l10n/pl.php2
-rw-r--r--core/l10n/pt_BR.php2
-rw-r--r--core/l10n/pt_PT.php2
-rw-r--r--core/l10n/ro.php21
-rw-r--r--core/l10n/ru.php3
-rw-r--r--core/l10n/ru_RU.php64
-rw-r--r--core/l10n/sk_SK.php4
-rw-r--r--core/l10n/sl.php2
-rw-r--r--core/l10n/sr.php2
-rw-r--r--core/l10n/sr@latin.php2
-rw-r--r--core/l10n/sv.php2
-rw-r--r--core/l10n/th_TH.php2
-rw-r--r--core/l10n/tr.php2
-rw-r--r--core/l10n/uk.php19
-rw-r--r--core/l10n/vi.php2
-rw-r--r--core/l10n/zh_CN.GB2312.php3
-rw-r--r--core/l10n/zh_CN.php2
-rw-r--r--core/l10n/zh_TW.php2
-rw-r--r--core/templates/layout.user.php2
-rw-r--r--db_structure.xml1321
-rw-r--r--l10n/af/core.po144
-rw-r--r--l10n/af/files.po76
-rw-r--r--l10n/af/files_sharing.po22
-rw-r--r--l10n/af/files_versions.po16
-rw-r--r--l10n/af/settings.po67
-rw-r--r--l10n/ar/core.po144
-rw-r--r--l10n/ar/files.po76
-rw-r--r--l10n/ar/files_sharing.po22
-rw-r--r--l10n/ar/files_versions.po16
-rw-r--r--l10n/ar/settings.po71
-rw-r--r--l10n/ar_SA/core.po144
-rw-r--r--l10n/ar_SA/files.po76
-rw-r--r--l10n/ar_SA/files_sharing.po22
-rw-r--r--l10n/ar_SA/files_versions.po16
-rw-r--r--l10n/ar_SA/settings.po67
-rw-r--r--l10n/bg_BG/core.po144
-rw-r--r--l10n/bg_BG/files.po76
-rw-r--r--l10n/bg_BG/files_sharing.po22
-rw-r--r--l10n/bg_BG/files_versions.po16
-rw-r--r--l10n/bg_BG/settings.po71
-rw-r--r--l10n/ca/core.po144
-rw-r--r--l10n/ca/files.po73
-rw-r--r--l10n/ca/files_sharing.po24
-rw-r--r--l10n/ca/files_versions.po19
-rw-r--r--l10n/ca/settings.po82
-rw-r--r--l10n/cs_CZ/core.po144
-rw-r--r--l10n/cs_CZ/files.po72
-rw-r--r--l10n/cs_CZ/files_sharing.po22
-rw-r--r--l10n/cs_CZ/files_versions.po18
-rw-r--r--l10n/cs_CZ/settings.po77
-rw-r--r--l10n/da/core.po144
-rw-r--r--l10n/da/files.po81
-rw-r--r--l10n/da/files_encryption.po17
-rw-r--r--l10n/da/files_sharing.po31
-rw-r--r--l10n/da/files_versions.po21
-rw-r--r--l10n/da/lib.po45
-rw-r--r--l10n/da/settings.po79
-rw-r--r--l10n/de/core.po147
-rw-r--r--l10n/de/files.po78
-rw-r--r--l10n/de/files_sharing.po24
-rw-r--r--l10n/de/files_versions.po21
-rw-r--r--l10n/de/lib.po42
-rw-r--r--l10n/de/settings.po79
-rw-r--r--l10n/de/user_ldap.po8
-rw-r--r--l10n/el/core.po147
-rw-r--r--l10n/el/files.po104
-rw-r--r--l10n/el/files_external.po27
-rw-r--r--l10n/el/files_sharing.po29
-rw-r--r--l10n/el/files_versions.po23
-rw-r--r--l10n/el/lib.po48
-rw-r--r--l10n/el/settings.po132
-rw-r--r--l10n/el/user_ldap.po31
-rw-r--r--l10n/eo/core.po146
-rw-r--r--l10n/eo/files.po82
-rw-r--r--l10n/eo/files_sharing.po28
-rw-r--r--l10n/eo/files_versions.po22
-rw-r--r--l10n/eo/lib.po46
-rw-r--r--l10n/eo/settings.po77
-rw-r--r--l10n/es/core.po144
-rw-r--r--l10n/es/files.po75
-rw-r--r--l10n/es/files_sharing.po24
-rw-r--r--l10n/es/files_versions.po20
-rw-r--r--l10n/es/settings.po82
-rw-r--r--l10n/et_EE/core.po144
-rw-r--r--l10n/et_EE/files.po84
-rw-r--r--l10n/et_EE/files_external.po18
-rw-r--r--l10n/et_EE/files_sharing.po30
-rw-r--r--l10n/et_EE/files_versions.po22
-rw-r--r--l10n/et_EE/lib.po46
-rw-r--r--l10n/et_EE/settings.po107
-rw-r--r--l10n/et_EE/user_ldap.po52
-rw-r--r--l10n/eu/core.po146
-rw-r--r--l10n/eu/files.po82
-rw-r--r--l10n/eu/files_external.po8
-rw-r--r--l10n/eu/files_sharing.po22
-rw-r--r--l10n/eu/files_versions.po18
-rw-r--r--l10n/eu/settings.po95
-rw-r--r--l10n/eu_ES/core.po144
-rw-r--r--l10n/eu_ES/files.po76
-rw-r--r--l10n/eu_ES/files_sharing.po22
-rw-r--r--l10n/eu_ES/files_versions.po16
-rw-r--r--l10n/eu_ES/settings.po67
-rw-r--r--l10n/fa/core.po144
-rw-r--r--l10n/fa/files.po76
-rw-r--r--l10n/fa/files_sharing.po22
-rw-r--r--l10n/fa/files_versions.po18
-rw-r--r--l10n/fa/settings.po71
-rw-r--r--l10n/fi/core.po144
-rw-r--r--l10n/fi/files.po76
-rw-r--r--l10n/fi/files_sharing.po22
-rw-r--r--l10n/fi/files_versions.po16
-rw-r--r--l10n/fi/settings.po67
-rw-r--r--l10n/fi_FI/core.po144
-rw-r--r--l10n/fi_FI/files.po72
-rw-r--r--l10n/fi_FI/files_sharing.po22
-rw-r--r--l10n/fi_FI/files_versions.po20
-rw-r--r--l10n/fi_FI/settings.po81
-rw-r--r--l10n/fr/core.po144
-rw-r--r--l10n/fr/files.po78
-rw-r--r--l10n/fr/files_sharing.po24
-rw-r--r--l10n/fr/files_versions.po20
-rw-r--r--l10n/fr/settings.po84
-rw-r--r--l10n/gl/core.po144
-rw-r--r--l10n/gl/files.po82
-rw-r--r--l10n/gl/files_encryption.po17
-rw-r--r--l10n/gl/files_external.po41
-rw-r--r--l10n/gl/files_sharing.po31
-rw-r--r--l10n/gl/files_versions.po23
-rw-r--r--l10n/gl/lib.po93
-rw-r--r--l10n/gl/settings.po77
-rw-r--r--l10n/he/core.po147
-rw-r--r--l10n/he/files.po79
-rw-r--r--l10n/he/files_sharing.po22
-rw-r--r--l10n/he/files_versions.po18
-rw-r--r--l10n/he/settings.po71
-rw-r--r--l10n/hi/core.po144
-rw-r--r--l10n/hi/files.po76
-rw-r--r--l10n/hi/files_sharing.po22
-rw-r--r--l10n/hi/files_versions.po16
-rw-r--r--l10n/hi/settings.po67
-rw-r--r--l10n/hr/core.po144
-rw-r--r--l10n/hr/files.po76
-rw-r--r--l10n/hr/files_sharing.po22
-rw-r--r--l10n/hr/files_versions.po16
-rw-r--r--l10n/hr/settings.po75
-rw-r--r--l10n/hu_HU/core.po144
-rw-r--r--l10n/hu_HU/files.po76
-rw-r--r--l10n/hu_HU/files_sharing.po22
-rw-r--r--l10n/hu_HU/files_versions.po16
-rw-r--r--l10n/hu_HU/settings.po71
-rw-r--r--l10n/hy/core.po144
-rw-r--r--l10n/hy/files.po76
-rw-r--r--l10n/hy/files_sharing.po22
-rw-r--r--l10n/hy/files_versions.po16
-rw-r--r--l10n/hy/settings.po67
-rw-r--r--l10n/ia/core.po144
-rw-r--r--l10n/ia/files.po76
-rw-r--r--l10n/ia/files_sharing.po22
-rw-r--r--l10n/ia/files_versions.po16
-rw-r--r--l10n/ia/settings.po71
-rw-r--r--l10n/id/core.po144
-rw-r--r--l10n/id/files.po76
-rw-r--r--l10n/id/files_sharing.po22
-rw-r--r--l10n/id/files_versions.po16
-rw-r--r--l10n/id/settings.po71
-rw-r--r--l10n/id_ID/core.po144
-rw-r--r--l10n/id_ID/files.po76
-rw-r--r--l10n/id_ID/files_sharing.po22
-rw-r--r--l10n/id_ID/files_versions.po16
-rw-r--r--l10n/id_ID/settings.po67
-rw-r--r--l10n/it/core.po146
-rw-r--r--l10n/it/files.po72
-rw-r--r--l10n/it/files_sharing.po24
-rw-r--r--l10n/it/files_versions.po20
-rw-r--r--l10n/it/settings.po79
-rw-r--r--l10n/ja_JP/core.po144
-rw-r--r--l10n/ja_JP/files.po78
-rw-r--r--l10n/ja_JP/files_sharing.po24
-rw-r--r--l10n/ja_JP/files_versions.po18
-rw-r--r--l10n/ja_JP/settings.po79
-rw-r--r--l10n/ko/core.po144
-rw-r--r--l10n/ko/files.po76
-rw-r--r--l10n/ko/files_sharing.po22
-rw-r--r--l10n/ko/files_versions.po16
-rw-r--r--l10n/ko/settings.po77
-rw-r--r--l10n/lb/core.po144
-rw-r--r--l10n/lb/files.po76
-rw-r--r--l10n/lb/files_sharing.po22
-rw-r--r--l10n/lb/files_versions.po16
-rw-r--r--l10n/lb/settings.po77
-rw-r--r--l10n/lt_LT/core.po144
-rw-r--r--l10n/lt_LT/files.po76
-rw-r--r--l10n/lt_LT/files_sharing.po22
-rw-r--r--l10n/lt_LT/files_versions.po18
-rw-r--r--l10n/lt_LT/settings.po73
-rw-r--r--l10n/lv/core.po144
-rw-r--r--l10n/lv/files.po76
-rw-r--r--l10n/lv/files_sharing.po22
-rw-r--r--l10n/lv/files_versions.po16
-rw-r--r--l10n/lv/settings.po71
-rw-r--r--l10n/mk/core.po144
-rw-r--r--l10n/mk/files.po76
-rw-r--r--l10n/mk/files_sharing.po22
-rw-r--r--l10n/mk/files_versions.po16
-rw-r--r--l10n/mk/settings.po71
-rw-r--r--l10n/ms_MY/core.po144
-rw-r--r--l10n/ms_MY/files.po76
-rw-r--r--l10n/ms_MY/files_sharing.po22
-rw-r--r--l10n/ms_MY/files_versions.po16
-rw-r--r--l10n/ms_MY/settings.po71
-rw-r--r--l10n/nb_NO/core.po144
-rw-r--r--l10n/nb_NO/files.po79
-rw-r--r--l10n/nb_NO/files_sharing.po22
-rw-r--r--l10n/nb_NO/files_versions.po18
-rw-r--r--l10n/nb_NO/settings.po77
-rw-r--r--l10n/nl/core.po144
-rw-r--r--l10n/nl/files.po78
-rw-r--r--l10n/nl/files_sharing.po22
-rw-r--r--l10n/nl/files_versions.po20
-rw-r--r--l10n/nl/settings.po84
-rw-r--r--l10n/nn_NO/core.po144
-rw-r--r--l10n/nn_NO/files.po76
-rw-r--r--l10n/nn_NO/files_sharing.po22
-rw-r--r--l10n/nn_NO/files_versions.po16
-rw-r--r--l10n/nn_NO/settings.po71
-rw-r--r--l10n/oc/core.po368
-rw-r--r--l10n/oc/files.po251
-rw-r--r--l10n/oc/files_encryption.po34
-rw-r--r--l10n/oc/files_external.po82
-rw-r--r--l10n/oc/files_sharing.po48
-rw-r--r--l10n/oc/files_versions.po42
-rw-r--r--l10n/oc/lib.po125
-rw-r--r--l10n/oc/settings.po317
-rw-r--r--l10n/oc/user_ldap.po170
-rw-r--r--l10n/pl/core.po144
-rw-r--r--l10n/pl/files.po73
-rw-r--r--l10n/pl/files_sharing.po22
-rw-r--r--l10n/pl/files_versions.po19
-rw-r--r--l10n/pl/settings.po82
-rw-r--r--l10n/pl_PL/core.po144
-rw-r--r--l10n/pl_PL/files.po76
-rw-r--r--l10n/pl_PL/files_sharing.po22
-rw-r--r--l10n/pl_PL/files_versions.po16
-rw-r--r--l10n/pl_PL/settings.po67
-rw-r--r--l10n/pt_BR/core.po144
-rw-r--r--l10n/pt_BR/files.po76
-rw-r--r--l10n/pt_BR/files_sharing.po22
-rw-r--r--l10n/pt_BR/files_versions.po18
-rw-r--r--l10n/pt_BR/settings.po75
-rw-r--r--l10n/pt_PT/core.po144
-rw-r--r--l10n/pt_PT/files.po76
-rw-r--r--l10n/pt_PT/files_sharing.po22
-rw-r--r--l10n/pt_PT/files_versions.po16
-rw-r--r--l10n/pt_PT/settings.po77
-rw-r--r--l10n/ro/core.po179
-rw-r--r--l10n/ro/files.po117
-rw-r--r--l10n/ro/files_encryption.po17
-rw-r--r--l10n/ro/files_external.po41
-rw-r--r--l10n/ro/files_sharing.po31
-rw-r--r--l10n/ro/files_versions.po23
-rw-r--r--l10n/ro/lib.po93
-rw-r--r--l10n/ro/settings.po116
-rw-r--r--l10n/ru/core.po147
-rw-r--r--l10n/ru/files.po81
-rw-r--r--l10n/ru/files_sharing.po25
-rw-r--r--l10n/ru/files_versions.po23
-rw-r--r--l10n/ru/lib.po45
-rw-r--r--l10n/ru/settings.po112
-rw-r--r--l10n/ru_RU/core.po263
-rw-r--r--l10n/ru_RU/files.po177
-rw-r--r--l10n/ru_RU/files_encryption.po17
-rw-r--r--l10n/ru_RU/files_external.po41
-rw-r--r--l10n/ru_RU/files_sharing.po31
-rw-r--r--l10n/ru_RU/files_versions.po23
-rw-r--r--l10n/ru_RU/lib.po91
-rw-r--r--l10n/ru_RU/settings.po198
-rw-r--r--l10n/ru_RU/user_ldap.po49
-rw-r--r--l10n/sk_SK/core.po147
-rw-r--r--l10n/sk_SK/files.po103
-rw-r--r--l10n/sk_SK/files_sharing.po22
-rw-r--r--l10n/sk_SK/files_versions.po16
-rw-r--r--l10n/sk_SK/lib.po95
-rw-r--r--l10n/sk_SK/settings.po112
-rw-r--r--l10n/sl/core.po144
-rw-r--r--l10n/sl/files.po72
-rw-r--r--l10n/sl/files_sharing.po24
-rw-r--r--l10n/sl/files_versions.po20
-rw-r--r--l10n/sl/lib.po44
-rw-r--r--l10n/sl/settings.po85
-rw-r--r--l10n/so/core.po144
-rw-r--r--l10n/so/files.po76
-rw-r--r--l10n/so/files_sharing.po22
-rw-r--r--l10n/so/files_versions.po16
-rw-r--r--l10n/so/settings.po67
-rw-r--r--l10n/sr/core.po144
-rw-r--r--l10n/sr/files.po76
-rw-r--r--l10n/sr/files_sharing.po22
-rw-r--r--l10n/sr/files_versions.po16
-rw-r--r--l10n/sr/settings.po71
-rw-r--r--l10n/sr@latin/core.po144
-rw-r--r--l10n/sr@latin/files.po76
-rw-r--r--l10n/sr@latin/files_sharing.po22
-rw-r--r--l10n/sr@latin/files_versions.po16
-rw-r--r--l10n/sr@latin/settings.po71
-rw-r--r--l10n/sv/core.po144
-rw-r--r--l10n/sv/files.po72
-rw-r--r--l10n/sv/files_sharing.po24
-rw-r--r--l10n/sv/files_versions.po20
-rw-r--r--l10n/sv/settings.po77
-rw-r--r--l10n/templates/core.pot142
-rw-r--r--l10n/templates/files.pot68
-rw-r--r--l10n/templates/files_encryption.pot2
-rw-r--r--l10n/templates/files_external.pot2
-rw-r--r--l10n/templates/files_sharing.pot18
-rw-r--r--l10n/templates/files_versions.pot12
-rw-r--r--l10n/templates/lib.pot22
-rw-r--r--l10n/templates/settings.pot65
-rw-r--r--l10n/templates/user_ldap.pot2
-rw-r--r--l10n/th_TH/core.po144
-rw-r--r--l10n/th_TH/files.po72
-rw-r--r--l10n/th_TH/files_sharing.po24
-rw-r--r--l10n/th_TH/files_versions.po20
-rw-r--r--l10n/th_TH/settings.po79
-rw-r--r--l10n/tr/core.po144
-rw-r--r--l10n/tr/files.po76
-rw-r--r--l10n/tr/files_sharing.po22
-rw-r--r--l10n/tr/files_versions.po16
-rw-r--r--l10n/tr/settings.po71
-rw-r--r--l10n/uk/core.po175
-rw-r--r--l10n/uk/files.po76
-rw-r--r--l10n/uk/files_external.po15
-rw-r--r--l10n/uk/files_sharing.po27
-rw-r--r--l10n/uk/files_versions.po16
-rw-r--r--l10n/uk/lib.po43
-rw-r--r--l10n/uk/settings.po71
-rw-r--r--l10n/uk/user_ldap.po13
-rw-r--r--l10n/vi/core.po144
-rw-r--r--l10n/vi/files.po121
-rw-r--r--l10n/vi/files_encryption.po17
-rw-r--r--l10n/vi/files_external.po41
-rw-r--r--l10n/vi/files_sharing.po31
-rw-r--r--l10n/vi/files_versions.po21
-rw-r--r--l10n/vi/lib.po93
-rw-r--r--l10n/vi/settings.po108
-rw-r--r--l10n/vi/user_ldap.po31
-rw-r--r--l10n/zh_CN.GB2312/core.po147
-rw-r--r--l10n/zh_CN.GB2312/files.po83
-rw-r--r--l10n/zh_CN.GB2312/files_encryption.po17
-rw-r--r--l10n/zh_CN.GB2312/files_external.po41
-rw-r--r--l10n/zh_CN.GB2312/files_sharing.po31
-rw-r--r--l10n/zh_CN.GB2312/files_versions.po23
-rw-r--r--l10n/zh_CN.GB2312/lib.po93
-rw-r--r--l10n/zh_CN.GB2312/settings.po118
-rw-r--r--l10n/zh_CN.GB2312/user_ldap.po79
-rw-r--r--l10n/zh_CN/core.po146
-rw-r--r--l10n/zh_CN/files.po72
-rw-r--r--l10n/zh_CN/files_encryption.po6
-rw-r--r--l10n/zh_CN/files_sharing.po22
-rw-r--r--l10n/zh_CN/files_versions.po18
-rw-r--r--l10n/zh_CN/settings.po81
-rw-r--r--l10n/zh_CN/user_ldap.po23
-rw-r--r--l10n/zh_TW/core.po144
-rw-r--r--l10n/zh_TW/files.po76
-rw-r--r--l10n/zh_TW/files_sharing.po29
-rw-r--r--l10n/zh_TW/files_versions.po16
-rw-r--r--l10n/zh_TW/settings.po98
-rwxr-xr-xlib/app.php96
-rw-r--r--lib/archive/tar.php66
-rw-r--r--lib/archive/zip.php30
-rw-r--r--lib/base.php8
-rw-r--r--lib/cache/file.php2
-rw-r--r--lib/cache/xcache.php4
-rw-r--r--lib/connector/sabre/auth.php2
-rw-r--r--lib/connector/sabre/directory.php23
-rw-r--r--lib/connector/sabre/node.php2
-rw-r--r--lib/connector/sabre/principal.php12
-rw-r--r--lib/db.php35
-rw-r--r--lib/filecache.php2
-rw-r--r--lib/filecache/cached.php21
-rw-r--r--lib/filecache/update.php52
-rw-r--r--lib/filechunking.php58
-rw-r--r--lib/fileproxy/quota.php8
-rw-r--r--lib/files.php29
-rw-r--r--lib/files/storage/local.php2
-rw-r--r--lib/filesystem.php3
-rw-r--r--lib/filesystemview.php156
-rw-r--r--lib/helper.php9
-rw-r--r--lib/image.php38
-rw-r--r--lib/l10n/da.php4
-rw-r--r--lib/l10n/de.php4
-rw-r--r--lib/l10n/el.php7
-rw-r--r--lib/l10n/eo.php5
-rw-r--r--lib/l10n/et_EE.php5
-rw-r--r--lib/l10n/gl.php28
-rw-r--r--lib/l10n/ro.php28
-rw-r--r--lib/l10n/ru.php2
-rw-r--r--lib/l10n/ru_RU.php27
-rw-r--r--lib/l10n/sk_SK.php25
-rw-r--r--lib/l10n/sl.php6
-rw-r--r--lib/l10n/uk.php3
-rw-r--r--lib/l10n/vi.php28
-rw-r--r--lib/l10n/zh_CN.GB2312.php28
-rw-r--r--lib/migrate.php14
-rw-r--r--lib/migration/content.php19
-rw-r--r--lib/ocs.php170
-rw-r--r--lib/ocsclient.php2
-rw-r--r--lib/public/app.php169
-rw-r--r--lib/public/config.php103
-rw-r--r--lib/public/db.php9
-rw-r--r--lib/public/files.php23
-rw-r--r--lib/public/json.php2
-rw-r--r--lib/public/response.php10
-rw-r--r--lib/public/share.php170
-rw-r--r--lib/public/user.php38
-rw-r--r--lib/public/util.php33
-rw-r--r--lib/setup.php388
-rw-r--r--lib/template.php3
-rw-r--r--lib/templatelayout.php2
-rw-r--r--lib/user.php43
-rw-r--r--lib/user/database.php2
-rwxr-xr-xlib/util.php24
-rw-r--r--lib/vcategories.php5
-rw-r--r--search/js/result.js2
-rw-r--r--settings/ajax/apps/ocs.php3
-rw-r--r--settings/ajax/enableapp.php3
-rw-r--r--settings/apps.php99
-rw-r--r--settings/css/settings.css2
-rw-r--r--settings/js/apps.js14
-rw-r--r--settings/l10n/ar.php3
-rw-r--r--settings/l10n/bg_BG.php3
-rw-r--r--settings/l10n/ca.php15
-rw-r--r--settings/l10n/cs_CZ.php15
-rw-r--r--settings/l10n/da.php8
-rw-r--r--settings/l10n/de.php17
-rw-r--r--settings/l10n/el.php45
-rw-r--r--settings/l10n/eo.php7
-rw-r--r--settings/l10n/es.php12
-rw-r--r--settings/l10n/et_EE.php22
-rw-r--r--settings/l10n/eu.php22
-rw-r--r--settings/l10n/fa.php4
-rw-r--r--settings/l10n/fi_FI.php12
-rw-r--r--settings/l10n/fr.php10
-rw-r--r--settings/l10n/gl.php7
-rw-r--r--settings/l10n/he.php3
-rw-r--r--settings/l10n/hr.php6
-rw-r--r--settings/l10n/hu_HU.php4
-rw-r--r--settings/l10n/ia.php3
-rw-r--r--settings/l10n/id.php3
-rw-r--r--settings/l10n/it.php15
-rw-r--r--settings/l10n/ja_JP.php15
-rw-r--r--settings/l10n/ko.php7
-rw-r--r--settings/l10n/lb.php7
-rw-r--r--settings/l10n/lt_LT.php5
-rw-r--r--settings/l10n/lv.php4
-rw-r--r--settings/l10n/mk.php3
-rw-r--r--settings/l10n/ms_MY.php3
-rw-r--r--settings/l10n/nb_NO.php7
-rw-r--r--settings/l10n/nl.php14
-rw-r--r--settings/l10n/nn_NO.php4
-rw-r--r--settings/l10n/pl.php13
-rw-r--r--settings/l10n/pt_BR.php6
-rw-r--r--settings/l10n/pt_PT.php7
-rw-r--r--settings/l10n/ro.php31
-rw-r--r--settings/l10n/ru.php26
-rw-r--r--settings/l10n/ru_RU.php68
-rw-r--r--settings/l10n/sk_SK.php25
-rw-r--r--settings/l10n/sl.php17
-rw-r--r--settings/l10n/sr.php3
-rw-r--r--settings/l10n/sr@latin.php3
-rw-r--r--settings/l10n/sv.php15
-rw-r--r--settings/l10n/th_TH.php15
-rw-r--r--settings/l10n/tr.php3
-rw-r--r--settings/l10n/uk.php3
-rw-r--r--settings/l10n/vi.php23
-rw-r--r--settings/l10n/zh_CN.GB2312.php29
-rw-r--r--settings/l10n/zh_CN.php13
-rw-r--r--settings/l10n/zh_TW.php18
-rw-r--r--settings/templates/admin.php33
-rw-r--r--settings/templates/apps.php2
-rw-r--r--settings/templates/personal.php4
-rw-r--r--tests/lib/share/share.php8
645 files changed, 20725 insertions, 9293 deletions
diff --git a/3rdparty/MDB2/Driver/Reverse/oci8.php b/3rdparty/MDB2/Driver/Reverse/oci8.php
index c86847fa6b4..d89ad771374 100644
--- a/3rdparty/MDB2/Driver/Reverse/oci8.php
+++ b/3rdparty/MDB2/Driver/Reverse/oci8.php
@@ -84,12 +84,12 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
$owner = $db->dsn['username'];
}
- $query = 'SELECT column_name name,
- data_type "type",
- nullable,
- data_default "default",
- COALESCE(data_precision, data_length) "length",
- data_scale "scale"
+ $query = 'SELECT column_name AS "name",
+ data_type AS "type",
+ nullable AS "nullable",
+ data_default AS "default",
+ COALESCE(data_precision, data_length) AS "length",
+ data_scale AS "scale"
FROM all_tab_columns
WHERE (table_name=? OR table_name=?)
AND (owner=? OR owner=?)
@@ -146,6 +146,10 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
if ($default === 'NULL') {
$default = null;
}
+ //ugly hack, but works for the reverse direction
+ if ($default == "''") {
+ $default = '';
+ }
if ((null === $default) && $notnull) {
$default = '';
}
@@ -221,11 +225,11 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
$owner = $db->dsn['username'];
}
- $query = "SELECT aic.column_name,
- aic.column_position,
- aic.descend,
- aic.table_owner,
- alc.constraint_type
+ $query = 'SELECT aic.column_name AS "column_name",
+ aic.column_position AS "column_position",
+ aic.descend AS "descend",
+ aic.table_owner AS "table_owner",
+ alc.constraint_type AS "constraint_type"
FROM all_ind_columns aic
LEFT JOIN all_constraints alc
ON aic.index_name = alc.constraint_name
@@ -234,7 +238,7 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
WHERE (aic.table_name=? OR aic.table_name=?)
AND (aic.index_name=? OR aic.index_name=?)
AND (aic.table_owner=? OR aic.table_owner=?)
- ORDER BY column_position";
+ ORDER BY column_position';
$stmt = $db->prepare($query);
if (PEAR::isError($stmt)) {
return $stmt;
@@ -331,9 +335,9 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
\'SIMPLE\' "match",
CASE alc.deferrable WHEN \'NOT DEFERRABLE\' THEN 0 ELSE 1 END "deferrable",
CASE alc.deferred WHEN \'IMMEDIATE\' THEN 0 ELSE 1 END "initiallydeferred",
- alc.search_condition,
+ alc.search_condition AS "search_condition",
alc.table_name,
- cols.column_name,
+ cols.column_name AS "column_name",
cols.position,
r_alc.table_name "references_table",
r_cols.column_name "references_field",
@@ -509,14 +513,14 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
return $db;
}
- $query = 'SELECT trigger_name,
- table_name,
- trigger_body,
- trigger_type,
- triggering_event trigger_event,
- description trigger_comment,
- 1 trigger_enabled,
- when_clause
+ $query = 'SELECT trigger_name AS "trigger_name",
+ table_name AS "table_name",
+ trigger_body AS "trigger_body",
+ trigger_type AS "trigger_type",
+ triggering_event AS "trigger_event",
+ description AS "trigger_comment",
+ 1 AS "trigger_enabled",
+ when_clause AS "when_clause"
FROM user_triggers
WHERE trigger_name = \''. strtoupper($trigger).'\'';
$types = array(
diff --git a/3rdparty/MDB2/Driver/oci8.php b/3rdparty/MDB2/Driver/oci8.php
index 9f4137d610c..a1eefc94d15 100644
--- a/3rdparty/MDB2/Driver/oci8.php
+++ b/3rdparty/MDB2/Driver/oci8.php
@@ -634,6 +634,59 @@ class MDB2_Driver_oci8 extends MDB2_Driver_Common
return $query;
}
+ /**
+ * Obtain DBMS specific SQL code portion needed to declare a generic type
+ * field to be used in statement like CREATE TABLE, without the field name
+ * and type values (ie. just the character set, default value, if the
+ * field is permitted to be NULL or not, and the collation options).
+ *
+ * @param array $field associative array with the name of the properties
+ * of the field being declared as array indexes. Currently, the types
+ * of supported field properties are as follows:
+ *
+ * default
+ * Text value to be used as default for this field.
+ * notnull
+ * Boolean flag that indicates whether this field is constrained
+ * to not be set to null.
+ * charset
+ * Text value with the default CHARACTER SET for this field.
+ * collation
+ * Text value with the default COLLATION for this field.
+ * @return string DBMS specific SQL code portion that should be used to
+ * declare the specified field's options.
+ * @access protected
+ */
+ function _getDeclarationOptions($field)
+ {
+ $charset = empty($field['charset']) ? '' :
+ ' '.$this->_getCharsetFieldDeclaration($field['charset']);
+
+ $notnull = empty($field['notnull']) ? ' NULL' : ' NOT NULL';
+ $default = '';
+ if (array_key_exists('default', $field)) {
+ if ($field['default'] === '') {
+ $db = $this->getDBInstance();
+ if (PEAR::isError($db)) {
+ return $db;
+ }
+ $valid_default_values = $this->getValidTypes();
+ $field['default'] = $valid_default_values[$field['type']];
+ if ($field['default'] === '' && ($db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL)) {
+ $field['default'] = ' ';
+ }
+ }
+ if (null !== $field['default']) {
+ $default = ' DEFAULT ' . $this->quote($field['default'], $field['type']);
+ }
+ }
+
+ $collation = empty($field['collation']) ? '' :
+ ' '.$this->_getCollationFieldDeclaration($field['collation']);
+
+ return $charset.$default.$notnull.$collation;
+ }
+
// }}}
// {{{ _doQuery()
diff --git a/AUTHORS b/AUTHORS
index f618df9311d..f79733c2502 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,3 +19,6 @@ With help from many libraries and frameworks including:
SabreDAV
jQuery
+
+"Lock” symbol from thenounproject.com collection
+"Clock” symbol by Brandon Hopkins, from thenounproject.com collection \ No newline at end of file
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index e9bcea18932..57c8c15c197 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -7,15 +7,15 @@ OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
// Get data
-$dir = stripslashes($_GET["dir"]);
-$files = isset($_GET["file"]) ? stripslashes($_GET["file"]) : stripslashes($_GET["files"]);
+$dir = stripslashes($_POST["dir"]);
+$files = isset($_POST["file"]) ? stripslashes($_POST["file"]) : stripslashes($_POST["files"]);
$files = explode(';', $files);
$filesWithError = '';
$success = true;
//Now delete
foreach($files as $file) {
- if( !OC_Files::delete( $dir, $file )) {
+ if( !OC_Files::delete( $dir, $file )) {
$filesWithError .= $file . "\n";
$success = false;
}
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 4619315ce09..495c8212163 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -67,7 +67,7 @@ if($source) {
$result=OC_Filesystem::file_put_contents($target, $sourceStream);
if($result) {
$mime=OC_Filesystem::getMimetype($target);
- $eventSource->send('success', $mime);
+ $eventSource->send('success', array('mime'=>$mime, 'size'=>OC_Filesystem::filesize($target)));
} else {
$eventSource->send('error', "Error while downloading ".$source. ' to '.$target);
}
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 7709becc6a8..fb3e277a215 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -49,7 +49,7 @@ if(strpos($dir, '..') === false) {
for($i=0;$i<$fileCount;$i++) {
$target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
- $meta=OC_FileCache_Cached::get($target);
+ $meta = OC_FileCache::get($target);
$result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'],'name'=>basename($target));
}
}
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index bdd35285e79..566ae39f92c 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -12,14 +12,15 @@
.file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .5em; padding-left:2em; }
.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin:0;}
.file_upload_wrapper .file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; }
-#new { float:left; border-top-right-radius:0; border-bottom-right-radius:0; margin:0 0 0 1em; border-right:none; z-index:1010; height:1.3em; }
+#new { background-color:#5bb75b; float:left; border-top-right-radius:0; border-bottom-right-radius:0; margin:0 0 0 1em; border-right:none; z-index:1010; height:1.3em; }
+#new:hover, a.file_upload_button_wrapper:hover + button.file_upload_filename { background-color:#4b964b; }
#new.active { border-bottom-left-radius:0; border-bottom:none; }
#new>a { padding:.5em 1.2em .3em; color:#fff; text-shadow:0 1px 0 #51a351; }
#new>ul { display:none; position:fixed; text-align:left; padding:.5em; background:#f8f8f8; margin-top:0.075em; border:1px solid #ddd; min-width:7em; margin-left:-.5em; z-index:-1; }
#new>ul>li { margin:.3em; padding-left:2em; background-repeat:no-repeat; cursor:pointer; padding-bottom:0.1em }
#new>ul>li>p { cursor:pointer; }
#new>ul>li>input { padding:0.3em; margin:-0.3em; }
-#new, .file_upload_filename { background:#5bb75b; border:1px solid; border-color:#51a351 #419341 #387038; -moz-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; }
+#new, .file_upload_filename { border:1px solid; border-color:#51a351 #419341 #387038; -moz-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; }
#new .popup { border-top-left-radius:0; }
#file_newfolder_name { background-image:url('%webroot%/core/img/places/folder.svg'); font-weight:normal; width:7em; }
@@ -29,8 +30,7 @@
.file_upload_start { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index:1; position:absolute; left:0; top:0; width:100%; cursor:pointer;}
.file_upload_filename.active { border-bottom-right-radius:0 }
-.file_upload_filename { z-index:100; padding-left: 0.8em; padding-right: 0.8em; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; }
-.file_upload_filename img { position: absolute; top: 0.4em; left: 0.4em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
+.file_upload_filename { background-color:#5bb75b; z-index:100; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; background-image: url('%webroot%/core/img/actions/upload-white.svg'); background-repeat: no-repeat; background-position: center; height: 2.29em; width: 2.5em; }
#upload { position:absolute; right:13.5em; top:0em; }
#upload #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
@@ -47,9 +47,6 @@ tbody a { color:#000; }
span.extension, span.uploading, td.date { color:#999; }
span.extension { text-transform:lowercase; -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; }
tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; color:#777; }
-div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
-div.crumb:first-child { padding-left:1em; }
-div.crumb.last { font-weight:bold; }
table tr.mouseOver td { background-color:#eee; }
table th { height:2em; padding:0 .5em; color:#999; }
table th .name { float:left; margin-left:.5em; }
@@ -90,3 +87,6 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
#navigation>ul>li:first-child+li { padding-top:2.9em; }
#scanning-message{ top:40%; left:40%; position:absolute; display:none; }
+
+div.crumb a{ padding: 0.9em 0 0.7em 0; }
+
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 1403d345e8a..f579d8530ed 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -179,6 +179,7 @@ FileActions.register('all','Delete', OC.PERMISSION_DELETE, function(){return OC.
$('.tipsy').remove();
});
+// t('files', 'Rename')
FileActions.register('all','Rename', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename');},function(filename){
FileList.rename(filename);
});
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 7ebfd4b68bb..261d0d76890 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -145,31 +145,33 @@ var FileList={
if (newname != name) {
if (FileList.checkName(name, newname, false)) {
newname = name;
- } else {
+ } else {
$.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(result) {
if (!result || result.status == 'error') {
OC.dialogs.alert(result.data.message, 'Error moving file');
newname = name;
}
+ tr.data('renaming',false);
});
+
+ }
+
+ tr.attr('data-file', newname);
+ var path = td.children('a.name').attr('href');
+ td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
+ if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
+ var basename=newname.substr(0,newname.lastIndexOf('.'));
+ } else {
+ var basename=newname;
+ }
+ td.children('a.name').empty();
+ var span=$('<span class="nametext"></span>');
+ span.text(basename);
+ td.children('a.name').append(span);
+ if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
+ span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>'));
}
}
- tr.attr('data-file', newname);
- var path = td.children('a.name').attr('href');
- td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
- if (newname.indexOf('.') > 0) {
- var basename=newname.substr(0,newname.lastIndexOf('.'));
- } else {
- var basename=newname;
- }
- td.children('a.name').empty();
- var span=$('<span class="nametext"></span>');
- span.text(basename);
- td.children('a.name').append(span);
- if (newname.indexOf('.') > 0) {
- span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>'));
- }
- tr.data('renaming',false);
return false;
});
input.click(function(event){
@@ -255,21 +257,23 @@ var FileList={
},
do_delete:function(files){
// Finish any existing actions
- if (FileList.lastAction || !FileList.useUndo) {
- if(!FileList.deleteFiles) {
- FileList.prepareDeletion(files);
- }
+ if (FileList.lastAction) {
FileList.lastAction();
- return;
}
+
FileList.prepareDeletion(files);
- // NOTE: Temporary fix to change the text to unshared for files in root of Shared folder
- if ($('#dir').val() == '/Shared') {
- $('#notification').html(t('files', 'unshared')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+
+ if (!FileList.useUndo) {
+ FileList.lastAction();
} else {
- $('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+ // NOTE: Temporary fix to change the text to unshared for files in root of Shared folder
+ if ($('#dir').val() == '/Shared') {
+ $('#notification').html(t('files', 'unshared')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+ } else {
+ $('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+ }
+ $('#notification').fadeIn();
}
- $('#notification').fadeIn();
},
finishDelete:function(ready,sync){
if(!FileList.deleteCanceled && FileList.deleteFiles){
@@ -277,6 +281,7 @@ var FileList={
$.ajax({
url: OC.filePath('files', 'ajax', 'delete.php'),
async:!sync,
+ type:'post',
data: {dir:$('#dir').val(),files:fileNames},
complete: function(data){
boolOperationFinished(data, function(){
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 101e2bad2e4..ec2f159b4ca 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -253,10 +253,10 @@ $(document).ready(function() {
var img = OC.imagePath('core', 'loading.gif');
var tr=$('tr').filterAttr('data-file',dirName);
tr.find('td.filename').attr('style','background-image:url('+img+')');
- uploadtext.text('1 file uploading');
+ uploadtext.text(t('files', '1 file uploading'));
uploadtext.show();
} else {
- uploadtext.text(currentUploads + ' files uploading')
+ uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
}
}
}
@@ -301,7 +301,7 @@ $(document).ready(function() {
uploadtext.text('');
uploadtext.hide();
} else {
- uploadtext.text(currentUploads + ' files uploading')
+ uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
}
})
.error(function(jqXHR, textStatus, errorThrown) {
@@ -316,7 +316,7 @@ $(document).ready(function() {
uploadtext.text('');
uploadtext.hide();
} else {
- uploadtext.text(currentUploads + ' files uploading')
+ uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
}
$('#notification').hide();
$('#notification').text(t('files', 'Upload cancelled.'));
@@ -356,12 +356,13 @@ $(document).ready(function() {
$('#notification').fadeIn();
}
});
- uploadingFiles[files[i].name] = jqXHR;
+ uploadingFiles[uniqueName] = jqXHR;
}
}
}else{
data.submit().success(function(data, status) {
- response = jQuery.parseJSON(data[0].body.innerText);
+ // in safari data is a string
+ response = jQuery.parseJSON(typeof data === 'string' ? data : data[0].body.innerText);
if(response[0] != undefined && response[0].status == 'success') {
var file=response[0];
delete uploadingFiles[file.name];
@@ -556,10 +557,12 @@ $(document).ready(function() {
eventSource.listen('progress',function(progress){
$('#uploadprogressbar').progressbar('value',progress);
});
- eventSource.listen('success',function(mime){
+ eventSource.listen('success',function(data){
+ var mime=data.mime;
+ var size=data.size;
$('#uploadprogressbar').fadeOut();
var date=new Date();
- FileList.addFile(localName,0,date,false,hidden);
+ FileList.addFile(localName,size,date,false,hidden);
var tr=$('tr').filterAttr('data-file',localName);
tr.data('mime',mime);
getMimeIcon(mime,function(path){
@@ -661,7 +664,7 @@ function scanFiles(force,dir){
var scannerEventSource=new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir});
scanFiles.cancel=scannerEventSource.close.bind(scannerEventSource);
scannerEventSource.listen('scanning',function(data){
- $('#scan-count').text(data.count+' files scanned');
+ $('#scan-count').text(data.count + ' ' + t('files', 'files scanned'));
$('#scan-current').text(data.file+'/');
});
scannerEventSource.listen('success',function(success){
@@ -669,7 +672,7 @@ function scanFiles(force,dir){
if(success){
window.location.reload();
}else{
- alert('error while scanning');
+ alert(t('files', 'error while scanning'));
}
});
}
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 336f59ae86d..97eccd5ee4c 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -7,6 +7,7 @@
"Missing a temporary folder" => "S'ha perdut un fitxer temporal",
"Failed to write to disk" => "Ha fallat en escriure al disc",
"Files" => "Fitxers",
+"Unshare" => "Deixa de compartir",
"Delete" => "Suprimeix",
"already exists" => "ja existeix",
"replace" => "substitueix",
@@ -15,6 +16,7 @@
"replaced" => "substituït",
"undo" => "desfés",
"with" => "per",
+"unshared" => "No compartits",
"deleted" => "esborrat",
"generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.",
"Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes",
@@ -23,6 +25,8 @@
"Upload cancelled." => "La pujada s'ha cancel·lat.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
"Invalid name, '/' is not allowed." => "El nom no és vàlid, no es permet '/'.",
+"files scanned" => "arxius escanejats",
+"error while scanning" => "error durant l'escaneig",
"Size" => "Mida",
"Modified" => "Modificat",
"folder" => "carpeta",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index f29df70ee68..fccf651dc34 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -7,6 +7,7 @@
"Missing a temporary folder" => "Chybí adresář pro dočasné soubory",
"Failed to write to disk" => "Zápis na disk selhal",
"Files" => "Soubory",
+"Unshare" => "Zrušit sdílení",
"Delete" => "Smazat",
"already exists" => "již existuje",
"replace" => "nahradit",
@@ -15,6 +16,7 @@
"replaced" => "nahrazeno",
"undo" => "zpět",
"with" => "s",
+"unshared" => "sdílení zrušeno",
"deleted" => "smazáno",
"generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to nějakou dobu trvat.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů",
@@ -23,6 +25,8 @@
"Upload cancelled." => "Odesílání zrušeno.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání.",
"Invalid name, '/' is not allowed." => "Neplatný název, znak '/' není povolen",
+"files scanned" => "soubory prohledány",
+"error while scanning" => "chyba při prohledávání",
"Size" => "Velikost",
"Modified" => "Změněno",
"folder" => "složka",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 020f6142ec6..de0df6a26f0 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -7,13 +7,16 @@
"Missing a temporary folder" => "Mangler en midlertidig mappe",
"Failed to write to disk" => "Fejl ved skrivning til disk.",
"Files" => "Filer",
+"Unshare" => "Fjern deling",
"Delete" => "Slet",
"already exists" => "findes allerede",
"replace" => "erstat",
+"suggest name" => "foreslå navn",
"cancel" => "fortryd",
"replaced" => "erstattet",
"undo" => "fortryd",
"with" => "med",
+"unshared" => "udelt",
"deleted" => "Slettet",
"generating ZIP-file, it may take some time." => "genererer ZIP-fil, det kan tage lidt tid.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom",
@@ -35,6 +38,7 @@
"Enable ZIP-download" => "Muliggør ZIP-download",
"0 is unlimited" => "0 er ubegrænset",
"Maximum input size for ZIP files" => "Maksimal størrelse på ZIP filer",
+"Save" => "Gem",
"New" => "Ny",
"Text file" => "Tekstfil",
"Folder" => "Mappe",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 3db6af8477d..5ef991cbea1 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -7,7 +7,9 @@
"Missing a temporary folder" => "Temporärer Ordner fehlt.",
"Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
"Files" => "Dateien",
+"Unshare" => "Nicht mehr teilen",
"Delete" => "Löschen",
+"Rename" => "Umbenennen",
"already exists" => "ist bereits vorhanden",
"replace" => "ersetzen",
"suggest name" => "Name vorschlagen",
@@ -15,14 +17,17 @@
"replaced" => "ersetzt",
"undo" => "rückgängig machen",
"with" => "mit",
+"unshared" => "Nicht mehr teilen",
"deleted" => "gelöscht",
"generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie ein Verzeichnis ist oder 0 Bytes hat.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis ist oder 0 Bytes hat.",
"Upload Error" => "Fehler beim Hochladen",
"Pending" => "Ausstehend",
"Upload cancelled." => "Hochladen abgebrochen.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
"Invalid name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.",
+"files scanned" => "Dateien gescannt",
+"error while scanning" => "Fehler beim Scannen",
"Size" => "Größe",
"Modified" => "Bearbeitet",
"folder" => "Ordner",
@@ -50,5 +55,5 @@
"Upload too large" => "Upload 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.",
-"Current scanning" => "Scannen"
+"Current scanning" => "Scanne"
);
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 9f311c6b28e..404b580ca16 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -3,24 +3,30 @@
"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Το αρχείο που μεταφορτώθηκε υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"upload_max_filesize\" του php.ini",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Το αρχείο υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"MAX_FILE_SIZE\" που έχει οριστεί στην HTML φόρμα",
"The uploaded file was only partially uploaded" => "Το αρχείο μεταφορώθηκε μόνο εν μέρει",
-"No file was uploaded" => "Το αρχείο δεν μεταφορτώθηκε",
-"Missing a temporary folder" => "Λείπει ένας προσωρινός φάκελος",
-"Failed to write to disk" => "Η εγγραφή στο δίσκο απέτυχε",
+"No file was uploaded" => "Κανένα αρχείο δεν μεταφορτώθηκε",
+"Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος",
+"Failed to write to disk" => "Αποτυχία εγγραφής στο δίσκο",
"Files" => "Αρχεία",
+"Unshare" => "Διακοπή κοινής χρήσης",
"Delete" => "Διαγραφή",
"already exists" => "υπάρχει ήδη",
"replace" => "αντικατέστησε",
+"suggest name" => "συνιστώμενο όνομα",
"cancel" => "ακύρωση",
"replaced" => "αντικαταστάθηκε",
"undo" => "αναίρεση",
"with" => "με",
+"unshared" => "Διακόπηκε ο διαμοιρασμός",
"deleted" => "διαγράφηκε",
"generating ZIP-file, it may take some time." => "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην μεταφόρτωση του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes",
"Upload Error" => "Σφάλμα Μεταφόρτωσης",
-"Pending" => "Εν αναμονή",
+"Pending" => "Εκκρεμεί",
"Upload cancelled." => "Η μεταφόρτωση ακυρώθηκε.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Η μεταφόρτωση του αρχείου βρίσκεται σε εξέλιξη. Έξοδος από την σελίδα τώρα θα ακυρώσει την μεταφόρτωση.",
"Invalid name, '/' is not allowed." => "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται.",
+"files scanned" => "αρχεία σαρώθηκαν",
+"error while scanning" => "σφάλμα κατά την ανίχνευση",
"Size" => "Μέγεθος",
"Modified" => "Τροποποιήθηκε",
"folder" => "φάκελος",
@@ -34,18 +40,19 @@
"Enable ZIP-download" => "Ενεργοποίηση κατεβάσματος ZIP",
"0 is unlimited" => "0 για απεριόριστο",
"Maximum input size for ZIP files" => "Μέγιστο μέγεθος για αρχεία ZIP",
+"Save" => "Αποθήκευση",
"New" => "Νέο",
"Text file" => "Αρχείο κειμένου",
"Folder" => "Φάκελος",
"From url" => "Από την διεύθυνση",
"Upload" => "Μεταφόρτωση",
-"Cancel upload" => "Ακύρωση ανεβάσματος",
+"Cancel upload" => "Ακύρωση μεταφόρτωσης",
"Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!",
"Name" => "Όνομα",
-"Share" => "Διαμοίρασε",
+"Share" => "Διαμοιρασμός",
"Download" => "Λήψη",
-"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." => "Τα αρχεία ανιχνεύονται, παρακαλώ περιμένετε",
+"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" => "Τρέχουσα αναζήτηση "
);
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index bf17b97244c..95df1363ff1 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -7,19 +7,23 @@
"Missing a temporary folder" => "Mankas tempa dosierujo",
"Failed to write to disk" => "Malsukcesis skribo al disko",
"Files" => "Dosieroj",
+"Unshare" => "Malkunhavigi",
"Delete" => "Forigi",
"already exists" => "jam ekzistas",
"replace" => "anstataŭigi",
+"suggest name" => "sugesti nomon",
"cancel" => "nuligi",
"replaced" => "anstataŭigita",
"undo" => "malfari",
"with" => "kun",
+"unshared" => "malkunhavigita",
"deleted" => "forigita",
"generating ZIP-file, it may take some time." => "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo",
"Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
"Upload Error" => "Alŝuta eraro",
"Pending" => "Traktotaj",
"Upload cancelled." => "La alŝuto nuliĝis.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
"Invalid name, '/' is not allowed." => "Nevalida nomo, “/” ne estas permesata.",
"Size" => "Grando",
"Modified" => "Modifita",
@@ -34,6 +38,7 @@
"Enable ZIP-download" => "Kapabligi ZIP-elŝuton",
"0 is unlimited" => "0 signifas senlime",
"Maximum input size for ZIP files" => "Maksimuma enirgrando por ZIP-dosieroj",
+"Save" => "Konservi",
"New" => "Nova",
"Text file" => "Tekstodosiero",
"Folder" => "Dosierujo",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 0ba3c56aa1f..5c2a0e74f49 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -7,7 +7,8 @@
"Missing a temporary folder" => "Falta un directorio temporal",
"Failed to write to disk" => "La escritura en disco ha fallado",
"Files" => "Archivos",
-"Delete" => "Eliminado",
+"Unshare" => "Dejar de compartir",
+"Delete" => "Eliminar",
"already exists" => "ya existe",
"replace" => "reemplazar",
"suggest name" => "sugerir nombre",
@@ -15,6 +16,7 @@
"replaced" => "reemplazado",
"undo" => "deshacer",
"with" => "con",
+"unshared" => "no compartido",
"deleted" => "borrado",
"generating ZIP-file, it may take some time." => "generando un fichero ZIP, puede llevar un tiempo.",
"Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 0763745788b..88e91719282 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -7,19 +7,23 @@
"Missing a temporary folder" => "Ajutiste failide kaust puudub",
"Failed to write to disk" => "Kettale kirjutamine ebaõnnestus",
"Files" => "Failid",
+"Unshare" => "Lõpeta jagamine",
"Delete" => "Kustuta",
"already exists" => "on juba olemas",
"replace" => "asenda",
+"suggest name" => "soovita nime",
"cancel" => "loobu",
"replaced" => "asendatud",
"undo" => "tagasi",
"with" => "millega",
+"unshared" => "jagamata",
"deleted" => "kustutatud",
"generating ZIP-file, it may take some time." => "ZIP-faili loomine, see võib veidi aega võtta.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti",
"Upload Error" => "Üleslaadimise viga",
"Pending" => "Ootel",
"Upload cancelled." => "Üleslaadimine tühistati.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
"Invalid name, '/' is not allowed." => "Vigane nimi, '/' pole lubatud.",
"Size" => "Suurus",
"Modified" => "Muudetud",
@@ -34,6 +38,7 @@
"Enable ZIP-download" => "Luba ZIP-ina allalaadimine",
"0 is unlimited" => "0 tähendab piiramatut",
"Maximum input size for ZIP files" => "Maksimaalne ZIP-faili sisestatava faili suurus",
+"Save" => "Salvesta",
"New" => "Uus",
"Text file" => "Tekstifail",
"Folder" => "Kaust",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 3897a5580f3..fd8ec94895e 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -7,20 +7,26 @@
"Missing a temporary folder" => "Aldi baterako karpeta falta da",
"Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
"Files" => "Fitxategiak",
+"Unshare" => "Ez partekatu",
"Delete" => "Ezabatu",
"already exists" => "dagoeneko existitzen da",
"replace" => "ordeztu",
+"suggest name" => "aholkatu izena",
"cancel" => "ezeztatu",
"replaced" => "ordeztua",
"undo" => "desegin",
"with" => "honekin",
+"unshared" => "Ez partekatuta",
"deleted" => "ezabatuta",
"generating ZIP-file, it may take some time." => "ZIP-fitxategia sortzen ari da, denbora har dezake",
"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu",
"Upload Error" => "Igotzean errore bat suertatu da",
"Pending" => "Zain",
"Upload cancelled." => "Igoera ezeztatuta",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
"Invalid name, '/' is not allowed." => "Baliogabeko izena, '/' ezin da erabili. ",
+"files scanned" => "fitxategiak eskaneatuta",
+"error while scanning" => "errore bat egon da eskaneatzen zen bitartean",
"Size" => "Tamaina",
"Modified" => "Aldatuta",
"folder" => "karpeta",
@@ -34,6 +40,7 @@
"Enable ZIP-download" => "Gaitu ZIP-deskarga",
"0 is unlimited" => "0 mugarik gabe esan nahi du",
"Maximum input size for ZIP files" => "ZIP fitxategien gehienezko tamaina",
+"Save" => "Gorde",
"New" => "Berria",
"Text file" => "Testu fitxategia",
"Folder" => "Karpeta",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 0b7d226de74..c0f08b118d5 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -7,13 +7,16 @@
"Missing a temporary folder" => "Il manque un répertoire temporaire",
"Failed to write to disk" => "Erreur d'écriture sur le disque",
"Files" => "Fichiers",
+"Unshare" => "Ne plus partager",
"Delete" => "Supprimer",
"already exists" => "existe déjà",
"replace" => "remplacer",
+"suggest name" => "Suggérer un nom",
"cancel" => "annuler",
"replaced" => "remplacé",
"undo" => "annuler",
"with" => "avec",
+"unshared" => "non partagée",
"deleted" => "supprimé",
"generating ZIP-file, it may take some time." => "Fichier ZIP en cours d'assemblage ; cela peut prendre du temps.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 67293de5cb7..acf136d82f6 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -7,20 +7,26 @@
"Missing a temporary folder" => "Falta un cartafol temporal",
"Failed to write to disk" => "Erro ao escribir no disco",
"Files" => "Ficheiros",
+"Unshare" => "Deixar de compartir",
"Delete" => "Eliminar",
"already exists" => "xa existe",
"replace" => "substituír",
+"suggest name" => "suxira nome",
"cancel" => "cancelar",
"replaced" => "substituído",
"undo" => "desfacer",
"with" => "con",
+"unshared" => "non compartido",
"deleted" => "eliminado",
"generating ZIP-file, it may take some time." => "xerando ficheiro ZIP, pode levar un anaco.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes",
"Upload Error" => "Erro na subida",
"Pending" => "Pendentes",
"Upload cancelled." => "Subida cancelada.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "A subida do ficheiro está en curso. Saír agora da páxina cancelará a subida.",
"Invalid name, '/' is not allowed." => "Nome non válido, '/' non está permitido.",
+"files scanned" => "ficheiros analizados",
+"error while scanning" => "erro mentras analizaba",
"Size" => "Tamaño",
"Modified" => "Modificado",
"folder" => "cartafol",
@@ -34,6 +40,7 @@
"Enable ZIP-download" => "Habilitar a descarga-ZIP",
"0 is unlimited" => "0 significa ilimitado",
"Maximum input size for ZIP files" => "Tamaño máximo de descarga para os ZIP",
+"Save" => "Gardar",
"New" => "Novo",
"Text file" => "Ficheiro de texto",
"Folder" => "Cartafol",
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 65d093e3662..e7ab4a524bc 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -8,6 +8,7 @@
"Failed to write to disk" => "הכתיבה לכונן נכשלה",
"Files" => "קבצים",
"Delete" => "מחיקה",
+"already exists" => "כבר קיים",
"generating ZIP-file, it may take some time." => "יוצר קובץ ZIP, אנא המתן.",
"Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים",
"Upload Error" => "שגיאת העלאה",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 0df60832c5b..574219cf913 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -7,6 +7,7 @@
"Missing a temporary folder" => "Cartella temporanea mancante",
"Failed to write to disk" => "Scrittura su disco non riuscita",
"Files" => "File",
+"Unshare" => "Rimuovi condivisione",
"Delete" => "Elimina",
"already exists" => "esiste già",
"replace" => "sostituisci",
@@ -15,6 +16,7 @@
"replaced" => "sostituito",
"undo" => "annulla",
"with" => "con",
+"unshared" => "condivisione rimossa",
"deleted" => "eliminati",
"generating ZIP-file, it may take some time." => "creazione file ZIP, potrebbe richiedere del tempo.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte",
@@ -23,6 +25,8 @@
"Upload cancelled." => "Invio annullato",
"File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
"Invalid name, '/' is not allowed." => "Nome non valido",
+"files scanned" => "file analizzati",
+"error while scanning" => "errore durante la scansione",
"Size" => "Dimensione",
"Modified" => "Modificato",
"folder" => "cartella",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 2de716fec8a..84d671a938d 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -7,13 +7,16 @@
"Missing a temporary folder" => "テンポラリフォルダが見つかりません",
"Failed to write to disk" => "ディスクへの書き込みに失敗しました",
"Files" => "ファイル",
+"Unshare" => "共有しない",
"Delete" => "削除",
"already exists" => "既に存在します",
"replace" => "置き換え",
+"suggest name" => "推奨名称",
"cancel" => "キャンセル",
"replaced" => "置換:",
"undo" => "元に戻す",
"with" => "←",
+"unshared" => "未共有",
"deleted" => "削除",
"generating ZIP-file, it may take some time." => "ZIPファイルを生成中です、しばらくお待ちください。",
"Unable to upload your file as it is a directory or has 0 bytes" => "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。",
@@ -22,6 +25,8 @@
"Upload cancelled." => "アップロードはキャンセルされました。",
"File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
"Invalid name, '/' is not allowed." => "無効な名前、'/' は使用できません。",
+"files scanned" => "ファイルをスキャンしました",
+"error while scanning" => "スキャン中のエラー",
"Size" => "サイズ",
"Modified" => "更新日時",
"folder" => "フォルダ",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 4a747af2f3a..6331de6d45e 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -34,6 +34,7 @@
"Enable ZIP-download" => "Aktiver nedlasting av ZIP",
"0 is unlimited" => "0 er ubegrenset",
"Maximum input size for ZIP files" => "Maksimal størrelse på ZIP-filer",
+"Save" => "Lagre",
"New" => "Ny",
"Text file" => "Tekstfil",
"Folder" => "Mappe",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 7acb15054c5..b54c96bd9ae 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -7,13 +7,16 @@
"Missing a temporary folder" => "Een tijdelijke map mist",
"Failed to write to disk" => "Schrijven naar schijf mislukt",
"Files" => "Bestanden",
+"Unshare" => "Stop delen",
"Delete" => "Verwijder",
"already exists" => "bestaat al",
"replace" => "vervang",
+"suggest name" => "Stel een naam voor",
"cancel" => "annuleren",
"replaced" => "vervangen",
"undo" => "ongedaan maken",
"with" => "door",
+"unshared" => "niet gedeeld",
"deleted" => "verwijderd",
"generating ZIP-file, it may take some time." => "aanmaken ZIP-file, dit kan enige tijd duren.",
"Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index d3814333aca..22f1dd3df88 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -7,6 +7,7 @@
"Missing a temporary folder" => "Brak katalogu tymczasowego",
"Failed to write to disk" => "Błąd zapisu na dysk",
"Files" => "Pliki",
+"Unshare" => "Nie udostępniaj",
"Delete" => "Usuwa element",
"already exists" => "Już istnieje",
"replace" => "zastap",
@@ -15,6 +16,7 @@
"replaced" => "zastąpione",
"undo" => "wróć",
"with" => "z",
+"unshared" => "Nie udostępnione",
"deleted" => "skasuj",
"generating ZIP-file, it may take some time." => "Generowanie pliku ZIP, może potrwać pewien czas.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów",
@@ -23,6 +25,8 @@
"Upload cancelled." => "Wczytywanie anulowane.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zostanie anulowane.",
"Invalid name, '/' is not allowed." => "Nieprawidłowa nazwa '/' jest niedozwolone.",
+"files scanned" => "Pliki skanowane",
+"error while scanning" => "Wystąpił błąd podczas skanowania",
"Size" => "Rozmiar",
"Modified" => "Czas modyfikacji",
"folder" => "folder",
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 58a6d2454f5..5fd9b60ce6a 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -7,9 +7,32 @@
"Missing a temporary folder" => "Lipsește un dosar temporar",
"Failed to write to disk" => "Eroare la scriere pe disc",
"Files" => "Fișiere",
+"Unshare" => "Anulează partajarea",
"Delete" => "Șterge",
+"already exists" => "deja există",
+"replace" => "înlocuire",
+"suggest name" => "sugerează nume",
+"cancel" => "anulare",
+"replaced" => "înlocuit",
+"undo" => "Anulează ultima acțiune",
+"with" => "cu",
+"unshared" => "nepartajat",
+"deleted" => "șters",
+"generating ZIP-file, it may take some time." => "se generază fișierul ZIP, va dura ceva timp.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.",
+"Upload Error" => "Eroare la încărcare",
+"Pending" => "În așteptare",
+"Upload cancelled." => "Încărcare anulată.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
+"Invalid name, '/' is not allowed." => "Nume invalid, '/' nu este permis.",
+"files scanned" => "fișiere scanate",
+"error while scanning" => "eroare la scanarea",
"Size" => "Dimensiune",
"Modified" => "Modificat",
+"folder" => "director",
+"folders" => "directoare",
+"file" => "fișier",
+"files" => "fișiere",
"File handling" => "Manipulare fișiere",
"Maximum upload size" => "Dimensiune maximă admisă la încărcare",
"max. possible: " => "max. posibil:",
@@ -17,6 +40,7 @@
"Enable ZIP-download" => "Activează descărcare fișiere compresate",
"0 is unlimited" => "0 e nelimitat",
"Maximum input size for ZIP files" => "Dimensiunea maximă de intrare pentru fișiere compresate",
+"Save" => "Salvare",
"New" => "Nou",
"Text file" => "Fișier text",
"Folder" => "Dosar",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 6a76c254047..61091790af5 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -7,13 +7,16 @@
"Missing a temporary folder" => "Невозможно найти временную папку",
"Failed to write to disk" => "Ошибка записи на диск",
"Files" => "Файлы",
+"Unshare" => "Отменить публикацию",
"Delete" => "Удалить",
"already exists" => "уже существует",
"replace" => "заменить",
+"suggest name" => "предложить название",
"cancel" => "отмена",
"replaced" => "заменён",
"undo" => "отмена",
"with" => "с",
+"unshared" => "публикация отменена",
"deleted" => "удален",
"generating ZIP-file, it may take some time." => "создание ZIP-файла, это может занять некоторое время.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Не удается загрузить файл размером 0 байт в каталог",
@@ -35,6 +38,7 @@
"Enable ZIP-download" => "Включить ZIP-скачивание",
"0 is unlimited" => "0 - без ограничений",
"Maximum input size for ZIP files" => "Максимальный исходный размер для ZIP файлов",
+"Save" => "Сохранить",
"New" => "Новый",
"Text file" => "Текстовый файл",
"Folder" => "Папка",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
new file mode 100644
index 00000000000..f43959d4e95
--- /dev/null
+++ b/apps/files/l10n/ru_RU.php
@@ -0,0 +1,56 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Ошибка отсутствует, файл загружен успешно.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Размер загруженного файла превышает заданный в директиве upload_max_filesize в php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загруженного",
+"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен частично",
+"No file was uploaded" => "Файл не был загружен",
+"Missing a temporary folder" => "Отсутствует временная папка",
+"Failed to write to disk" => "Не удалось записать на диск",
+"Files" => "Файлы",
+"Unshare" => "Скрыть",
+"Delete" => "Удалить",
+"already exists" => "уже существует",
+"replace" => "отмена",
+"suggest name" => "подобрать название",
+"cancel" => "отменить",
+"replaced" => "заменено",
+"undo" => "отменить действие",
+"with" => "с",
+"unshared" => "скрытый",
+"deleted" => "удалено",
+"generating ZIP-file, it may take some time." => "Создание ZIP-файла, это может занять некоторое время.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией",
+"Upload Error" => "Ошибка загрузки",
+"Pending" => "Ожидающий решения",
+"Upload cancelled." => "Загрузка отменена",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена.",
+"Invalid name, '/' is not allowed." => "Неправильное имя, '/' не допускается.",
+"Size" => "Размер",
+"Modified" => "Изменен",
+"folder" => "папка",
+"folders" => "папки",
+"file" => "файл",
+"files" => "файлы",
+"File handling" => "Работа с файлами",
+"Maximum upload size" => "Максимальный размер загружаемого файла",
+"max. possible: " => "Максимально возможный",
+"Needed for multi-file and folder downloads." => "Необходимо для множественной загрузки.",
+"Enable ZIP-download" => "Включение ZIP-загрузки",
+"0 is unlimited" => "0 без ограничений",
+"Maximum input size for ZIP files" => "Максимальный размер входящих ZIP-файлов ",
+"Save" => "Сохранить",
+"New" => "Новый",
+"Text file" => "Текстовый файл",
+"Folder" => "Папка",
+"From url" => "Из url",
+"Upload" => "Загрузить ",
+"Cancel upload" => "Отмена загрузки",
+"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
+"Name" => "Имя",
+"Share" => "Сделать общим",
+"Download" => "Загрузить",
+"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" => "Текущее сканирование"
+);
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 8a31c550320..915303205cd 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -7,13 +7,26 @@
"Missing a temporary folder" => "Chýbajúci dočasný priečinok",
"Failed to write to disk" => "Zápis na disk sa nepodaril",
"Files" => "Súbory",
+"Unshare" => "Nezdielať",
"Delete" => "Odstrániť",
+"already exists" => "už existuje",
+"replace" => "nahradiť",
+"suggest name" => "pomôcť s menom",
+"cancel" => "zrušiť",
+"replaced" => "zmenené",
+"undo" => "vrátiť",
+"with" => "s",
+"unshared" => "zdielané",
+"deleted" => "zmazané",
"generating ZIP-file, it may take some time." => "generujem ZIP-súbor, môže to chvíľu trvať.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov.",
"Upload Error" => "Chyba nahrávania",
"Pending" => "Čaká sa",
"Upload cancelled." => "Nahrávanie zrušené",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
"Invalid name, '/' is not allowed." => "Chybný názov, \"/\" nie je povolené",
+"files scanned" => "skontrolovaných súborov",
+"error while scanning" => "chyba počas kontroly",
"Size" => "Veľkosť",
"Modified" => "Upravené",
"folder" => "priečinok",
@@ -21,23 +34,24 @@
"file" => "súbor",
"files" => "súbory",
"File handling" => "Nastavenie správanie k súborom",
-"Maximum upload size" => "Maximálna veľkosť nahratia",
+"Maximum upload size" => "Maximálna veľkosť odosielaného súboru",
"max. possible: " => "najväčšie možné:",
"Needed for multi-file and folder downloads." => "Vyžadované pre sťahovanie viacerých súborov a adresárov.",
"Enable ZIP-download" => "Povoliť sťahovanie ZIP súborov",
"0 is unlimited" => "0 znamená neobmedzené",
"Maximum input size for ZIP files" => "Najväčšia veľkosť ZIP súborov",
+"Save" => "Uložiť",
"New" => "Nový",
"Text file" => "Textový súbor",
"Folder" => "Priečinok",
"From url" => "Z url",
"Upload" => "Nahrať",
"Cancel upload" => "Zrušiť odosielanie",
-"Nothing in here. Upload something!" => "Nič tu nie je. Nahrajte niečo!",
+"Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
"Name" => "Meno",
"Share" => "Zdielať",
"Download" => "Stiahnuť",
-"Upload too large" => "Nahrávanie príliš veľké",
+"Upload too large" => "Odosielaný súbor 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." => "Súbory sa práve prehľadávajú, prosím čakajte.",
"Current scanning" => "Práve prehliadané"
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 0d56a0c6476..a3b5ceeff65 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -7,6 +7,7 @@
"Missing a temporary folder" => "Manjka začasna mapa",
"Failed to write to disk" => "Pisanje na disk je spodletelo",
"Files" => "Datoteke",
+"Unshare" => "Odstrani iz souporabe",
"Delete" => "Izbriši",
"already exists" => "že obstaja",
"replace" => "nadomesti",
@@ -15,6 +16,7 @@
"replaced" => "nadomeščen",
"undo" => "razveljavi",
"with" => "z",
+"unshared" => "odstranjeno iz souporabe",
"deleted" => "izbrisano",
"generating ZIP-file, it may take some time." => "Ustvarjam ZIP datoteko. To lahko traja nekaj časa.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nalaganje ni mogoče, saj gre za mapo, ali pa ima datoteka velikost 0 bajtov.",
@@ -23,6 +25,8 @@
"Upload cancelled." => "Nalaganje je bilo preklicano.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Nalaganje datoteke je v teku. Če zapustite to stran zdaj, boste nalaganje preklicali.",
"Invalid name, '/' is not allowed." => "Neveljavno ime. Znak '/' ni dovoljen.",
+"files scanned" => "pregledanih datotek",
+"error while scanning" => "napaka med pregledovanjem datotek",
"Size" => "Velikost",
"Modified" => "Spremenjeno",
"folder" => "mapa",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 137222b4178..78ddc95ff42 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -7,6 +7,7 @@
"Missing a temporary folder" => "Saknar en tillfällig mapp",
"Failed to write to disk" => "Misslyckades spara till disk",
"Files" => "Filer",
+"Unshare" => "Sluta dela",
"Delete" => "Radera",
"already exists" => "finns redan",
"replace" => "ersätt",
@@ -15,6 +16,7 @@
"replaced" => "ersatt",
"undo" => "ångra",
"with" => "med",
+"unshared" => "Ej delad",
"deleted" => "raderad",
"generating ZIP-file, it may take some time." => "genererar ZIP-fil, det kan ta lite tid.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.",
@@ -23,6 +25,8 @@
"Upload cancelled." => "Uppladdning avbruten.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
"Invalid name, '/' is not allowed." => "Ogiltigt namn, '/' är inte tillåten.",
+"files scanned" => "filer skannade",
+"error while scanning" => "fel vid skanning",
"Size" => "Storlek",
"Modified" => "Ändrad",
"folder" => "mapp",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 5809ac1f098..988bfd50a2f 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -7,6 +7,7 @@
"Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย",
"Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
"Files" => "ไฟล์",
+"Unshare" => "ยกเลิกการแชร์ข้อมูล",
"Delete" => "ลบ",
"already exists" => "มีอยู่แล้ว",
"replace" => "แทนที่",
@@ -15,6 +16,7 @@
"replaced" => "แทนที่แล้ว",
"undo" => "เลิกทำ",
"with" => "กับ",
+"unshared" => "ยกเลิกการแชร์ข้อมูลแล้ว",
"deleted" => "ลบแล้ว",
"generating ZIP-file, it may take some time." => "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่",
"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์",
@@ -23,6 +25,8 @@
"Upload cancelled." => "การอัพโหลดถูกยกเลิก",
"File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
"Invalid name, '/' is not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน",
+"files scanned" => "ไฟล์ต่างๆได้รับการสแกนแล้ว",
+"error while scanning" => "พบข้อผิดพลาดในระหว่างการสแกนไฟล์",
"Size" => "ขนาด",
"Modified" => "ปรับปรุงล่าสุด",
"folder" => "โฟลเดอร์",
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index c2284d5feb9..ce7e0c219ab 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -1,9 +1,28 @@
<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Không có lỗi, các tập tin đã được tải lên thành công",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Những tập tin được tải lên vượt quá upload_max_filesize được chỉ định trong php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Kích thước những tập tin tải lên vượt quá MAX_FILE_SIZE đã được quy định",
+"The uploaded file was only partially uploaded" => "Tập tin tải lên mới chỉ tải lên được một phần",
+"No file was uploaded" => "Không có tập tin nào được tải lên",
+"Missing a temporary folder" => "Không tìm thấy thư mục tạm",
+"Failed to write to disk" => "Không thể ghi vào đĩa cứng",
"Files" => "Tập tin",
+"Unshare" => "Không chia sẽ",
"Delete" => "Xóa",
+"already exists" => "đã tồn tại",
+"replace" => "thay thế",
+"suggest name" => "tên gợi ý",
+"cancel" => "hủy",
+"replaced" => "đã được thay thế",
+"undo" => "lùi lại",
+"with" => "với",
+"deleted" => "đã xóa",
+"generating ZIP-file, it may take some time." => "Tạo tập tinh ZIP, điều này có thể mất một ít thời gian",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte",
"Upload Error" => "Tải lên lỗi",
"Pending" => "Chờ",
"Upload cancelled." => "Hủy tải lên",
+"File upload is in progress. Leaving the page now will cancel the upload." => "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.",
"Invalid name, '/' is not allowed." => "Tên không hợp lệ ,không được phép dùng '/'",
"Size" => "Kích cỡ",
"Modified" => "Thay đổi",
@@ -13,9 +32,11 @@
"files" => "files",
"File handling" => "Xử lý tập tin",
"Maximum upload size" => "Kích thước tối đa ",
+"Needed for multi-file and folder downloads." => "Cần thiết cho tải nhiều tập tin và thư mục.",
"Enable ZIP-download" => "Cho phép ZIP-download",
"0 is unlimited" => "0 là không giới hạn",
"Maximum input size for ZIP files" => "Kích thước tối đa cho các tập tin ZIP",
+"Save" => "Lưu",
"New" => "Mới",
"Text file" => "Tập tin văn bản",
"Folder" => "Folder",
@@ -27,5 +48,7 @@
"Share" => "Chia sẻ",
"Download" => "Tải xuống",
"Upload too large" => "File tải lên quá lớn",
-"Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ."
+"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 cố gắng tải lên vượt quá kích thước tối đa cho phép trên máy chủ này.",
+"Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.",
+"Current scanning" => "Hiện tại đang quét"
);
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index 42063712eac..9e4b39b8566 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -7,20 +7,26 @@
"Missing a temporary folder" => "丢失了一个临时文件夹",
"Failed to write to disk" => "写磁盘失败",
"Files" => "文件",
+"Unshare" => "取消共享",
"Delete" => "删除",
"already exists" => "已经存在了",
"replace" => "替换",
+"suggest name" => "推荐名称",
"cancel" => "取消",
"replaced" => "替换过了",
"undo" => "撤销",
"with" => "随着",
+"unshared" => "已取消共享",
"deleted" => "删除",
"generating ZIP-file, it may take some time." => "正在生成ZIP文件,这可能需要点时间",
"Unable to upload your file as it is a directory or has 0 bytes" => "不能上传你指定的文件,可能因为它是个文件夹或者大小为0",
"Upload Error" => "上传错误",
"Pending" => "Pending",
"Upload cancelled." => "上传取消了",
+"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。",
"Invalid name, '/' is not allowed." => "非法文件名,\"/\"是不被许可的",
+"files scanned" => "文件已扫描",
+"error while scanning" => "扫描出错",
"Size" => "大小",
"Modified" => "修改日期",
"folder" => "文件夹",
@@ -34,6 +40,7 @@
"Enable ZIP-download" => "支持ZIP下载",
"0 is unlimited" => "0是无限的",
"Maximum input size for ZIP files" => "最大的ZIP文件输入大小",
+"Save" => "保存",
"New" => "新建",
"Text file" => "文本文档",
"Folder" => "文件夹",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 3fdb5b6af3e..67289f8f483 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -7,6 +7,7 @@
"Missing a temporary folder" => "缺少临时目录",
"Failed to write to disk" => "写入磁盘失败",
"Files" => "文件",
+"Unshare" => "取消分享",
"Delete" => "删除",
"already exists" => "已经存在",
"replace" => "替换",
@@ -15,6 +16,7 @@
"replaced" => "已经替换",
"undo" => "撤销",
"with" => "随着",
+"unshared" => "已取消分享",
"deleted" => "已经删除",
"generating ZIP-file, it may take some time." => "正在生成 ZIP 文件,可能需要一些时间",
"Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件,因为它是一个目录或者大小为 0 字节",
@@ -23,6 +25,8 @@
"Upload cancelled." => "上传已取消",
"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
"Invalid name, '/' is not allowed." => "非法的名称,不允许使用‘/’。",
+"files scanned" => "已扫描文件",
+"error while scanning" => "扫描时出错",
"Size" => "大小",
"Modified" => "修改日期",
"folder" => "文件夹",
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 911a312fb9a..aff484f0a7a 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -16,9 +16,9 @@
<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
- <button class="file_upload_filename">&nbsp;<img class='svg action' alt="Upload" src="<?php echo OCP\image_path("core", "actions/upload-white.svg"); ?>" /></button>
<input class="file_upload_start" type="file" name='files[]'/>
- <a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
+ <a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
+ <button class="file_upload_filename"></button>
<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
</form>
</div>
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
new file mode 100644
index 00000000000..144c9f97084
--- /dev/null
+++ b/apps/files_encryption/l10n/da.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Kryptering",
+"Exclude the following file types from encryption" => "Ekskluder følgende filtyper fra kryptering",
+"None" => "Ingen",
+"Enable Encryption" => "Aktivér kryptering"
+);
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
new file mode 100644
index 00000000000..1434ff48aac
--- /dev/null
+++ b/apps/files_encryption/l10n/gl.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Encriptado",
+"Exclude the following file types from encryption" => "Excluír os seguintes tipos de ficheiro da encriptación",
+"None" => "Nada",
+"Enable Encryption" => "Habilitar encriptación"
+);
diff --git a/apps/files_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php
new file mode 100644
index 00000000000..97f3f262d76
--- /dev/null
+++ b/apps/files_encryption/l10n/ro.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Încriptare",
+"Exclude the following file types from encryption" => "Exclude următoarele tipuri de fișiere de la încriptare",
+"None" => "Niciuna",
+"Enable Encryption" => "Activare încriptare"
+);
diff --git a/apps/files_encryption/l10n/ru_RU.php b/apps/files_encryption/l10n/ru_RU.php
new file mode 100644
index 00000000000..1328b0d0359
--- /dev/null
+++ b/apps/files_encryption/l10n/ru_RU.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Шифрование",
+"Exclude the following file types from encryption" => "Исключите следующие типы файлов из шифрования",
+"None" => "Ни один",
+"Enable Encryption" => "Включить шифрование"
+);
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
new file mode 100644
index 00000000000..cabf2da7dce
--- /dev/null
+++ b/apps/files_encryption/l10n/vi.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Mã hóa",
+"Exclude the following file types from encryption" => "Loại trừ các loại tập tin sau đây từ mã hóa",
+"None" => "none",
+"Enable Encryption" => "BẬT mã hóa"
+);
diff --git a/apps/files_encryption/l10n/zh_CN.GB2312.php b/apps/files_encryption/l10n/zh_CN.GB2312.php
new file mode 100644
index 00000000000..297444fcf55
--- /dev/null
+++ b/apps/files_encryption/l10n/zh_CN.GB2312.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "加密",
+"Exclude the following file types from encryption" => "从加密中排除如下文件类型",
+"None" => "无",
+"Enable Encryption" => "启用加密"
+);
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 139ae909709..1e1247d15ff 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Encryption" => "加密",
+"Exclude the following file types from encryption" => "从加密中排除列出的文件类型",
"None" => "None",
"Enable Encryption" => "开启加密"
);
diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
index a8719fc7a3d..8848f85cf9d 100644
--- a/apps/files_external/ajax/addRootCertificate.php
+++ b/apps/files_external/ajax/addRootCertificate.php
@@ -2,25 +2,21 @@
OCP\JSON::checkAppEnabled('files_external');
-$view = \OCP\Files::getStorage("files_external");
-$from = $_FILES['rootcert_import']['tmp_name'];
-$path = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/';
-if(!file_exists($path)) mkdir($path,0700,true);
-$to = $path.$_FILES['rootcert_import']['name'];
-move_uploaded_file($from, $to);
+$fh = fopen($_FILES['rootcert_import']['tmp_name'], 'r');
+$data = fread($fh, filesize($_FILES['rootcert_import']['tmp_name']));
+fclose($fh);
+
+$view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_external/uploads');
+if (!$view->file_exists('')) $view->mkdir('');
//check if it is a PEM certificate, otherwise convert it if possible
-$fh = fopen($to, 'r');
-$data = fread($fh, filesize($to));
-fclose($fh);
-if (!strpos($data, 'BEGIN CERTIFICATE')) {
- $pem = chunk_split(base64_encode($data), 64, "\n");
- $pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
- $fh = fopen($to, 'w');
- fwrite($fh, $pem);
- fclose($fh);
+if (!strpos($data, 'BEGIN CERTIFICATE')) {
+ $data = chunk_split(base64_encode($data), 64, "\n");
+ $data = "-----BEGIN CERTIFICATE-----\n".$data."-----END CERTIFICATE-----\n";
}
+$view->file_put_contents($_FILES['rootcert_import']['name'], $data);
+
OC_Mount_Config::createCertificateBundle();
header("Location: settings/personal.php");
diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index dd3a1cb1858..6082fdd2cb7 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -19,6 +19,7 @@ $(document).ready(function() {
if (result && result.status == 'success') {
$(token).val(result.access_token);
$(token_secret).val(result.access_token_secret);
+ $(configured).val('true');
OC.MountConfig.saveStorage(tr);
$(tr).find('.configuration input').attr('disabled', 'disabled');
$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">Access granted</span>');
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index 7dcf13b3972..3de151eb751 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -1,10 +1,18 @@
<?php $TRANSLATIONS = array(
-"External Storage" => "Εξωτερική αποθήκευση",
+"External Storage" => "Εξωτερικό Αποθηκευτικό Μέσο",
"Mount point" => "Σημείο προσάρτησης",
+"Backend" => "Σύστημα υποστήριξης",
"Configuration" => "Ρυθμίσεις",
"Options" => "Επιλογές",
+"Applicable" => "Εφαρμόσιμο",
+"Add mount point" => "Προσθήκη σημείου προσάρτησης",
+"None set" => "Κανένα επιλεγμένο",
"All Users" => "Όλοι οι χρήστες",
"Groups" => "Ομάδες",
"Users" => "Χρήστες",
-"Delete" => "Διαγραφή"
+"Delete" => "Διαγραφή",
+"SSL root certificates" => "Πιστοποιητικά SSL root",
+"Import Root Certificate" => "Εισαγωγή Πιστοποιητικού Root",
+"Enable User External Storage" => "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη",
+"Allow users to mount their own external storage" => "Να επιτρέπεται στους χρήστες να προσαρτούν δικό τους εξωτερικό αποθηκευτικό χώρο"
);
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index a6907e775bc..f47ebc936b5 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -1,12 +1,18 @@
<?php $TRANSLATIONS = array(
"External Storage" => "Väline salvestuskoht",
"Mount point" => "Ühenduspunkt",
+"Backend" => "Admin",
"Configuration" => "Seadistamine",
"Options" => "Valikud",
+"Applicable" => "Rakendatav",
"Add mount point" => "Lisa ühenduspunkt",
"None set" => "Pole määratud",
"All Users" => "Kõik kasutajad",
"Groups" => "Grupid",
"Users" => "Kasutajad",
-"Delete" => "Kustuta"
+"Delete" => "Kustuta",
+"SSL root certificates" => "SSL root sertifikaadid",
+"Import Root Certificate" => "Impordi root sertifikaadid",
+"Enable User External Storage" => "Luba kasutajatele väline salvestamine",
+"Allow users to mount their own external storage" => "Luba kasutajatel ühendada külge nende enda välised salvestusseadmed"
);
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
index d1028d2b9bb..6299390c266 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -4,6 +4,7 @@
"Backend" => "Motorra",
"Configuration" => "Konfigurazioa",
"Options" => "Aukerak",
+"Applicable" => "Aplikagarria",
"Add mount point" => "Gehitu muntatze puntua",
"None set" => "Ezarri gabe",
"All Users" => "Erabiltzaile guztiak",
diff --git a/apps/files_external/l10n/gl.php b/apps/files_external/l10n/gl.php
new file mode 100644
index 00000000000..c6de7b837a6
--- /dev/null
+++ b/apps/files_external/l10n/gl.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Almacenamento externo",
+"Mount point" => "Punto de montaxe",
+"Backend" => "Almacén",
+"Configuration" => "Configuración",
+"Options" => "Opcións",
+"Applicable" => "Aplicable",
+"Add mount point" => "Engadir punto de montaxe",
+"None set" => "Non establecido",
+"All Users" => "Tódolos usuarios",
+"Groups" => "Grupos",
+"Users" => "Usuarios",
+"Delete" => "Eliminar",
+"SSL root certificates" => "Certificados raíz SSL",
+"Import Root Certificate" => "Importar Certificado Raíz",
+"Enable User External Storage" => "Habilitar almacenamento externo do usuario",
+"Allow users to mount their own external storage" => "Permitir aos usuarios montar os seus propios almacenamentos externos"
+);
diff --git a/apps/files_external/l10n/ro.php b/apps/files_external/l10n/ro.php
new file mode 100644
index 00000000000..f5114f61791
--- /dev/null
+++ b/apps/files_external/l10n/ro.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Stocare externă",
+"Mount point" => "Punctul de montare",
+"Backend" => "Backend",
+"Configuration" => "Configurație",
+"Options" => "Opțiuni",
+"Applicable" => "Aplicabil",
+"Add mount point" => "Adaugă punct de montare",
+"None set" => "Niciunul",
+"All Users" => "Toți utilizatorii",
+"Groups" => "Grupuri",
+"Users" => "Utilizatori",
+"Delete" => "Șterge",
+"SSL root certificates" => "Certificate SSL root",
+"Import Root Certificate" => "Importă certificat root",
+"Enable User External Storage" => "Permite stocare externă pentru utilizatori",
+"Allow users to mount their own external storage" => "Permite utilizatorilor să monteze stocare externă proprie"
+);
diff --git a/apps/files_external/l10n/ru_RU.php b/apps/files_external/l10n/ru_RU.php
new file mode 100644
index 00000000000..5b0cf1b6aaa
--- /dev/null
+++ b/apps/files_external/l10n/ru_RU.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Внешние системы хранения данных",
+"Mount point" => "Точка монтирования",
+"Backend" => "Бэкэнд",
+"Configuration" => "Конфигурация",
+"Options" => "Опции",
+"Applicable" => "Применимый",
+"Add mount point" => "Добавить точку монтирования",
+"None set" => "Не задан",
+"All Users" => "Все пользователи",
+"Groups" => "Группы",
+"Users" => "Пользователи",
+"Delete" => "Удалить",
+"SSL root certificates" => "Корневые сертификаты SSL",
+"Import Root Certificate" => "Импортировать корневые сертификаты",
+"Enable User External Storage" => "Включить пользовательскую внешнюю систему хранения данных",
+"Allow users to mount their own external storage" => "Разрешить пользователям монтировать их собственную внешнюю систему хранения данных"
+);
diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php
new file mode 100644
index 00000000000..79920b9014a
--- /dev/null
+++ b/apps/files_external/l10n/uk.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Групи",
+"Users" => "Користувачі",
+"Delete" => "Видалити"
+);
diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php
new file mode 100644
index 00000000000..35312329da1
--- /dev/null
+++ b/apps/files_external/l10n/vi.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Lưu trữ ngoài",
+"Mount point" => "Điểm gắn",
+"Backend" => "phụ trợ",
+"Configuration" => "Cấu hình",
+"Options" => "Tùy chọn",
+"Applicable" => "Áp dụng",
+"Add mount point" => "Thêm điểm lắp",
+"None set" => "không",
+"All Users" => "Tất cả người dùng",
+"Groups" => "Nhóm",
+"Users" => "Người dùng",
+"Delete" => "Xóa",
+"SSL root certificates" => "Chứng chỉ SSL root",
+"Import Root Certificate" => "Nhập Root Certificate",
+"Enable User External Storage" => "Kích hoạt tính năng lưu trữ ngoài",
+"Allow users to mount their own external storage" => "Cho phép người dùng kết nối với lưu trữ riêng bên ngoài của họ"
+);
diff --git a/apps/files_external/l10n/zh_CN.GB2312.php b/apps/files_external/l10n/zh_CN.GB2312.php
new file mode 100644
index 00000000000..6a6d1c6d12f
--- /dev/null
+++ b/apps/files_external/l10n/zh_CN.GB2312.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "外部存储",
+"Mount point" => "挂载点",
+"Backend" => "后端",
+"Configuration" => "配置",
+"Options" => "选项",
+"Applicable" => "可应用",
+"Add mount point" => "添加挂载点",
+"None set" => "未设置",
+"All Users" => "所有用户",
+"Groups" => "群组",
+"Users" => "用户",
+"Delete" => "删除",
+"SSL root certificates" => "SSL 根证书",
+"Import Root Certificate" => "导入根证书",
+"Enable User External Storage" => "启用用户外部存储",
+"Allow users to mount their own external storage" => "允许用户挂载他们的外部存储"
+);
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index db09fbdd82b..6d1bb1f55f2 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -270,6 +270,7 @@ class OC_Mount_Config {
fclose($fh);
if (strpos($data, 'BEGIN CERTIFICATE')) {
fwrite($fh_certs, $data);
+ fwrite($fh_certs, "\r\n");
}
}
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index b586ce1e8cd..d2be21b7116 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -21,7 +21,9 @@
*/
OCP\Util::addScript('files_external', 'settings');
+OCP\Util::addscript('3rdparty', 'chosen/chosen.jquery.min');
OCP\Util::addStyle('files_external', 'settings');
+OCP\Util::addStyle('3rdparty', 'chosen/chosen');
$tmpl = new OCP\Template('files_external', 'settings');
$tmpl->assign('isAdminPage', true, false);
$tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints());
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index feafa5fb992..5ef7a8bbb9c 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -1,16 +1,57 @@
<?php
-
-// touch shared directories to trigger one-time re-scan for all users
-$datadir = \OCP\Config::getSystemValue('datadirectory');
-$currentVersion=OC_Appconfig::getValue('files_sharing', 'installed_version');
-if (version_compare($currentVersion, '0.2.2', '<')) {
- if ($handle = opendir($datadir)) {
- while (false !== ($entry = readdir($handle))) {
- $sharedFolder = $datadir.'/'.$entry.'/files/Shared';
- if ($entry != "." && $entry != ".." && is_dir($sharedFolder)) {
- touch($sharedFolder);
+$installedVersion = OCP\Config::getAppValue('files_sharing', 'installed_version');
+if (version_compare($installedVersion, '0.3', '<')) {
+ $update_error = false;
+ $query = OCP\DB::prepare('SELECT * FROM `*PREFIX*sharing`');
+ $result = $query->execute();
+ $groupShares = array();
+ while ($row = $result->fetchRow()) {
+ $itemSource = OC_FileCache::getId($row['source'], '');
+ if ($itemSource != -1) {
+ $file = OC_FileCache::get($row['source'], '');
+ if ($file['mimetype'] == 'httpd/unix-directory') {
+ $itemType = 'folder';
+ } else {
+ $itemType = 'file';
+ }
+ if ($row['permissions'] == 0) {
+ $permissions = OCP\Share::PERMISSION_READ;
+ } else {
+ $permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE;
+ if ($itemType == 'folder') {
+ $permissions |= OCP\Share::PERMISSION_CREATE;
+ }
+ }
+ $pos = strrpos($row['uid_shared_with'], '@');
+ if ($pos !== false && OC_Group::groupExists(substr($row['uid_shared_with'], $pos + 1))) {
+ $shareType = OCP\Share::SHARE_TYPE_GROUP;
+ $shareWith = substr($row['uid_shared_with'], 0, $pos);
+ if (isset($groupShares[$shareWith][$itemSource])) {
+ continue;
+ } else {
+ $groupShares[$shareWith][$itemSource] = true;
+ }
+ } else if ($row['uid_shared_with'] == 'public') {
+ $shareType = OCP\Share::SHARE_TYPE_LINK;
+ $shareWith = null;
+ } else {
+ $shareType = OCP\Share::SHARE_TYPE_USER;
+ $shareWith = $row['uid_shared_with'];
+ }
+ OC_User::setUserId($row['uid_owner']);
+ try {
+ OCP\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions);
+ }
+ catch (Exception $e) {
+ $update_error = true;
+ echo 'Skipping sharing "'.$row['source'].'" to "'.$shareWith.'" (error is "'.$e->getMessage().'")<br/>';
}
}
- closedir($handle);
}
-} \ No newline at end of file
+ if ($update_error) {
+ throw new Exception('There were some problems upgrading the sharing of files');
+ }
+ // NOTE: Let's drop the table after more testing
+// $query = OCP\DB::prepare('DROP TABLE `*PREFIX*sharing`');
+// $query->execute();
+}
diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version
index a2268e2de44..9fc80f937fa 100644
--- a/apps/files_sharing/appinfo/version
+++ b/apps/files_sharing/appinfo/version
@@ -1 +1 @@
-0.3.1 \ No newline at end of file
+0.3.2 \ No newline at end of file
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index a700cc2169b..fb4794e0474 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -1,8 +1,11 @@
body { background:#ddd; }
#header { position:fixed; top:0; left:0; right:0; z-index:100; height:2.5em; line-height:2.5em; padding:.5em; background:#1d2d44; -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; }
#details { color:#fff; }
-#header #download { margin-left:2em; font-weight:bold; color:#fff; }
+#header #download { margin-left:2em; font-weight:bold; }
+#header #download img { padding-left: 0.1em; padding-right: 0.3em; vertical-align: text-bottom; }
#preview { min-height:30em; margin:50px auto; padding-top:2em; border-bottom:1px solid #f8f8f8; background:#eee; text-align:center; }
#noPreview { display:none; padding-top:5em; }
p.info { width:22em; text-align: center; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; }
-p.info a { font-weight:bold; color:#777; } \ No newline at end of file
+p.info a { font-weight:bold; color:#777; }
+#imgframe { width:80%; height: 75%; margin: 0 auto; padding-bottom:2em; }
+#imgframe img { max-height:100%; max-width: 100%; } \ No newline at end of file
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 92b626bba18..def02374804 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -1,6 +1,10 @@
// Override download path to files_sharing/public.php
function fileDownloadPath(dir, file) {
- return $('#downloadURL').val();
+ var url = $('#downloadURL').val();
+ if (url.indexOf('&path=') != -1) {
+ url += '/'+file;
+ }
+ return url;
}
$(document).ready(function() {
@@ -13,10 +17,21 @@ $(document).ready(function() {
var action = FileActions.getDefault(mimetype, 'file', OC.PERMISSION_READ);
if (typeof action === 'undefined') {
$('#noPreview').show();
+ if (mimetype != 'httpd/unix-directory') {
+ // NOTE: Remove when a better file previewer solution exists
+ $('#content').remove();
+ $('table').remove();
+ }
} else {
action($('#filename').val());
}
}
+ FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function(filename) {
+ var tr = $('tr').filterAttr('data-file', filename)
+ if (tr.length > 0) {
+ window.location = $(tr).find('a.name').attr('href');
+ }
+ });
}
}); \ No newline at end of file
diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php
new file mode 100644
index 00000000000..1fd9f774a96
--- /dev/null
+++ b/apps/files_sharing/l10n/da.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Kodeord",
+"Submit" => "Send",
+"Download" => "Download",
+"No preview available for" => "Forhåndsvisning ikke tilgængelig for",
+"web services under your control" => "Webtjenester under din kontrol"
+);
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index 90dce8ec623..b9a50387aa0 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -1,6 +1,8 @@
<?php $TRANSLATIONS = array(
"Password" => "Passwort",
"Submit" => "Absenden",
+"%s shared the folder %s with you" => "%s hat mit Ihnen den Ordner %s geteilt",
+"%s shared the file %s with you" => "%s hat mit Ihnen die Datei %s geteilt",
"Download" => "Download",
"No preview available for" => "Es ist keine Vorschau verfügbar für",
"web services under your control" => "Web-Services unter Ihrer Kontrolle"
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
index 123a008e554..3406c508e61 100644
--- a/apps/files_sharing/l10n/el.php
+++ b/apps/files_sharing/l10n/el.php
@@ -1,4 +1,7 @@
<?php $TRANSLATIONS = array(
"Password" => "Συνθηματικό",
-"Submit" => "Καταχώρηση"
+"Submit" => "Καταχώρηση",
+"Download" => "Λήψη",
+"No preview available for" => "Δεν υπάρχει διαθέσιμη προεπισκόπηση για",
+"web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας"
);
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index 5ef330a53e2..e71715f0f1f 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -1,4 +1,7 @@
<?php $TRANSLATIONS = array(
"Password" => "Pasvorto",
-"Submit" => "Sendi"
+"Submit" => "Sendi",
+"Download" => "Elŝuti",
+"No preview available for" => "Ne haveblas antaŭvido por",
+"web services under your control" => "TTT-servoj regataj de vi"
);
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index da299f4ff70..94b9b1d7aef 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -1,3 +1,7 @@
<?php $TRANSLATIONS = array(
-"Delete" => "Kustutamine"
+"Password" => "Parool",
+"Submit" => "Saada",
+"Download" => "Lae alla",
+"No preview available for" => "Eelvaadet pole saadaval",
+"web services under your control" => "veebitenused sinu kontrolli all"
);
diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php
new file mode 100644
index 00000000000..c9644d720e3
--- /dev/null
+++ b/apps/files_sharing/l10n/gl.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Contrasinal",
+"Submit" => "Enviar",
+"Download" => "Baixar",
+"No preview available for" => "Sen vista previa dispoñible para ",
+"web services under your control" => "servizos web baixo o seu control"
+);
diff --git a/apps/files_sharing/l10n/ro.php b/apps/files_sharing/l10n/ro.php
new file mode 100644
index 00000000000..4943fcc03c7
--- /dev/null
+++ b/apps/files_sharing/l10n/ro.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Parolă",
+"Submit" => "Trimite",
+"Download" => "Descarcă",
+"No preview available for" => "Nici o previzualizare disponibilă pentru ",
+"web services under your control" => "servicii web controlate de tine"
+);
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
index 958ac1030d7..398d9a8bbc3 100644
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@@ -2,5 +2,6 @@
"Password" => "Пароль",
"Submit" => "Отправить",
"Download" => "Скачать",
+"No preview available for" => "Предпросмотр недоступен для",
"web services under your control" => "веб-сервисы под вашим управлением"
);
diff --git a/apps/files_sharing/l10n/ru_RU.php b/apps/files_sharing/l10n/ru_RU.php
new file mode 100644
index 00000000000..a1579efc8f9
--- /dev/null
+++ b/apps/files_sharing/l10n/ru_RU.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Пароль",
+"Submit" => "Передать",
+"Download" => "Загрузка",
+"No preview available for" => "Предварительный просмотр недоступен",
+"web services under your control" => "веб-сервисы под Вашим контролем"
+);
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
new file mode 100644
index 00000000000..43b86a28c17
--- /dev/null
+++ b/apps/files_sharing/l10n/uk.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Пароль",
+"Download" => "Завантажити"
+);
diff --git a/apps/files_sharing/l10n/vi.php b/apps/files_sharing/l10n/vi.php
new file mode 100644
index 00000000000..d4faee06bf2
--- /dev/null
+++ b/apps/files_sharing/l10n/vi.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Mật khẩu",
+"Submit" => "Xác nhận",
+"Download" => "Tải về",
+"No preview available for" => "Không có xem trước cho",
+"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn"
+);
diff --git a/apps/files_sharing/l10n/zh_CN.GB2312.php b/apps/files_sharing/l10n/zh_CN.GB2312.php
new file mode 100644
index 00000000000..fdde2c641f6
--- /dev/null
+++ b/apps/files_sharing/l10n/zh_CN.GB2312.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "密码",
+"Submit" => "提交",
+"Download" => "下载",
+"No preview available for" => "没有预览可用于",
+"web services under your control" => "您控制的网络服务"
+);
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
new file mode 100644
index 00000000000..27fa634c03d
--- /dev/null
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Password" => "密碼",
+"Submit" => "送出",
+"Download" => "下載",
+"No preview available for" => "無法預覽"
+);
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index c8821ee0fe8..074ca9928d4 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -30,7 +30,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
public function isValidSource($itemSource, $uidOwner) {
$path = OC_FileCache::getPath($itemSource, $uidOwner);
- if (OC_Filesystem::file_exists($path)) {
+ if ($path) {
$this->path = $path;
return true;
}
@@ -47,7 +47,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
}
public function generateTarget($filePath, $shareWith, $exclude = null) {
- $target = $filePath;
+ $target = '/'.basename($filePath);
if (isset($exclude)) {
if ($pos = strrpos($target, '.')) {
$name = substr($target, 0, $pos);
@@ -72,8 +72,16 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
// Only 1 item should come through for this format call
return array('path' => $items[key($items)]['path'], 'permissions' => $items[key($items)]['permissions']);
} else if ($format == self::FORMAT_FILE_APP) {
+ if (isset($parameters['mimetype_filter']) && $parameters['mimetype_filter']) {
+ $mimetype_filter = $parameters['mimetype_filter'];
+ }
$files = array();
foreach ($items as $item) {
+ if (isset($mimetype_filter)
+ && strpos($item['mimetype'], $mimetype_filter) !== 0
+ && $item['mimetype'] != 'httpd/unix-directory') {
+ continue;
+ }
$file = array();
$file['id'] = $item['file_source'];
$file['path'] = $item['file_target'];
@@ -116,4 +124,4 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
return array();
}
-} \ No newline at end of file
+}
diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index 665583e83ad..e29e9b7e002 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -19,7 +19,7 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-class OC_Share_Backend_Folder extends OC_Share_Backend_File {
+class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share_Backend_Collection {
public function formatItems($items, $format, $parameters = null) {
if ($format == self::FORMAT_SHARED_STORAGE) {
@@ -50,12 +50,22 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File {
}
public function getChildren($itemSource) {
- $files = OC_FileCache::getFolderContent($itemSource);
- $sources = array();
- foreach ($files as $file) {
- $sources[] = $file['path'];
+ $children = array();
+ $parents = array($itemSource);
+ while (!empty($parents)) {
+ $parents = "'".implode("','", $parents)."'";
+ $query = OC_DB::prepare('SELECT `id`, `name`, `mimetype` FROM `*PREFIX*fscache` WHERE `parent` IN ('.$parents.')');
+ $result = $query->execute();
+ $parents = array();
+ while ($file = $result->fetchRow()) {
+ $children[] = array('source' => $file['id'], 'file_path' => $file['name']);
+ // If a child folder is found look inside it
+ if ($file['mimetype'] == 'httpd/unix-directory') {
+ $parents[] = $file['id'];
+ }
+ }
}
- return $sources;
+ return $children;
}
} \ No newline at end of file
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 010f6b9de18..525ffa83578 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -1,13 +1,21 @@
<?php
// Load other apps for file previews
OC_App::loadApps();
-if (isset($_GET['file'])) {
- $pos = strpos($_GET['file'], '/', 1);
- $uidOwner = substr($_GET['file'], 1, $pos - 1);
+if (isset($_GET['file']) || isset($_GET['dir'])) {
+ if (isset($_GET['dir'])) {
+ $type = 'folder';
+ $path = $_GET['dir'];
+ $baseDir = basename($path);
+ $dir = $baseDir;
+ } else {
+ $type = 'file';
+ $path = $_GET['file'];
+ }
+ $uidOwner = substr($path, 1, strpos($path, '/', 1) - 1);
if (OCP\User::userExists($uidOwner)) {
OC_Util::setupFS($uidOwner);
- $fileSource = OC_Filecache::getId($_GET['file'], '');
- if ($fileSource != -1 && ($linkItem = OCP\Share::getItemSharedWithByLink('file', $fileSource, $uidOwner))) {
+ $fileSource = OC_Filecache::getId($path, '');
+ if ($fileSource != -1 && ($linkItem = OCP\Share::getItemSharedWithByLink($type, $fileSource, $uidOwner))) {
if (isset($linkItem['share_with'])) {
// Check password
if (isset($_POST['password'])) {
@@ -35,6 +43,16 @@ if (isset($_GET['file'])) {
}
}
$path = $linkItem['path'];
+ if (isset($_GET['path'])) {
+ $path .= $_GET['path'];
+ $dir .= $_GET['path'];
+ if (!OC_Filesystem::file_exists($path)) {
+ header('HTTP/1.0 404 Not Found');
+ $tmpl = new OCP\Template('', '404', 'guest');
+ $tmpl->printPage();
+ exit();
+ }
+ }
// Download the file
if (isset($_GET['download'])) {
$mimetype = OC_Filesystem::getMimeType($path);
@@ -50,18 +68,84 @@ if (isset($_GET['file'])) {
OCP\Util::addScript('files_sharing', 'public');
OCP\Util::addScript('files', 'fileactions');
$tmpl = new OCP\Template('files_sharing', 'public', 'base');
- $tmpl->assign('details', $uidOwner.' shared the file '.basename($path).' with you');
$tmpl->assign('owner', $uidOwner);
- $tmpl->assign('name', basename($path));
// Show file list
if (OC_Filesystem::is_dir($path)) {
- // TODO
+ OCP\Util::addStyle('files', 'files');
+ OCP\Util::addScript('files', 'files');
+ OCP\Util::addScript('files', 'filelist');
+ $files = array();
+ $rootLength = strlen($baseDir) + 1;
+ foreach (OC_Files::getDirectoryContent($path) as $i) {
+ $i['date'] = OCP\Util::formatDate($i['mtime']);
+ if ($i['type'] == 'file') {
+ $fileinfo = pathinfo($i['name']);
+ $i['basename'] = $fileinfo['filename'];
+ $i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
+ }
+ $i['directory'] = substr($i['directory'], $rootLength);
+ if ($i['directory'] == '/') {
+ $i['directory'] = '';
+ }
+ $i['permissions'] = OCP\Share::PERMISSION_READ;
+ $files[] = $i;
+ }
+ // Make breadcrumb
+ $breadcrumb = array();
+ $pathtohere = '';
+ foreach (explode('/', $dir) as $i) {
+ if ($i != '') {
+ if ($i != $baseDir) {
+ $pathtohere .= '/'.$i;
+ }
+ $breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
+ }
+ }
+ $list = new OCP\Template('files', 'part.list', '');
+ $list->assign('files', $files, false);
+ $list->assign('baseURL', OCP\Util::linkToPublic('files').'&dir='.$_GET['dir'].'&path=', false);
+ $list->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.$_GET['dir'].'&path=', false);
+ $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' );
+ $breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
+ $breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files').'&dir='.$_GET['dir'].'&path=', false);
+ $folder = new OCP\Template('files', 'index', '');
+ $folder->assign('fileList', $list->fetchPage(), false);
+ $folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
+ $folder->assign('dir', basename($dir));
+ $folder->assign('isCreatable', false);
+ $folder->assign('permissions', 0);
+ $folder->assign('files', $files);
+ $folder->assign('uploadMaxFilesize', 0);
+ $folder->assign('uploadMaxHumanFilesize', 0);
+ $folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+ $tmpl->assign('folder', $folder->fetchPage(), false);
+ $tmpl->assign('uidOwner', $uidOwner);
+ $tmpl->assign('dir', basename($dir));
+ $tmpl->assign('filename', basename($path));
+ $tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
+ $tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+ if (isset($_GET['path'])) {
+ $getPath = $_GET['path'];
+ } else {
+ $getPath = '';
+ }
+ $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.$_GET['dir'].'&path='.$getPath);
} else {
// Show file preview if viewer is available
+ $tmpl->assign('uidOwner', $uidOwner);
$tmpl->assign('dir', dirname($path));
$tmpl->assign('filename', basename($path));
$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
- $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&file='.$_GET['file'].'&download');
+ if ($type == 'file') {
+ $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&file='.$_GET['file'].'&download');
+ } else {
+ if (isset($_GET['path'])) {
+ $getPath = $_GET['path'];
+ } else {
+ $getPath = '';
+ }
+ $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.$_GET['dir'].'&path='.$getPath);
+ }
}
$tmpl->printPage();
}
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index ca48a35575e..fd9b79e6f17 100755..100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -5,21 +5,33 @@
<header><div id="header">
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
<div class="header-right">
- <span id="details"><?php echo $_['details']; ?></span>
- <a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
+ <?php if (isset($_['folder'])): ?>
+ <span id="details"><?php echo $l->t('%s shared the folder %s with you', array($_['uidOwner'], $_['filename'])) ?></span>
+ <?php else: ?>
+ <span id="details"><?php echo $l->t('%s shared the file %s with you', array($_['uidOwner'], $_['filename'])) ?></span>
+ <?php endif; ?>
+ <?php if (!isset($_['folder']) || $_['allowZipDownload']): ?>
+ <a href="<?php echo $_['downloadURL']; ?>" class="button" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
+ <?php endif; ?>
</div>
</div></header>
<div id="preview">
- <?php if (substr($_['mimetype'], 0 , strpos($_['mimetype'], '/')) == 'image'): ?>
- <img src="<?php echo $_['downloadURL']; ?>" />
+ <?php if (isset($_['folder'])): ?>
+ <?php echo $_['folder']; ?>
+ <?php else: ?>
+ <?php if (substr($_['mimetype'], 0 , strpos($_['mimetype'], '/')) == 'image'): ?>
+ <div id="imgframe">
+ <img src="<?php echo $_['downloadURL']; ?>" />
+ </div>
+ <?php endif; ?>
+ <ul id="noPreview">
+ <li class="error">
+ <?php echo $l->t('No preview available for').' '.$_['filename']; ?><br />
+ <a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
+ </li>
+ </ul>
<?php endif; ?>
- <ul id="noPreview">
- <li class="error">
- <?php echo $l->t('No preview available for').' '.$_['filename']; ?><br />
- <a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
- </li>
- </ul>
<div id="content"></div>
<table></table>
</div>
-<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; <?php echo $l->t('web services under your control'); ?></p></footer> \ No newline at end of file
+<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; <?php echo $l->t('web services under your control'); ?></p></footer>
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index 1c8d083ea42..9075095d286 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -10,25 +10,34 @@ $(document).ready(function() {
$(document).ready(function(){
if (typeof FileActions !== 'undefined') {
- // Add history button to files/index.php
- FileActions.register('file','History', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/history');},function(filename){
-
- if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
-
- var file = $('#dir').val()+'/'+filename;
- // Check if drop down is already visible for a different file
- if (($('#dropdown').length > 0)) {
- if (file != $('#dropdown').data('file')) {
- $('#dropdown').hide('blind', function() {
- $('#dropdown').remove();
- $('tr').removeClass('mouseOver');
- createVersionsDropdown(filename, file);
- });
+ // Add history button to 'files/index.php'
+ FileActions.register(
+ 'file'
+ , t('files_versions', 'History')
+ , OC.PERMISSION_UPDATE
+ , function() {
+ // Specify icon for hitory button
+ return OC.imagePath('core','actions/history');
+ }
+ ,function(filename){
+ // Action to perform when clicked
+ if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
+
+ var file = $('#dir').val()+'/'+filename;
+ // Check if drop down is already visible for a different file
+ if (($('#dropdown').length > 0)) {
+ if (file != $('#dropdown').data('file')) {
+ $('#dropdown').hide('blind', function() {
+ $('#dropdown').remove();
+ $('tr').removeClass('mouseOver');
+ createVersionsDropdown(filename, file);
+ });
+ }
+ } else {
+ createVersionsDropdown(filename, file);
}
- } else {
- createVersionsDropdown(filename, file);
}
- });
+ );
}
});
@@ -42,7 +51,6 @@ function createVersionsDropdown(filename, files) {
html += '<option value=""></option>';
html += '</select>';
html += '</div>';
- //html += '<input type="button" value="Revert file" onclick="revertFile()" />';
html += '<input type="button" value="All versions..." onclick="window.location=\''+historyUrl+'\'" name="makelink" id="makelink" />';
html += '<input id="link" style="display:none; width:90%;" />';
@@ -60,9 +68,7 @@ function createVersionsDropdown(filename, files) {
data: { source: files },
async: false,
success: function( versions ) {
-
- //alert("helo "+OC.linkTo('files_versions', 'ajax/getVersions.php'));
-
+
if (versions) {
$.each( versions, function(index, row ) {
addVersion( row );
@@ -103,7 +109,7 @@ function createVersionsDropdown(filename, files) {
}
- function addVersion(revision ) {
+ function addVersion( revision ) {
name=formatDate(revision.version*1000);
var version=$('<option/>');
version.attr('value',revision.version);
@@ -122,8 +128,23 @@ function createVersionsDropdown(filename, files) {
version.appendTo('#found_versions');
}
-
+
+ $('tr').filterAttr('data-file',filename).addClass('mouseOver');
$('#dropdown').show('blind');
}
+
+$(this).click(
+ function(event) {
+
+ if ($('#dropdown').has(event.target).length === 0) {
+ $('#dropdown').hide('blind', function() {
+ $('#dropdown').remove();
+ $('tr').removeClass('mouseOver');
+ });
+ }
+
+
+ }
+);
diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php
index b6ddc6feecf..d9d966fc7af 100644
--- a/apps/files_versions/l10n/ca.php
+++ b/apps/files_versions/l10n/ca.php
@@ -2,5 +2,6 @@
"Expire all versions" => "Expira totes les versions",
"Versions" => "Versions",
"This will delete all existing backup versions of your files" => "Això eliminarà totes les versions de còpia de seguretat dels vostres fitxers",
-"Enable Files Versioning" => "Habilita les versions de fitxers"
+"Files Versioning" => "Fitxers de Versions",
+"Enable" => "Permetre"
);
diff --git a/apps/files_versions/l10n/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php
index 4f33c1915f2..c99c4a27e82 100644
--- a/apps/files_versions/l10n/cs_CZ.php
+++ b/apps/files_versions/l10n/cs_CZ.php
@@ -2,5 +2,6 @@
"Expire all versions" => "Vypršet všechny verze",
"Versions" => "Verze",
"This will delete all existing backup versions of your files" => "Odstraní všechny existující zálohované verze Vašich souborů",
-"Enable Files Versioning" => "Povolit verzování souborů"
+"Files Versioning" => "Verzování souborů",
+"Enable" => "Povolit"
);
diff --git a/apps/files_versions/l10n/da.php b/apps/files_versions/l10n/da.php
new file mode 100644
index 00000000000..6a69fdbe4cc
--- /dev/null
+++ b/apps/files_versions/l10n/da.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Lad alle versioner udløbe",
+"Versions" => "Versioner",
+"This will delete all existing backup versions of your files" => "Dette vil slette alle eksisterende backupversioner af dine filer"
+);
diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php
index 2c15884d1b5..a568112d02d 100644
--- a/apps/files_versions/l10n/de.php
+++ b/apps/files_versions/l10n/de.php
@@ -1,6 +1,8 @@
<?php $TRANSLATIONS = array(
"Expire all versions" => "Alle Versionen löschen",
+"History" => "Historie",
"Versions" => "Versionen",
"This will delete all existing backup versions of your files" => "Dies löscht alle vorhandenen Sicherungsversionen Ihrer Dateien.",
-"Enable Files Versioning" => "Datei-Versionierung aktivieren"
+"Files Versioning" => "Dateiversionierung",
+"Enable" => "Aktivieren"
);
diff --git a/apps/files_versions/l10n/el.php b/apps/files_versions/l10n/el.php
index 8953c96bd11..24511f37395 100644
--- a/apps/files_versions/l10n/el.php
+++ b/apps/files_versions/l10n/el.php
@@ -1,4 +1,7 @@
<?php $TRANSLATIONS = array(
"Expire all versions" => "Λήξη όλων των εκδόσεων",
-"Enable Files Versioning" => "Ενεργοποίηση παρακολούθησης εκδόσεων αρχείων"
+"Versions" => "Εκδόσεις",
+"This will delete all existing backup versions of your files" => "Αυτό θα διαγράψει όλες τις υπάρχουσες εκδόσεις των αντιγράφων ασφαλείας των αρχείων σας",
+"Files Versioning" => "Εκδόσεις Αρχείων",
+"Enable" => "Ενεργοποίηση"
);
diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php
index 8ec0895638a..d0f89c576d4 100644
--- a/apps/files_versions/l10n/eo.php
+++ b/apps/files_versions/l10n/eo.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
"Expire all versions" => "Eksvalidigi ĉiujn eldonojn",
-"Enable Files Versioning" => "Kapabligi dosiereldonkontrolon"
+"Versions" => "Eldonoj",
+"This will delete all existing backup versions of your files" => "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj"
);
diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php
index 83d7ed0da2c..cff15bce43a 100644
--- a/apps/files_versions/l10n/es.php
+++ b/apps/files_versions/l10n/es.php
@@ -2,5 +2,6 @@
"Expire all versions" => "Expirar todas las versiones",
"Versions" => "Versiones",
"This will delete all existing backup versions of your files" => "Esto eliminará todas las versiones guardadas como copia de seguridad de tus archivos",
-"Enable Files Versioning" => "Habilitar versionamiento de archivos"
+"Files Versioning" => "Versionado de archivos",
+"Enable" => "Habilitar"
);
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
index d136ae241ce..f1ebd082ad5 100644
--- a/apps/files_versions/l10n/et_EE.php
+++ b/apps/files_versions/l10n/et_EE.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
"Expire all versions" => "Kõikide versioonide aegumine",
-"Enable Files Versioning" => "Luba failide versioonihaldus"
+"Versions" => "Versioonid",
+"This will delete all existing backup versions of your files" => "See kustutab kõik sinu failidest tehtud varuversiooni"
);
diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php
index 0f065c1e93c..d4353c96cd6 100644
--- a/apps/files_versions/l10n/eu.php
+++ b/apps/files_versions/l10n/eu.php
@@ -2,5 +2,6 @@
"Expire all versions" => "Iraungi bertsio guztiak",
"Versions" => "Bertsioak",
"This will delete all existing backup versions of your files" => "Honek zure fitxategien bertsio guztiak ezabatuko ditu",
-"Enable Files Versioning" => "Gaitu fitxategien bertsioak"
+"Files Versioning" => "Fitxategien Bertsioak",
+"Enable" => "Gaitu"
);
diff --git a/apps/files_versions/l10n/fa.php b/apps/files_versions/l10n/fa.php
index e2dc6cba63f..98dd415969a 100644
--- a/apps/files_versions/l10n/fa.php
+++ b/apps/files_versions/l10n/fa.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "انقضای تمامی نسخه‌ها",
-"Enable Files Versioning" => "فعال‌کردن پرونده‌های نسخه‌بندی"
+"Expire all versions" => "انقضای تمامی نسخه‌ها"
);
diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php
index 5cfcbf28bd4..7e0894b3f18 100644
--- a/apps/files_versions/l10n/fi_FI.php
+++ b/apps/files_versions/l10n/fi_FI.php
@@ -2,5 +2,6 @@
"Expire all versions" => "Vanhenna kaikki versiot",
"Versions" => "Versiot",
"This will delete all existing backup versions of your files" => "Tämä poistaa kaikki tiedostojesi olemassa olevat varmuuskopioversiot",
-"Enable Files Versioning" => "Käytä tiedostojen versiointia"
+"Files Versioning" => "Tiedostojen versiointi",
+"Enable" => "Käytä"
);
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
index 965fa02de98..b0e658e8df0 100644
--- a/apps/files_versions/l10n/fr.php
+++ b/apps/files_versions/l10n/fr.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Expire all versions" => "Supprimer les versions intermédiaires",
"Versions" => "Versions",
-"This will delete all existing backup versions of your files" => "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date).",
-"Enable Files Versioning" => "Activer le versionnage"
+"This will delete all existing backup versions of your files" => "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date)."
);
diff --git a/apps/files_versions/l10n/gl.php b/apps/files_versions/l10n/gl.php
new file mode 100644
index 00000000000..c0d5937e1b1
--- /dev/null
+++ b/apps/files_versions/l10n/gl.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Caducar todas as versións",
+"Versions" => "Versións",
+"This will delete all existing backup versions of your files" => "Esto eliminará todas as copias de respaldo existentes dos seus ficheiros",
+"Files Versioning" => "Versionado de ficheiros",
+"Enable" => "Habilitar"
+);
diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php
index 097169b2a49..09a013f45a8 100644
--- a/apps/files_versions/l10n/he.php
+++ b/apps/files_versions/l10n/he.php
@@ -1,6 +1,5 @@
<?php $TRANSLATIONS = array(
"Expire all versions" => "הפגת תוקף כל הגרסאות",
"Versions" => "גרסאות",
-"This will delete all existing backup versions of your files" => "פעולה זו תמחק את כל גיבויי הגרסאות הקיימים של הקבצים שלך",
-"Enable Files Versioning" => "הפעלת ניהול גרסאות לקבצים"
+"This will delete all existing backup versions of your files" => "פעולה זו תמחק את כל גיבויי הגרסאות הקיימים של הקבצים שלך"
);
diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php
index b7b0b9627b1..59f7e759b19 100644
--- a/apps/files_versions/l10n/it.php
+++ b/apps/files_versions/l10n/it.php
@@ -2,5 +2,6 @@
"Expire all versions" => "Scadenza di tutte le versioni",
"Versions" => "Versioni",
"This will delete all existing backup versions of your files" => "Ciò eliminerà tutte le versioni esistenti dei tuoi file",
-"Enable Files Versioning" => "Abilita controllo di versione"
+"Files Versioning" => "Controllo di versione dei file",
+"Enable" => "Abilita"
);
diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php
index 81d17f56f8f..8a4e0ab245d 100644
--- a/apps/files_versions/l10n/ja_JP.php
+++ b/apps/files_versions/l10n/ja_JP.php
@@ -2,5 +2,6 @@
"Expire all versions" => "すべてのバージョンを削除する",
"Versions" => "バージョン",
"This will delete all existing backup versions of your files" => "これは、あなたのファイルのすべてのバックアップバージョンを削除します",
-"Enable Files Versioning" => "ファイルのバージョン管理を有効にする"
+"Files Versioning" => "ファイルのバージョン管理",
+"Enable" => "有効化"
);
diff --git a/apps/files_versions/l10n/lt_LT.php b/apps/files_versions/l10n/lt_LT.php
index 5da209f31b9..b3810d06ec7 100644
--- a/apps/files_versions/l10n/lt_LT.php
+++ b/apps/files_versions/l10n/lt_LT.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Panaikinti visų versijų galiojimą",
-"Enable Files Versioning" => "Įjungti failų versijų vedimą"
+"Expire all versions" => "Panaikinti visų versijų galiojimą"
);
diff --git a/apps/files_versions/l10n/nl.php b/apps/files_versions/l10n/nl.php
index da31603ff54..61cdbc2778a 100644
--- a/apps/files_versions/l10n/nl.php
+++ b/apps/files_versions/l10n/nl.php
@@ -2,5 +2,6 @@
"Expire all versions" => "Alle versies laten verlopen",
"Versions" => "Versies",
"This will delete all existing backup versions of your files" => "Dit zal alle bestaande backup versies van uw bestanden verwijderen",
-"Enable Files Versioning" => "Activeer file versioning"
+"Files Versioning" => "Bestand versies",
+"Enable" => "Zet aan"
);
diff --git a/apps/files_versions/l10n/pl.php b/apps/files_versions/l10n/pl.php
index c25d37611a0..949ec0889aa 100644
--- a/apps/files_versions/l10n/pl.php
+++ b/apps/files_versions/l10n/pl.php
@@ -2,5 +2,6 @@
"Expire all versions" => "Wygasają wszystkie wersje",
"Versions" => "Wersje",
"This will delete all existing backup versions of your files" => "Spowoduje to usunięcie wszystkich istniejących wersji kopii zapasowych plików",
-"Enable Files Versioning" => "Włącz wersjonowanie plików"
+"Files Versioning" => "Wersjonowanie plików",
+"Enable" => "Włącz"
);
diff --git a/apps/files_versions/l10n/pt_BR.php b/apps/files_versions/l10n/pt_BR.php
index a90b48fe3a3..102b6d62743 100644
--- a/apps/files_versions/l10n/pt_BR.php
+++ b/apps/files_versions/l10n/pt_BR.php
@@ -1,4 +1,3 @@
<?php $TRANSLATIONS = array(
-"Expire all versions" => "Expirar todas as versões",
-"Enable Files Versioning" => "Habilitar versionamento de arquivos"
+"Expire all versions" => "Expirar todas as versões"
);
diff --git a/apps/files_versions/l10n/ro.php b/apps/files_versions/l10n/ro.php
new file mode 100644
index 00000000000..597be7330c5
--- /dev/null
+++ b/apps/files_versions/l10n/ro.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Expiră toate versiunile",
+"Versions" => "Versiuni",
+"This will delete all existing backup versions of your files" => "Această acțiune va șterge toate versiunile salvate ale fișierelor tale",
+"Files Versioning" => "Versionare fișiere",
+"Enable" => "Activare"
+);
diff --git a/apps/files_versions/l10n/ru.php b/apps/files_versions/l10n/ru.php
index 6a824779f30..f91cae90a14 100644
--- a/apps/files_versions/l10n/ru.php
+++ b/apps/files_versions/l10n/ru.php
@@ -1,4 +1,5 @@
<?php $TRANSLATIONS = array(
"Expire all versions" => "Просрочить все версии",
-"Enable Files Versioning" => "Включить ведение версий файлов"
+"Versions" => "Версии",
+"This will delete all existing backup versions of your files" => "Очистить список версий ваших файлов"
);
diff --git a/apps/files_versions/l10n/ru_RU.php b/apps/files_versions/l10n/ru_RU.php
new file mode 100644
index 00000000000..2563c318bc2
--- /dev/null
+++ b/apps/files_versions/l10n/ru_RU.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Versions" => "Версии",
+"This will delete all existing backup versions of your files" => "Это приведет к удалению всех существующих версий резервной копии ваших файлов",
+"Files Versioning" => "Файлы управления версиями",
+"Enable" => "Включить"
+);
diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php
index aec6edb3c22..9984bcb5e80 100644
--- a/apps/files_versions/l10n/sl.php
+++ b/apps/files_versions/l10n/sl.php
@@ -2,5 +2,6 @@
"Expire all versions" => "Zastaraj vse različice",
"Versions" => "Različice",
"This will delete all existing backup versions of your files" => "To bo izbrisalo vse obstoječe različice varnostnih kopij vaših datotek",
-"Enable Files Versioning" => "Omogoči sledenje različicam datotek"
+"Files Versioning" => "Sledenje različicam",
+"Enable" => "Omogoči"
);
diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php
index 5788d8ae197..218bd6ee2ea 100644
--- a/apps/files_versions/l10n/sv.php
+++ b/apps/files_versions/l10n/sv.php
@@ -2,5 +2,6 @@
"Expire all versions" => "Upphör alla versioner",
"Versions" => "Versioner",
"This will delete all existing backup versions of your files" => "Detta kommer att radera alla befintliga säkerhetskopior av dina filer",
-"Enable Files Versioning" => "Aktivera versionshantering"
+"Files Versioning" => "Versionshantering av filer",
+"Enable" => "Aktivera"
);
diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php
index 4f26e3bd035..62ab0548f4b 100644
--- a/apps/files_versions/l10n/th_TH.php
+++ b/apps/files_versions/l10n/th_TH.php
@@ -2,5 +2,6 @@
"Expire all versions" => "หมดอายุทุกรุ่น",
"Versions" => "รุ่น",
"This will delete all existing backup versions of your files" => "นี่จะเป็นลบทิ้งไฟล์รุ่นที่ทำการสำรองข้อมูลทั้งหมดที่มีอยู่ของคุณทิ้งไป",
-"Enable Files Versioning" => "เปิดใช้งานคุณสมบัติการแยกสถานะรุ่นหรือเวอร์ชั่นของไฟล์"
+"Files Versioning" => "การกำหนดเวอร์ชั่นของไฟล์",
+"Enable" => "เปิดใช้งาน"
);
diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php
new file mode 100644
index 00000000000..992c0751d0a
--- /dev/null
+++ b/apps/files_versions/l10n/vi.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Hết hạn tất cả các phiên bản",
+"Versions" => "Phiên bản",
+"This will delete all existing backup versions of your files" => "Điều này sẽ xóa tất cả các phiên bản sao lưu hiện có "
+);
diff --git a/apps/files_versions/l10n/zh_CN.GB2312.php b/apps/files_versions/l10n/zh_CN.GB2312.php
new file mode 100644
index 00000000000..43af097a21e
--- /dev/null
+++ b/apps/files_versions/l10n/zh_CN.GB2312.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "作废所有版本",
+"Versions" => "版本",
+"This will delete all existing backup versions of your files" => "这将删除所有您现有文件的备份版本",
+"Files Versioning" => "文件版本",
+"Enable" => "启用"
+);
diff --git a/apps/files_versions/l10n/zh_CN.php b/apps/files_versions/l10n/zh_CN.php
index 56a474be89a..1a5caae7dfa 100644
--- a/apps/files_versions/l10n/zh_CN.php
+++ b/apps/files_versions/l10n/zh_CN.php
@@ -2,5 +2,6 @@
"Expire all versions" => "过期所有版本",
"Versions" => "版本",
"This will delete all existing backup versions of your files" => "将会删除您的文件的所有备份版本",
-"Enable Files Versioning" => "开启文件版本"
+"Files Versioning" => "文件版本",
+"Enable" => "开启"
);
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index dedd83fc25a..7d12e58f941 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -35,48 +35,34 @@ class Storage {
const DEFAULTMININTERVAL=60; // 1 min
const DEFAULTMAXVERSIONS=50;
- private $view;
-
- function __construct() {
-
- $this->view = \OCP\Files::getStorage('files_versions');
-
- }
-
- /**
- * listen to write event.
- */
- public static function write_hook($params) {
- if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
- $path = $params[\OC_Filesystem::signal_param_path];
- if($path<>'') $this->store($path);
+ private static function getUidAndFilename($filename)
+ {
+ if (\OCP\App::isEnabled('files_sharing')
+ && substr($filename, 0, 7) == '/Shared'
+ && $source = \OCP\Share::getItemSharedWith('file',
+ substr($filename, 7),
+ \OC_Share_Backend_File::FORMAT_SHARED_STORAGE)) {
+ $filename = $source['path'];
+ $pos = strpos($filename, '/files', 1);
+ $uid = substr($filename, 1, $pos - 1);
+ $filename = substr($filename, $pos + 6);
+ } else {
+ $uid = \OCP\User::getUser();
}
+ return array($uid, $filename);
}
-
-
/**
* store a new version of a file.
*/
public function store($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-
- $files_view = \OCP\Files::getStorage("files");
- $users_view = \OCP\Files::getStorage("files_versions");
- $users_view->chroot(\OCP\User::getUser().'/');
-
- //FIXME OC_Share no longer exists
- //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
- // $pos = strpos($source, '/files', 1);
- // $uid = substr($source, 1, $pos - 1);
- // $filename = substr($source, $pos + 6);
- //} else {
- $uid = \OCP\User::getUser();
- //}
-
- $versionsFolderName=\OCP\Config::getSystemValue('datadirectory') . $this->view->getAbsolutePath('');
+ list($uid, $filename) = self::getUidAndFilename($filename);
+ $files_view = new \OC_FilesystemView('/'.$uid.'/files');
+ $users_view = new \OC_FilesystemView('/'.$uid);
//check if source file already exist as version to avoid recursions.
+ // todo does this check work?
if ($users_view->file_exists($filename)) {
return false;
}
@@ -95,6 +81,10 @@ class Storage {
return false;
}
}
+ // we should have a source file to work with
+ if (!$files_view->file_exists($filename)) {
+ return false;
+ }
// check filesize
if($files_view->filesize($filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)) {
@@ -104,6 +94,8 @@ class Storage {
// check mininterval if the file is being modified by the owner (all shared files should be versioned despite mininterval)
if ($uid == \OCP\User::getUser()) {
+ $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
+ $versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
$matches=glob($versionsFolderName.'/'.$filename.'.v*');
sort($matches);
$parts=explode('.v',end($matches));
@@ -114,11 +106,13 @@ class Storage {
// create all parent folders
- $info=pathinfo($filename);
- if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true);
+ $dirname = dirname($filename);
+ if(!$users_view->file_exists('/files_versions/'.$dirname)) {
+ $users_view->mkdir('/files_versions/'.$dirname,0700,true);
+ }
// store a new version of a file
- @$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.time());
+ $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.time());
// expire old revisions if necessary
Storage::expire($filename);
@@ -132,17 +126,8 @@ class Storage {
public static function rollback($filename,$revision) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
- $users_view = \OCP\Files::getStorage("files_versions");
- $users_view->chroot(\OCP\User::getUser().'/');
-
- //FIXME OC_Share no longer exists
- //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
- // $pos = strpos($source, '/files', 1);
- // $uid = substr($source, 1, $pos - 1);
- // $filename = substr($source, $pos + 6);
- //} else {
- $uid = \OCP\User::getUser();
- //}
+ list($uid, $filename) = self::getUidAndFilename($filename);
+ $users_view = new \OC_FilesystemView('/'.$uid);
// rollback
if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
@@ -164,12 +149,8 @@ class Storage {
*/
public static function isversioned($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
- $versions_fileview = \OCP\Files::getStorage("files_versions");
- //FIXME OC_Share no longer exists
- //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
- // $pos = strpos($source, '/files', 1);
- // $filename = substr($source, $pos + 6);
- //}
+ list($uid, $filename) = self::getUidAndFilename($filename);
+ $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
@@ -196,16 +177,9 @@ class Storage {
public static function getVersions( $filename, $count = 0 ) {
if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
+ list($uid, $filename) = self::getUidAndFilename($filename);
+ $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
- //FIXME OC_Share no longer exists
- //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
- // $pos = strpos($source, '/files', 1);
- // $uid = substr($source, 1, $pos - 1);
- // $filename = substr($source, $pos + 6);
- //} else {
- $uid = \OCP\User::getUser();
- //}
- $versions_fileview = \OCP\Files::getStorage('files_versions');
$versionsFolderName = \OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
$versions = array();
@@ -216,7 +190,7 @@ class Storage {
$i = 0;
- $files_view = \OCP\Files::getStorage('files');
+ $files_view = new \OC_FilesystemView('/'.$uid.'/files');
$local_file = $files_view->getLocalFile($filename);
foreach( $matches as $ma ) {
@@ -270,16 +244,9 @@ class Storage {
*/
public static function expire($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+ list($uid, $filename) = self::getUidAndFilename($filename);
+ $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions');
- //FIXME OC_Share no longer exists
- //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
- // $pos = strpos($source, '/files', 1);
- // $uid = substr($source, 1, $pos - 1);
- // $filename = substr($source, $pos + 6);
- //} else {
- $uid = \OCP\User::getUser();
- //}
- $versions_fileview = \OCP\Files::getStorage("files_versions");
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
// check for old versions
@@ -287,7 +254,7 @@ class Storage {
if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) {
- $numberToDelete = count( $matches-\OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) );
+ $numberToDelete = count($matches) - \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS );
// delete old versions of a file
$deleteItems = array_slice( $matches, 0, $numberToDelete );
@@ -306,6 +273,7 @@ class Storage {
* @return true/false
*/
public function expireAll() {
- return $this->view->deleteAll('', true);
+ $view = \OCP\Files::getStorage('files_versions');
+ return $view->deleteAll('', true);
}
}
diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php
index 8682fc0f499..88063cb075b 100644
--- a/apps/files_versions/templates/settings.php
+++ b/apps/files_versions/templates/settings.php
@@ -1,5 +1,6 @@
<form id="versionssettings">
<fieldset class="personalblock">
- <input type="checkbox" name="versions" id="versions" value="1" <?php if (OCP\Config::getSystemValue('versions', 'true')=='true') echo ' checked="checked"'; ?> /> <label for="versions"><?php echo $l->t('Enable Files Versioning'); ?></label> <br/>
+ <legend><strong><?php echo $l->t('Files Versioning');?></strong></legend>
+ <input type="checkbox" name="versions" id="versions" value="1" <?php if (OCP\Config::getSystemValue('versions', 'true')=='true') echo ' checked="checked"'; ?> /> <label for="versions"><?php echo $l->t('Enable'); ?></label> <br/>
</fieldset>
</form>
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 2c178d0b4fd..df676711792 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -24,7 +24,7 @@
"Do not use it for SSL connections, it will fail." => "Verwenden Sie es nicht für SSL-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 ownCloud server." => "Falls die Verbindung es erfordert, wird das SSL-Zertifikat des LDAP-Server importiert werden.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.",
"Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.",
"User Display Name Field" => "Feld für den Anzeigenamen des Benutzers",
"The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. ",
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index 2f3c747a672..1bb72f163a7 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -1,6 +1,17 @@
<?php $TRANSLATIONS = array(
+"Base DN" => "Base DN",
+"User DN" => "User DN",
"Password" => "Συνθηματικό",
+"User Login Filter" => "User Login Filter",
+"User List Filter" => "User List Filter",
+"Group Filter" => "Group Filter",
"Port" => "Θύρα",
+"Base User Tree" => "Base User Tree",
+"Base Group Tree" => "Base Group Tree",
+"Group-Member association" => "Group-Member association",
+"Use TLS" => "Χρήση TLS",
+"User Display Name Field" => "User Display Name Field",
+"Group Display Name Field" => "Group Display Name Field",
"in bytes" => "σε bytes",
"Help" => "Βοήθεια"
);
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index d62e1212dc7..f83142225e2 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -1,9 +1,31 @@
<?php $TRANSLATIONS = array(
"Host" => "Host",
+"Base DN" => "Baas DN",
+"User DN" => "Kasutaja DN",
"Password" => "Parool",
+"User Login Filter" => "Kasutajanime filter",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "kasuta %%uid kohatäitjat, nt. \"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\".",
"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\".",
"Port" => "Port",
+"Base User Tree" => "Baaskasutaja puu",
+"Base Group Tree" => "Baasgrupi puu",
+"Group-Member association" => "Grupiliikme seotus",
"Use TLS" => "Kasutaja TLS",
+"Do not use it for SSL connections, it will fail." => "Ära kasuta seda SSL ühenduse jaoks, see 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.",
+"User Display Name Field" => "Kasutaja näidatava nime väli",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks.",
+"Group Display Name Field" => "Grupi näidatava nime väli",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks.",
"in bytes" => "baitides",
+"in seconds. A change empties the cache." => "sekundites. Muudatus tühjendab vahemälu.",
+"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.",
"Help" => "Abiinfo"
);
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
new file mode 100644
index 00000000000..68f385358d9
--- /dev/null
+++ b/apps/user_ldap/l10n/ru_RU.php
@@ -0,0 +1,22 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Хост",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://",
+"Base DN" => "База DN",
+"User DN" => "DN пользователя",
+"Password" => "Пароль",
+"For anonymous access, leave DN and Password empty." => "Для анонимного доступа оставьте поля DN и пароль пустыми.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "используйте %%uid заполнитель, например, \"uid=%%uid\"",
+"without any placeholder, e.g. \"objectClass=person\"." => "без каких-либо заполнителей, например, \"objectClass=person\".",
+"Group Filter" => "Групповой фильтр",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без каких-либо заполнителей, например, \"objectClass=posixGroup\".",
+"Port" => "Порт",
+"Use TLS" => "Использовать TLS",
+"Do not use it for SSL connections, it will fail." => "Не используйте это SSL-соединений, это не будет выполнено.",
+"Turn off SSL certificate validation." => "Выключить проверку сертификата SSL.",
+"Not recommended, use for testing only." => "Не рекомендовано, используйте только для тестирования.",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Атрибут LDAP, используемый для создания имени пользователя в ownCloud.",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Атрибут LDAP, используемый для создания группового имени в ownCloud.",
+"in bytes" => "в байтах",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут.",
+"Help" => "Помощь"
+);
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
new file mode 100644
index 00000000000..fd6a88d2372
--- /dev/null
+++ b/apps/user_ldap/l10n/uk.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Пароль",
+"Help" => "Допомога"
+);
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
new file mode 100644
index 00000000000..7a6ac2665c6
--- /dev/null
+++ b/apps/user_ldap/l10n/vi.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Máy chủ",
+"Password" => "Mật khẩu",
+"Port" => "Cổng",
+"Use TLS" => "Sử dụng TLS",
+"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.",
+"User Display Name Field" => "Hiển thị tên người sử dụng",
+"Group Display Name Field" => "Hiển thị tên nhóm",
+"in bytes" => "Theo Byte",
+"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 đỡ"
+);
diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php
new file mode 100644
index 00000000000..8b906aea5ce
--- /dev/null
+++ b/apps/user_ldap/l10n/zh_CN.GB2312.php
@@ -0,0 +1,37 @@
+<?php $TRANSLATIONS = array(
+"Host" => "主机",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "您可以忽略协议,除非您需要 SSL。然后用 ldaps:// 开头",
+"Base DN" => "基本判别名",
+"You can specify Base DN for users and groups in the Advanced tab" => "您可以在高级选项卡中为用户和群组指定基本判别名",
+"User DN" => "用户判别名",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "客户机用户的判别名,将用于绑定,例如 uid=agent, dc=example, dc=com。匿名访问请留空判别名和密码。",
+"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" => "端口",
+"Base User Tree" => "基本用户树",
+"Base Group Tree" => "基本群组树",
+"Group-Member association" => "群组-成员组合",
+"Use TLS" => "使用 TLS",
+"Do not use it for SSL connections, it will fail." => "不要使用它进行 SSL 连接,会失败的。",
+"Case insensitve LDAP server (Windows)" => "大小写不敏感的 LDAP 服务器 (Windows)",
+"Turn off SSL certificate validation." => "关闭 SSL 证书校验。",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "如果只有使用此选项才能连接,请导入 LDAP 服务器的 SSL 证书到您的 ownCloud 服务器。",
+"Not recommended, use for testing only." => "不推荐,仅供测试",
+"User Display Name Field" => "用户显示名称字段",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "用于生成用户的 ownCloud 名称的 LDAP 属性。",
+"Group Display Name Field" => "群组显示名称字段",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "用于生成群组的 ownCloud 名称的 LDAP 属性。",
+"in bytes" => "以字节计",
+"in seconds. A change empties the cache." => "以秒计。修改会清空缓存。",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "用户名请留空 (默认)。否则,请指定一个 LDAP/AD 属性。",
+"Help" => "帮助"
+);
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
new file mode 100644
index 00000000000..5f6200db404
--- /dev/null
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Host" => "主机",
+"Base DN" => "Base DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "您可以在高级选项卡里为用户和组指定Base DN",
+"User DN" => "User DN",
+"Password" => "密码",
+"Port" => "端口",
+"Help" => "帮助"
+);
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 089548a69ba..d855ae2a163 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -206,21 +206,17 @@ abstract class Access {
$dn = $this->sanitizeDN($dn);
$table = $this->getMapTable($isUser);
if($isUser) {
+ $fncFindMappedName = 'findMappedUser';
$nameAttribute = $this->connection->ldapUserDisplayName;
} else {
+ $fncFindMappedName = 'findMappedGroup';
$nameAttribute = $this->connection->ldapGroupDisplayName;
}
- $query = \OCP\DB::prepare('
- SELECT `owncloud_name`
- FROM `'.$table.'`
- WHERE `ldap_dn` = ?
- ');
-
//let's try to retrieve the ownCloud name from the mappings table
- $component = $query->execute(array($dn))->fetchOne();
- if($component) {
- return $component;
+ $ocname = $this->$fncFindMappedName($dn);
+ if($ocname) {
+ return $ocname;
}
//second try: get the UUID and check if it is known. Then, update the DN and return the name.
@@ -295,25 +291,48 @@ abstract class Access {
return $this->ldap2ownCloudNames($ldapGroups, false);
}
+ private function findMappedUser($dn) {
+ static $query = null;
+ if(is_null($query)) {
+ $query = \OCP\DB::prepare('
+ SELECT `owncloud_name`
+ FROM `'.$this->getMapTable(true).'`
+ WHERE `ldap_dn` = ?'
+ );
+ }
+ $res = $query->execute(array($dn))->fetchOne();
+ if($res) {
+ return $res;
+ }
+ return false;
+ }
+
+ private function findMappedGroup($dn) {
+ static $query = null;
+ if(is_null($query)) {
+ $query = \OCP\DB::prepare('
+ SELECT `owncloud_name`
+ FROM `'.$this->getMapTable(false).'`
+ WHERE `ldap_dn` = ?'
+ );
+ }
+ $res = $query->execute(array($dn))->fetchOne();
+ if($res) {
+ return $res;
+ }
+ return false;
+ }
+
+
private function ldap2ownCloudNames($ldapObjects, $isUsers) {
if($isUsers) {
- $knownObjects = $this->mappedUsers();
$nameAttribute = $this->connection->ldapUserDisplayName;
} else {
- $knownObjects = $this->mappedGroups();
$nameAttribute = $this->connection->ldapGroupDisplayName;
}
$ownCloudNames = array();
foreach($ldapObjects as $ldapObject) {
- $key = \OCP\Util::recursiveArraySearch($knownObjects, $ldapObject['dn']);
-
- //everything is fine when we know the group
- if($key !== false) {
- $ownCloudNames[] = $knownObjects[$key]['owncloud_name'];
- continue;
- }
-
$ocname = $this->dn2ocname($ldapObject['dn'], $ldapObject[$nameAttribute], $isUsers);
if($ocname) {
$ownCloudNames[] = $ocname;
@@ -385,7 +404,7 @@ abstract class Access {
$sqlAdjustment = '';
$dbtype = \OCP\Config::getSystemValue('dbtype');
if($dbtype == 'mysql') {
- $sqlAdjustment = 'FROM `dual`';
+ $sqlAdjustment = 'FROM DUAL';
}
$insert = \OCP\DB::prepare('
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 1922e7ff1f2..bf65d9ad91c 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -258,7 +258,7 @@ class Connection {
if(empty($this->config['ldapGroupFilter']) && empty($this->config['ldapGroupMemberAssocAttr'])) {
\OCP\Util::writeLog('user_ldap', 'No group filter is specified, LDAP group feature will not be used.', \OCP\Util::INFO);
}
- if(!in_array($this->config['ldapUuidAttribute'], array('auto','entryuuid', 'nsuniqueid', 'objectguid'))) {
+ if(!in_array($this->config['ldapUuidAttribute'], array('auto','entryuuid', 'nsuniqueid', 'objectguid')) && (!is_null($this->configID))) {
\OCP\Config::setAppValue($this->configID, 'ldap_uuid_attribute', 'auto');
\OCP\Util::writeLog('user_ldap', 'Illegal value for the UUID Attribute, reset to autodetect.', \OCP\Util::INFO);
}
@@ -357,4 +357,4 @@ class Connection {
return true;
}
-} \ No newline at end of file
+}
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index aff519226c8..b265a8339ef 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -43,7 +43,7 @@ class Jobs {
if(empty($actualGroups) && empty($knownGroups)) {
\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – groups do not seem to be configured properly, aborting.', \OCP\Util::INFO);
- \OCP\setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time());
+ \OCP\Config::setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time());
return;
}
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 3ace97d4d02..446d4cc32ec 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -21,6 +21,8 @@
require_once '../../lib/base.php';
OC_JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSource'])) {
switch ($_POST['action']) {
case 'share':
@@ -55,6 +57,12 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
($return) ? OC_JSON::success() : OC_JSON::error();
}
break;
+ case 'setExpirationDate':
+ if (isset($_POST['date'])) {
+ $return = OCP\Share::setExpirationDate($_POST['itemType'], $_POST['itemSource'], $_POST['date']);
+ ($return) ? OC_JSON::success() : OC_JSON::error();
+ }
+ break;
}
} else if (isset($_GET['fetch'])) {
switch ($_GET['fetch']) {
@@ -72,7 +80,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
$reshare = false;
}
if ($_GET['checkShares'] == 'true') {
- $shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource']);
+ $shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
} else {
$shares = false;
}
@@ -82,23 +90,23 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
case 'getShareWith':
if (isset($_GET['search'])) {
$shareWith = array();
- if (OC_App::isEnabled('contacts')) {
- // TODO Add function to contacts to only get the 'fullname' column to improve performance
- $ids = OC_Contacts_Addressbook::activeIds();
- foreach ($ids as $id) {
- $vcards = OC_Contacts_VCard::all($id);
- foreach ($vcards as $vcard) {
- $contact = $vcard['fullname'];
- if (stripos($contact, $_GET['search']) !== false
- && (!isset($_GET['itemShares'])
- || !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
- || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
- || !in_array($contact, $_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]))) {
- $shareWith[] = array('label' => $contact, 'value' => array('shareType' => 5, 'shareWith' => $vcard['id']));
- }
- }
- }
- }
+// if (OC_App::isEnabled('contacts')) {
+// // TODO Add function to contacts to only get the 'fullname' column to improve performance
+// $ids = OC_Contacts_Addressbook::activeIds();
+// foreach ($ids as $id) {
+// $vcards = OC_Contacts_VCard::all($id);
+// foreach ($vcards as $vcard) {
+// $contact = $vcard['fullname'];
+// if (stripos($contact, $_GET['search']) !== false
+// && (!isset($_GET['itemShares'])
+// || !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
+// || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
+// || !in_array($contact, $_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]))) {
+// $shareWith[] = array('label' => $contact, 'value' => array('shareType' => 5, 'shareWith' => $vcard['id']));
+// }
+// }
+// }
+// }
$count = 0;
$users = array();
$limit = 0;
diff --git a/core/css/share.css b/core/css/share.css
index cccc3585a47..c2fa051b129 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -17,4 +17,6 @@ a.unshare { float:right; display:inline; padding:.3em 0 0 .3em !important; opaci
a.unshare:hover { opacity:1; }
#link { border-top:1px solid #ddd; padding-top:0.5em; }
#dropdown input[type="text"], #dropdown input[type="password"] { width:90%; }
-#linkText, #linkPass { display:none; }
+#linkText, #linkPass, #expiration { display:none; }
+#link #showPassword img { width:12px; padding-left: 0.3em; }
+#link label, #expiration label{ padding-left: 0.5em; } \ No newline at end of file
diff --git a/core/css/styles.css b/core/css/styles.css
index 488ac48e4b4..7d855556c84 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -143,6 +143,10 @@ a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padd
.exception{color: #000000;}
.exception textarea{width:95%;height: 200px;background:#ffe;border:0;}
+.ui-icon-circle-triangle-e{ background-image: url('../img/actions/play-next.svg'); }
+.ui-icon-circle-triangle-w{ background-image: url('../img/actions/play-previous.svg'); }
+.ui-datepicker-prev,.ui-datepicker-next{ border: 1px solid #ddd; background: #ffffff; }
+
/* ---- DIALOGS ---- */
#dirtree {width: 100%;}
#filelist {height: 270px; overflow:scroll; background-color: white; width: 100%;}
@@ -169,3 +173,8 @@ a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padd
.arrow.left { left: -13px; bottom: 1.2em; -webkit-transform: rotate(270deg); -moz-transform: rotate(270deg); -o-transform: rotate(270deg); -ms-transform: rotate(270deg); transform: rotate(270deg); }
.arrow.up { top: -8px; right: 2em; }
.arrow.down { -webkit-transform: rotate(180deg); -moz-transform: rotate(180deg); -o-transform: rotate(180deg); -ms-transform: rotate(180deg); transform: rotate(180deg); }
+
+/* ---- BREADCRUMB ---- */
+div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
+div.crumb:first-child { padding-left:1em; }
+div.crumb.last { font-weight:bold; }
diff --git a/core/img/actions/clock.png b/core/img/actions/clock.png
new file mode 100644
index 00000000000..671b3f4f0c1
--- /dev/null
+++ b/core/img/actions/clock.png
Binary files differ
diff --git a/core/img/actions/clock.svg b/core/img/actions/clock.svg
new file mode 100755
index 00000000000..1821f474df5
--- /dev/null
+++ b/core/img/actions/clock.svg
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 100 100" xml:space="preserve">
+<path d="M50,89.836c-23.389,0-42.418-19.027-42.418-42.417C7.582,24.029,26.611,5,50,5c23.389,0,42.418,19.029,42.418,42.419 C92.418,70.809,73.389,89.836,50,89.836z M50,9.912c-20.681,0-37.506,16.826-37.506,37.508c0,20.681,16.826,37.505,37.506,37.505 s37.507-16.824,37.507-37.505C87.507,26.737,70.681,9.912,50,9.912z"/>
+<path d="M50.001,49.875c-0.141,0-0.283-0.011-0.427-0.037c-1.173-0.206-2.03-1.226-2.03-2.419V29.442c0-1.355,1.1-2.456,2.456-2.456 c1.355,0,2.456,1.1,2.456,2.456v4.003l5.431-14.974c0.464-1.274,1.872-1.937,3.146-1.471c1.274,0.462,1.934,1.871,1.471,3.146 l-10.195,28.11C51.952,49.241,51.019,49.875,50.001,49.875z"/>
+<circle cx="49.999" cy="12.956" r="1.617"/>
+<path d="M50,14.778c-1.006,0-1.823-0.817-1.823-1.823c0-1.005,0.817-1.823,1.823-1.823c1.004,0,1.821,0.817,1.821,1.823 C51.821,13.961,51.004,14.778,50,14.778z M50,11.542c-0.779,0-1.414,0.635-1.414,1.413c0,0.779,0.635,1.414,1.414,1.414 s1.412-0.635,1.412-1.414C51.412,12.177,50.779,11.542,50,11.542z"/>
+<circle cx="34.343" cy="20.301" r="1.47"/>
+<path d="M23.617,30.488c0.703,0.409,0.945,1.305,0.537,2.008c-0.405,0.704-1.305,0.947-2.007,0.538 c-0.703-0.403-0.945-1.305-0.539-2.008C22.016,30.325,22.913,30.085,23.617,30.488z"/>
+<circle cx="15.536" cy="47.42" r="1.618"/>
+<path d="M15.536,49.242c-1.006,0-1.823-0.817-1.823-1.823c0.001-1,0.819-1.819,1.823-1.822c1.006,0,1.823,0.817,1.823,1.822 C17.359,48.425,16.542,49.242,15.536,49.242z M15.536,46.006c-0.777,0.003-1.412,0.636-1.414,1.413c0,0.779,0.635,1.414,1.414,1.414 s1.413-0.635,1.413-1.414C16.949,46.641,16.315,46.006,15.536,46.006z"/>
+<path d="M22.147,61.803c0.705-0.406,1.602-0.167,2.007,0.537c0.408,0.703,0.166,1.602-0.537,2.008 c-0.704,0.406-1.604,0.163-2.008-0.537C21.202,63.104,21.447,62.209,22.147,61.803z"/>
+<path d="M33.07,73.803c0.408-0.706,1.305-0.946,2.008-0.537c0.704,0.403,0.945,1.302,0.538,2.005 c-0.405,0.704-1.307,0.947-2.007,0.537C32.904,75.402,32.667,74.507,33.07,73.803z"/>
+<path d="M48.382,81.884c0-0.896,0.725-1.618,1.618-1.618c0.892-0.003,1.618,0.723,1.618,1.618c0,0.892-0.728,1.618-1.618,1.618 C49.104,83.498,48.385,82.775,48.382,81.884z"/>
+<path d="M50,83.706L50,83.706c-1.002-0.003-1.819-0.82-1.823-1.822c0-1.006,0.817-1.823,1.823-1.823 c1.007,0,1.822,0.817,1.822,1.823C51.822,82.889,51.006,83.706,50,83.706z M50.006,80.47c-0.785,0-1.42,0.635-1.42,1.414 c0.003,0.775,0.637,1.41,1.414,1.413c0.78,0,1.413-0.635,1.413-1.413C51.413,81.104,50.782,80.47,50.006,80.47z"/>
+<path d="M64.385,75.271c-0.408-0.703-0.167-1.602,0.537-2.005c0.702-0.409,1.601-0.169,2.008,0.537 c0.406,0.7,0.163,1.603-0.539,2.005C65.686,76.214,64.791,75.971,64.385,75.271z"/>
+<path d="M76.384,64.348c-0.704-0.406-0.945-1.305-0.537-2.008c0.402-0.704,1.301-0.943,2.006-0.537 c0.704,0.402,0.945,1.308,0.539,2.008C77.98,64.511,77.087,64.751,76.384,64.348z"/>
+<path d="M84.464,49.038c-0.896-0.003-1.618-0.726-1.618-1.618c-0.001-0.892,0.723-1.618,1.618-1.618 c0.893-0.003,1.618,0.726,1.618,1.618C86.077,48.315,85.356,49.034,84.464,49.038z"/>
+<path d="M84.464,49.242L84.464,49.242c-1.006-0.003-1.822-0.822-1.822-1.823c-0.002-0.486,0.188-0.943,0.532-1.287 c0.344-0.345,0.803-0.535,1.29-0.535c1.007,0,1.822,0.817,1.822,1.822C86.282,48.422,85.463,49.239,84.464,49.242z M84.471,46.006 c-0.386,0-0.74,0.147-1.008,0.416c-0.267,0.267-0.412,0.621-0.412,0.998c0,0.777,0.635,1.41,1.413,1.414 c0.775-0.003,1.408-0.638,1.413-1.415C85.877,46.641,85.246,46.006,84.471,46.006z"/>
+<path d="M77.853,33.034c-0.705,0.409-1.604,0.166-2.006-0.538c-0.408-0.7-0.168-1.599,0.537-2.008 c0.701-0.406,1.604-0.163,2.008,0.537C78.795,31.732,78.553,32.627,77.853,33.034z"/>
+<path d="M66.93,21.036c-0.407,0.704-1.308,0.943-2.008,0.537c-0.704-0.403-0.945-1.305-0.537-2.008 c0.404-0.703,1.306-0.943,2.006-0.537C67.095,19.437,67.333,20.333,66.93,21.036z"/>
+</svg> \ No newline at end of file
diff --git a/core/img/actions/lock.png b/core/img/actions/lock.png
new file mode 100644
index 00000000000..511bfa615bb
--- /dev/null
+++ b/core/img/actions/lock.png
Binary files differ
diff --git a/core/img/actions/lock.svg b/core/img/actions/lock.svg
new file mode 100755
index 00000000000..8fb039b9e3b
--- /dev/null
+++ b/core/img/actions/lock.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="16px" height="16px" viewBox="0 0 71 100" xml:space="preserve">
+<path d="M65.5,45V30c0-16.542-13.458-30-30-30s-30,13.458-30,30v15H0v55h71V45H65.5z M13.5,30c0-12.131,9.869-22,22-22
+ s22,9.869,22,22v15h-44V30z"/>
+</svg>
diff --git a/core/js/js.js b/core/js/js.js
index 1bd650bb6b8..e3c3716e055 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -154,6 +154,12 @@ OC={
$('head').append(style);
}
},
+ basename: function(path) {
+ return path.replace(/\\/g,'/').replace( /.*\//, '' );
+ },
+ dirname: function(path) {
+ return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');;
+ },
/**
* do a search query and display the results
* @param query the search query
@@ -238,6 +244,49 @@ OC.search.lastResults={};
OC.addStyle.loaded=[];
OC.addScript.loaded=[];
+OC.Breadcrumb={
+ container:null,
+ crumbs:[],
+ push:function(name, link){
+ if(!OC.Breadcrumb.container){//default
+ OC.Breadcrumb.container=$('#controls');
+ }
+ var crumb=$('<div/>');
+ crumb.addClass('crumb').addClass('last');
+ crumb.attr('style','background-image:url("'+OC.imagePath('core','breadcrumb')+'")');
+
+ var crumbLink=$('<a/>');
+ crumbLink.attr('href',link);
+ crumbLink.text(name);
+ crumb.append(crumbLink);
+
+ var existing=OC.Breadcrumb.container.find('div.crumb');
+ if(existing.length){
+ existing.removeClass('last');
+ existing.last().after(crumb);
+ }else{
+ OC.Breadcrumb.container.append(crumb);
+ }
+ OC.Breadcrumb.crumbs.push(crumb);
+ return crumb;
+ },
+ pop:function(){
+ if(!OC.Breadcrumb.container){//default
+ OC.Breadcrumb.container=$('#controls');
+ }
+ OC.Breadcrumb.container.find('div.crumb').last().remove();
+ OC.Breadcrumb.container.find('div.crumb').last().addClass('last');
+ OC.Breadcrumb.crumbs.pop();
+ },
+ clear:function(){
+ if(!OC.Breadcrumb.container){//default
+ OC.Breadcrumb.container=$('#controls');
+ }
+ OC.Breadcrumb.container.find('div.crumb').remove();
+ OC.Breadcrumb.crumbs=[];
+ }
+}
+
if(typeof localStorage !='undefined' && localStorage != null){
//user and instance awere localstorage
OC.localStorage={
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 4dd3c89c14d..2467af61121 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -106,7 +106,7 @@ var OCdialogs = {
var c_name = 'oc-dialog-'+OCdialogs.dialogs_counter+'-content';
var c_id = '#'+c_name;
var d = '<div id="'+c_name+'" title="'+title+'"><select id="dirtree"><option value="0">'+OC.currentUser+'</option></select><div id="filelist"></div><div class="filepicker_loader"><img src="'+OC.filePath('gallery','img','loading.gif')+'"></div></div>';
- if (!modal) modal = false; // Huh..?
+ if (!modal) modal = false; // Huh..
if (!multiselect) multiselect = false;
$('body').append(d);
$(c_id + ' #dirtree').focus(function() {
@@ -120,7 +120,7 @@ var OCdialogs = {
}).data('multiselect', multiselect).data('mimetype',mimetype_filter);
// build buttons
var b = [{
- text: t('dialogs', 'Choose'),
+ text: t('core', 'Choose'),
click: function(){
if (callback != undefined) {
var p;
@@ -140,7 +140,7 @@ var OCdialogs = {
}
},
{
- text: t('dialogs', 'Cancel'),
+ text: t('core', 'Cancel'),
click: function(){$(c_id).dialog('close'); }}
];
$(c_id).dialog({width: ((4*$('body').width())/9), height: 400, modal: modal, buttons: b});
@@ -156,11 +156,11 @@ var OCdialogs = {
var b = [];
switch (buttons) {
case OCdialogs.YES_NO_BUTTONS:
- b[1] = {text: t('dialogs', 'No'), click: function(){ if (callback != undefined) callback(false); $(c_id).dialog('close'); }};
- b[0] = {text: t('dialogs', 'Yes'), click: function(){ if (callback != undefined) callback(true); $(c_id).dialog('close');}};
+ b[1] = {text: t('core', 'No'), click: function(){ if (callback != undefined) callback(false); $(c_id).dialog('close'); }};
+ b[0] = {text: t('core', 'Yes'), click: function(){ if (callback != undefined) callback(true); $(c_id).dialog('close');}};
break;
case OCdialogs.OK_CANCEL_BUTTONS:
- b[1] = {text: t('dialogs', 'Cancel'), click: function(){$(c_id).dialog('close'); }};
+ b[1] = {text: t('core', 'Cancel'), click: function(){$(c_id).dialog('close'); }};
case OCdialogs.OK_BUTTON: // fallthrough
var f;
switch(dialog_type) {
@@ -174,7 +174,7 @@ var OCdialogs = {
f = function(){OCdialogs.form_ok_handler(callback, c_id)};
break;
}
- b[0] = {text: t('dialogs', 'Ok'), click: f};
+ b[0] = {text: t('core', 'Ok'), click: f};
break;
}
var possible_height = ($('tr', d).size()+1)*30;
diff --git a/core/js/share.js b/core/js/share.js
index b5e8b0e6613..c105a27dc0e 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -35,21 +35,29 @@ OC.Share={
}
}
var shares = false;
+ var link = false;
+ var image = OC.imagePath('core', 'actions/share');
$.each(OC.Share.itemShares, function(index) {
- if (OC.Share.itemShares[index].length > 0) {
- shares = true;
- return;
+ if (OC.Share.itemShares[index]) {
+ if (index == OC.Share.SHARE_TYPE_LINK) {
+ if (OC.Share.itemShares[index] == true) {
+ shares = true;
+ image = OC.imagePath('core', 'actions/public');
+ link = true;
+ return;
+ }
+ } else if (OC.Share.itemShares[index].length > 0) {
+ shares = true;
+ image = OC.imagePath('core', 'actions/shared');
+ }
}
});
+ if (itemType != 'file' && itemType != 'folder') {
+ $('a.share[data-item="'+itemSource+'"]').css('background', 'url('+image+') no-repeat center');
+ }
if (shares) {
- $('a.share[data-item="'+itemSource+'"]').css('background', 'url('+OC.imagePath('core', 'actions/shared')+') no-repeat center');
- if (typeof OC.Share.statuses[itemSource] === 'undefined') {
- OC.Share.statuses[itemSource] = false;
- }
+ OC.Share.statuses[itemSource] = link;
} else {
- if (itemType != 'file' && itemType != 'folder') {
- $('a.share[data-item="'+itemSource+'"]').css('background', 'url('+OC.imagePath('core', 'actions/share')+') no-repeat center');
- }
delete OC.Share.statuses[itemSource];
}
},
@@ -71,7 +79,8 @@ OC.Share={
var item = itemSource;
}
if (typeof OC.Share.statuses[item] === 'undefined') {
- checkShares = false;
+ // NOTE: Check does not always work and misses some shares, fix later
+ checkShares = true;
} else {
checkShares = true;
}
@@ -91,7 +100,7 @@ OC.Share={
callback(result.data);
}
} else {
- OC.dialogs.alert(result.data.message, 'Error while sharing');
+ OC.dialogs.alert(result.data.message, t('core', 'Error while sharing'));
}
});
},
@@ -102,14 +111,14 @@ OC.Share={
callback();
}
} else {
- OC.dialogs.alert('Error', 'Error while unsharing');
+ OC.dialogs.alert(t('core', 'Error'), t('core', 'Error while unsharing'));
}
});
},
setPermissions:function(itemType, itemSource, shareType, shareWith, permissions) {
$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setPermissions', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) {
if (!result || result.status !== 'success') {
- OC.dialogs.alert('Error', 'Error while changing permissions');
+ OC.dialogs.alert(t('core', 'Error'), t('core', 'Error while changing permissions'));
}
});
},
@@ -118,28 +127,30 @@ OC.Share={
var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
if (data.reshare) {
if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
- html += '<span class="reshare">Shared with you and the group '+data.reshare.share_with+' by '+data.reshare.uid_owner+'</span>';
+ html += '<span class="reshare">'+t('core', 'Shared with you and the group %s by %s', data.reshare.share_with, data.reshare.uid_owner)+'</span>';
} else {
- html += '<span class="reshare">Shared with you by '+data.reshare.uid_owner+'</span>';
+ html += '<span class="reshare">'+t('core', 'Shared with you by %s', data.reshare.uid_owner)+'</span>';
}
html += '<br />';
}
if (possiblePermissions & OC.PERMISSION_SHARE) {
- html += '<input id="shareWith" type="text" placeholder="Share with" />';
+ html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />';
html += '<ul id="shareWithList">';
html += '</ul>';
if (link) {
html += '<div id="link">';
- html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">Share with link</label>';
- // TODO Change to lock/unlock icon?
- html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="Password protect" src="'+OC.imagePath('core', 'actions/triangle-n')+'"/></a>';
+ html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share with link')+'</label>';
+ html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="'+t('core', 'Password protect')+'" src="'+OC.imagePath('core', 'actions/lock')+'"/></a>';
html += '<br />';
html += '<input id="linkText" type="text" readonly="readonly" />';
html += '<div id="linkPass">';
- html += '<input id="linkPassText" type="password" placeholder="Password" />';
+ html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
html += '</div>';
html += '</div>';
}
+ html += '<div id="expiration">';
+ html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>';
+ html += '<input id="expirationDate" type="text" placeholder="'+t('core', 'Expiration date')+'" style="display:none; width:90%;" />';
html += '</div>';
$(html).appendTo(appendTo);
// Reset item shares
@@ -149,7 +160,11 @@ OC.Share={
if (share.share_type == OC.Share.SHARE_TYPE_LINK) {
OC.Share.showLink(itemSource, share.share_with);
} else {
- OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions);
+ if (share.collection) {
+ OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, share.collection);
+ } else {
+ OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, false);
+ }
}
});
}
@@ -162,12 +177,12 @@ OC.Share={
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: 'Share via email: '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
- } else {
- response(['No people found']);
- }
+// 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: %s', search.term), value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
+// } else {
+ response([t('core', 'No people found')]);
+// }
}
});
// }
@@ -192,7 +207,7 @@ OC.Share={
}
});
} else {
- html += '<input id="shareWith" type="text" placeholder="Resharing is not allowed" style="width:90%;" disabled="disabled"/>';
+ html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Resharing is not allowed')+'" style="width:90%;" disabled="disabled"/>';
html += '</div>';
$(html).appendTo(appendTo);
}
@@ -213,58 +228,74 @@ OC.Share={
}
});
},
- addShareWith:function(shareType, shareWith, permissions, possiblePermissions) {
+ addShareWith:function(shareType, shareWith, permissions, possiblePermissions, collection) {
if (!OC.Share.itemShares[shareType]) {
OC.Share.itemShares[shareType] = [];
}
OC.Share.itemShares[shareType].push(shareWith);
- var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = '';
- if (permissions & OC.PERMISSION_CREATE) {
- createChecked = 'checked="checked"';
- editChecked = 'checked="checked"';
- }
- if (permissions & OC.PERMISSION_UPDATE) {
- updateChecked = 'checked="checked"';
- editChecked = 'checked="checked"';
- }
- if (permissions & OC.PERMISSION_DELETE) {
- deleteChecked = 'checked="checked"';
- editChecked = 'checked="checked"';
- }
- if (permissions & OC.PERMISSION_SHARE) {
- shareChecked = 'checked="checked"';
- }
- var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'">';
- html += shareWith;
- if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
- if (editChecked == '') {
- html += '<label style="display:none;">';
+ if (collection) {
+ if (collection.item_type == 'file' || collection.item_type == 'folder') {
+ var item = collection.path;
} else {
- html += '<label>';
+ var item = collection.item_source;
}
- html += '<input type="checkbox" name="edit" class="permissions" '+editChecked+' />can edit</label>';
- }
- html += '<a href="#" class="showCruds" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
- html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
- html += '<div class="cruds" style="display:none;">';
- if (possiblePermissions & OC.PERMISSION_CREATE) {
- html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.PERMISSION_CREATE+'" />create</label>';
+ var collectionList = $('#shareWithList li').filterAttr('data-collection', item);
+ if (collectionList.length > 0) {
+ $(collectionList).append(', '+shareWith);
+ } else {
+ var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in %s with %s', item, shareWith)+'</li>';
+ $('#shareWithList').prepend(html);
}
- if (possiblePermissions & OC.PERMISSION_UPDATE) {
- html += '<label><input type="checkbox" name="update" class="permissions" '+updateChecked+' data-permissions="'+OC.PERMISSION_UPDATE+'" />update</label>';
+ } else {
+ var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = '';
+ if (permissions & OC.PERMISSION_CREATE) {
+ createChecked = 'checked="checked"';
+ editChecked = 'checked="checked"';
}
- if (possiblePermissions & OC.PERMISSION_DELETE) {
- html += '<label><input type="checkbox" name="delete" class="permissions" '+deleteChecked+' data-permissions="'+OC.PERMISSION_DELETE+'" />delete</label>';
+ if (permissions & OC.PERMISSION_UPDATE) {
+ updateChecked = 'checked="checked"';
+ editChecked = 'checked="checked"';
}
- if (possiblePermissions & OC.PERMISSION_SHARE) {
- html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />share</label>';
+ if (permissions & OC.PERMISSION_DELETE) {
+ deleteChecked = 'checked="checked"';
+ editChecked = 'checked="checked"';
}
- html += '</div>';
- html += '</li>';
- $(html).appendTo('#shareWithList');
-
+ if (permissions & OC.PERMISSION_SHARE) {
+ shareChecked = 'checked="checked"';
+ }
+ var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'">';
+ html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
+ html += shareWith;
+ if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
+ if (editChecked == '') {
+ html += '<label style="display:none;">';
+ } else {
+ html += '<label>';
+ }
+ html += '<input type="checkbox" name="edit" class="permissions" '+editChecked+' />'+t('core', 'can edit')+'</label>';
+ }
+ html += '<a href="#" class="showCruds" style="display:none;"><img class="svg" alt="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
+ html += '<div class="cruds" style="display:none;">';
+ if (possiblePermissions & OC.PERMISSION_CREATE) {
+ html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.PERMISSION_CREATE+'" />'+t('core', 'create')+'</label>';
+ }
+ if (possiblePermissions & OC.PERMISSION_UPDATE) {
+ html += '<label><input type="checkbox" name="update" class="permissions" '+updateChecked+' data-permissions="'+OC.PERMISSION_UPDATE+'" />'+t('core', 'update')+'</label>';
+ }
+ if (possiblePermissions & OC.PERMISSION_DELETE) {
+ html += '<label><input type="checkbox" name="delete" class="permissions" '+deleteChecked+' data-permissions="'+OC.PERMISSION_DELETE+'" />'+t('core', 'delete')+'</label>';
+ }
+ if (possiblePermissions & OC.PERMISSION_SHARE) {
+ html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />'+t('core', 'share')+'</label>';
+ }
+ html += '</div>';
+ html += '</li>';
+ $(html).appendTo('#shareWithList');
+ $('#expiration').show();
+ }
},
showLink:function(itemSource, password) {
+ OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true;
$('#linkCheckbox').attr('checked', true);
var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
if ($('#dir').val() == '/') {
@@ -279,8 +310,9 @@ OC.Share={
$('#showPassword').show();
if (password != null) {
$('#linkPass').show('blind');
- $('#linkPassText').attr('placeholder', 'Password protected');
+ $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
}
+ $('#expiration').show();
},
hideLink:function() {
$('#linkText').hide('blind');
@@ -358,6 +390,9 @@ $(document).ready(function() {
var index = OC.Share.itemShares[shareType].indexOf(shareWith);
OC.Share.itemShares[shareType].splice(index, 1);
OC.Share.updateIcon(itemType, itemSource);
+ if (typeof OC.Share.statuses[itemSource] === 'undefined') {
+ $('#expiration').hide();
+ }
});
});
@@ -395,12 +430,17 @@ $(document).ready(function() {
// Create a link
OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, function() {
OC.Share.showLink(itemSource);
- // TODO Change icon
+ OC.Share.updateIcon(itemType, itemSource);
});
} else {
// Delete private link
OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
OC.Share.hideLink();
+ OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false;
+ OC.Share.updateIcon(itemType, itemSource);
+ if (typeof OC.Share.statuses[itemSource] === 'undefined') {
+ $('#expiration').hide();
+ }
});
}
});
@@ -420,8 +460,31 @@ $(document).ready(function() {
var itemSource = $('#dropdown').data('item-source');
OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
$('#linkPassText').val('');
- $('#linkPassText').attr('placeholder', 'Password protected');
+ $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
});
}
});
+
+ $('#expirationCheckbox').live('click', function() {
+ if (this.checked) {
+ $('#expirationDate').before('<br />');
+ $('#expirationDate').show();
+ $('#expirationDate').datepicker({
+ dateFormat : 'dd-mm-yy'
+ });
+ } else {
+ $('#expirationDate').hide();
+ }
+ });
+
+ $('#expirationDate').live('change', function() {
+ var itemType = $('#dropdown').data('item-type');
+ var itemSource = $('#dropdown').data('item-source');
+ $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
+ if (!result || result.status !== 'success') {
+ OC.dialogs.alert(t('core', 'Error'), t('core', 'Error setting expiration date'));
+ }
+ });
+ });
+
});
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 4b694f33bd8..6efe63cc2af 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Settings" => "تعديلات",
+"Password" => "كلمة السر",
"Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
"You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
"Requested" => "تم طلب",
@@ -17,7 +18,6 @@
"Help" => "المساعدة",
"Cloud not found" => "لم يتم إيجاد",
"Create an <strong>admin account</strong>" => "أضف </strong>مستخدم رئيسي <strong>",
-"Password" => "كلمة السر",
"Advanced" => "خيارات متقدمة",
"Data folder" => "مجلد المعلومات",
"Configure the database" => "أسس قاعدة البيانات",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 19b32a700ba..779abe075aa 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -19,6 +19,7 @@
"Ok" => "Добре",
"No categories selected for deletion." => "Няма избрани категории за изтриване",
"Error" => "Грешка",
+"Password" => "Парола",
"You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.",
"Requested" => "Заявено",
"Login failed!" => "Входа пропадна!",
@@ -37,7 +38,6 @@
"Edit categories" => "Редактиране на категориите",
"Add" => "Добавяне",
"Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
-"Password" => "Парола",
"Advanced" => "Разширено",
"Data folder" => "Директория за данни",
"Configure the database" => "Конфигуриране на базата",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 6c70c29e6cb..11f93d5fbbf 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -21,6 +21,7 @@
"Ok" => "D'acord",
"No categories selected for deletion." => "No hi ha categories per eliminar.",
"Error" => "Error",
+"Password" => "Contrasenya",
"ownCloud password reset" => "estableix de nou la contrasenya Owncloud",
"Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {link}",
"You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
@@ -42,7 +43,6 @@
"Edit categories" => "Edita les categories",
"Add" => "Afegeix",
"Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
-"Password" => "Contrasenya",
"Advanced" => "Avançat",
"Data folder" => "Carpeta de dades",
"Configure the database" => "Configura la base de dades",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 6a4dad08cbd..64941f0df40 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Žádné kategorie nebyly vybrány ke smazání.",
"Error" => "Chyba",
+"Password" => "Heslo",
"ownCloud password reset" => "Obnovení hesla pro ownCloud",
"Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}",
"You will receive a link to reset your password via Email." => "Bude Vám e-mailem zaslán odkaz pro obnovu hesla.",
@@ -42,7 +43,6 @@
"Edit categories" => "Upravit kategorie",
"Add" => "Přidat",
"Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>",
-"Password" => "Heslo",
"Advanced" => "Pokročilé",
"Data folder" => "Složka s daty",
"Configure the database" => "Nastavit databázi",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 4bb953a4c5d..d724eba3bff 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -21,6 +21,7 @@
"Ok" => "OK",
"No categories selected for deletion." => "Ingen kategorier valgt",
"Error" => "Fejl",
+"Password" => "Kodeord",
"ownCloud password reset" => "Nulstil ownCloud kodeord",
"Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
"You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
@@ -42,7 +43,6 @@
"Edit categories" => "Rediger kategorier",
"Add" => "Tilføj",
"Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
-"Password" => "Kodeord",
"Advanced" => "Avanceret",
"Data folder" => "Datamappe",
"Configure the database" => "Konfigurer databasen",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 611c208fe4d..225fd6192ba 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,5 +1,5 @@
<?php $TRANSLATIONS = array(
-"Application name not provided." => "Applikationsname nicht angegeben",
+"Application name not provided." => "Der Anwendungsname wurde nicht angegeben.",
"No category to add?" => "Keine Kategorie hinzuzufügen?",
"This category already exists: " => "Kategorie existiert bereits:",
"Settings" => "Einstellungen",
@@ -15,12 +15,23 @@
"October" => "Oktober",
"November" => "November",
"December" => "Dezember",
+"Choose" => "Auswählen",
"Cancel" => "Abbrechen",
"No" => "Nein",
"Yes" => "Ja",
"Ok" => "OK",
"No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.",
"Error" => "Fehler",
+"Error while sharing" => "Fehler beim Teilen",
+"Error while changing permissions" => "Fehler beim Ändern der Rechte",
+"Password" => "Passwort",
+"can edit" => "kann bearbeiten",
+"access control" => "Zugriffskontrolle",
+"create" => "erstellen",
+"update" => "aktualisieren",
+"delete" => "löschen",
+"share" => "teilen",
+"Password protected" => "Passwort geschützt",
"ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
"Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
"You will receive a link to reset your password via Email." => "Sie erhalten einen Link, um Ihr Passwort per E-Mail zurückzusetzen.",
@@ -42,7 +53,6 @@
"Edit categories" => "Kategorien bearbeiten",
"Add" => "Hinzufügen",
"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
-"Password" => "Passwort",
"Advanced" => "Erweitert",
"Data folder" => "Datenverzeichnis",
"Configure the database" => "Datenbank einrichten",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 18a26f892c0..ce341176adf 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -21,6 +21,7 @@
"Ok" => "Οκ",
"No categories selected for deletion." => "Δεν επιλέχτηκαν κατηγορίες για διαγραφή",
"Error" => "Σφάλμα",
+"Password" => "Κωδικός",
"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." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
@@ -42,7 +43,6 @@
"Edit categories" => "Επεξεργασία κατηγορίας",
"Add" => "Προσθήκη",
"Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
-"Password" => "Κωδικός",
"Advanced" => "Για προχωρημένους",
"Data folder" => "Φάκελος δεδομένων",
"Configure the database" => "Διαμόρφωση της βάσης δεδομένων",
@@ -50,6 +50,7 @@
"Database user" => "Χρήστης της βάσης δεδομένων",
"Database password" => "Κωδικός πρόσβασης βάσης δεδομένων",
"Database name" => "Όνομα βάσης δεδομένων",
+"Database tablespace" => "Κενά Πινάκων Βάσης Δεδομένων",
"Database host" => "Διακομιστής βάσης δεδομένων",
"Finish setup" => "Ολοκλήρωση εγκατάστασης",
"web services under your control" => "Υπηρεσίες web υπό τον έλεγχό σας",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 930b20a30af..9e03abfdc23 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -21,6 +21,7 @@
"Ok" => "Akcepti",
"No categories selected for deletion." => "Neniu kategorio elektiĝis por forigo.",
"Error" => "Eraro",
+"Password" => "Pasvorto",
"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}",
"You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
@@ -42,7 +43,6 @@
"Edit categories" => "Redakti kategoriojn",
"Add" => "Aldoni",
"Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
-"Password" => "Pasvorto",
"Advanced" => "Progresinta",
"Data folder" => "Datuma dosierujo",
"Configure the database" => "Agordi la datumbazon",
@@ -50,6 +50,7 @@
"Database user" => "Datumbaza uzanto",
"Database password" => "Datumbaza pasvorto",
"Database name" => "Datumbaza nomo",
+"Database tablespace" => "Datumbaza tabelospaco",
"Database host" => "Datumbaza gastigo",
"Finish setup" => "Fini la instalon",
"web services under your control" => "TTT-servoj sub via kontrolo",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 21866d2ed67..8a0219abe59 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -21,6 +21,7 @@
"Ok" => "Aceptar",
"No categories selected for deletion." => "No hay categorías seleccionadas para borrar.",
"Error" => "Fallo",
+"Password" => "Contraseña",
"ownCloud password reset" => "Reiniciar contraseña de ownCloud",
"Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
"You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
@@ -42,7 +43,6 @@
"Edit categories" => "Editar categorías",
"Add" => "Añadir",
"Create an <strong>admin account</strong>" => "Crea una <strong>cuenta de administrador</strong>",
-"Password" => "Contraseña",
"Advanced" => "Avanzado",
"Data folder" => "Directorio de almacenamiento",
"Configure the database" => "Configurar la base de datos",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 871cc25fee0..bc97cd04036 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.",
"Error" => "Viga",
+"Password" => "Parool",
"ownCloud password reset" => "ownCloud parooli taastamine",
"Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
"You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
@@ -42,7 +43,6 @@
"Edit categories" => "Muuda kategooriaid",
"Add" => "Lisa",
"Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>",
-"Password" => "Parool",
"Advanced" => "Lisavalikud",
"Data folder" => "Andmete kaust",
"Configure the database" => "Seadista andmebaasi",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 9e9717dd8d8..948057aa3c3 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -21,6 +21,7 @@
"Ok" => "Ados",
"No categories selected for deletion." => "Ez da ezabatzeko kategoriarik hautatu.",
"Error" => "Errorea",
+"Password" => "Pasahitza",
"ownCloud password reset" => "ownCloud-en pasahitza berrezarri",
"Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
"You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
@@ -42,7 +43,6 @@
"Edit categories" => "Editatu kategoriak",
"Add" => "Gehitu",
"Create an <strong>admin account</strong>" => "Sortu <strong>kudeatzaile kontu<strong> bat",
-"Password" => "Pasahitza",
"Advanced" => "Aurreratua",
"Data folder" => "Datuen karpeta",
"Configure the database" => "Konfiguratu datu basea",
@@ -50,6 +50,7 @@
"Database user" => "Datubasearen erabiltzailea",
"Database password" => "Datubasearen pasahitza",
"Database name" => "Datubasearen izena",
+"Database tablespace" => "Datu basearen taula-lekua",
"Database host" => "Datubasearen hostalaria",
"Finish setup" => "Bukatu konfigurazioa",
"web services under your control" => "web zerbitzuak zure kontrolpean",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 7b7af3937b8..2b96162c0cc 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -21,6 +21,7 @@
"Ok" => "قبول",
"No categories selected for deletion." => "هیج دسته ای برای پاک شدن انتخاب نشده است",
"Error" => "خطا",
+"Password" => "گذرواژه",
"ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
"Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
"You will receive a link to reset your password via Email." => "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
@@ -42,7 +43,6 @@
"Edit categories" => "ویرایش گروه ها",
"Add" => "افزودن",
"Create an <strong>admin account</strong>" => "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
-"Password" => "گذرواژه",
"Advanced" => "حرفه ای",
"Data folder" => "پوشه اطلاعاتی",
"Configure the database" => "پایگاه داده برنامه ریزی شدند",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index d253ee9433a..ac3c3f9147e 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
"Error" => "Virhe",
+"Password" => "Salasana",
"ownCloud password reset" => "ownCloud-salasanan nollaus",
"Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
"You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
@@ -42,7 +43,6 @@
"Edit categories" => "Muokkaa luokkia",
"Add" => "Lisää",
"Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
-"Password" => "Salasana",
"Advanced" => "Lisäasetukset",
"Data folder" => "Datakansio",
"Configure the database" => "Muokkaa tietokantaa",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 2904ebf48b2..1b26a315e23 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Aucune catégorie sélectionnée pour suppression",
"Error" => "Erreur",
+"Password" => "Mot de passe",
"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}",
"You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.",
@@ -42,7 +43,6 @@
"Edit categories" => "Modifier les catégories",
"Add" => "Ajouter",
"Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
-"Password" => "Mot de passe",
"Advanced" => "Avancé",
"Data folder" => "Répertoire des données",
"Configure the database" => "Configurer la base de données",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index af849712199..61c113c5915 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Non hai categorías seleccionadas para eliminar.",
"Error" => "Erro",
+"Password" => "Contrasinal",
"ownCloud password reset" => "Restablecer contrasinal de ownCloud",
"Use the following link to reset your password: {link}" => "Use a seguinte ligazón para restablecer o contrasinal: {link}",
"You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo electrónico para restablecer o contrasinal",
@@ -42,7 +43,6 @@
"Edit categories" => "Editar categorias",
"Add" => "Engadir",
"Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
-"Password" => "Contrasinal",
"Advanced" => "Avanzado",
"Data folder" => "Cartafol de datos",
"Configure the database" => "Configurar a base de datos",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index f0a18103a8f..0be59b8baef 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -21,6 +21,7 @@
"Ok" => "בסדר",
"No categories selected for deletion." => "לא נבחרו קטגוריות למחיקה",
"Error" => "שגיאה",
+"Password" => "ססמה",
"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." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
@@ -42,7 +43,6 @@
"Edit categories" => "עריכת הקטגוריות",
"Add" => "הוספה",
"Create an <strong>admin account</strong>" => "יצירת <strong>חשבון מנהל</strong>",
-"Password" => "ססמה",
"Advanced" => "מתקדם",
"Data folder" => "תיקיית נתונים",
"Configure the database" => "הגדרת מסד הנתונים",
@@ -50,6 +50,7 @@
"Database user" => "שם משתמש במסד הנתונים",
"Database password" => "ססמת מסד הנתונים",
"Database name" => "שם מסד הנתונים",
+"Database tablespace" => "מרחב הכתובות של מסד הנתונים",
"Database host" => "שרת בסיס נתונים",
"Finish setup" => "סיום התקנה",
"web services under your control" => "שירותי רשת בשליטתך",
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index cc9cbdb22f3..c84f76c4e49 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -1,8 +1,8 @@
<?php $TRANSLATIONS = array(
+"Password" => "पासवर्ड",
"Username" => "प्रयोक्ता का नाम",
"Cloud not found" => "क्लौड नहीं मिला ",
"Create an <strong>admin account</strong>" => "व्यवस्थापक खाता बनाएँ",
-"Password" => "पासवर्ड",
"Advanced" => "उन्नत",
"Configure the database" => "डेटाबेस कॉन्फ़िगर करें ",
"Database user" => "डेटाबेस उपयोगकर्ता",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 723cceb4d01..c8f683d8270 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -21,6 +21,7 @@
"Ok" => "U redu",
"No categories selected for deletion." => "Nema odabranih kategorija za brisanje.",
"Error" => "Pogreška",
+"Password" => "Lozinka",
"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.",
@@ -42,7 +43,6 @@
"Edit categories" => "Uredi kategorije",
"Add" => "Dodaj",
"Create an <strong>admin account</strong>" => "Stvori <strong>administratorski račun</strong>",
-"Password" => "Lozinka",
"Advanced" => "Dodatno",
"Data folder" => "Mapa baze podataka",
"Configure the database" => "Konfiguriraj bazu podataka",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index a97c4cb8861..9a1f3a1abf3 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Nincs törlésre jelölt kategória",
"Error" => "Hiba",
+"Password" => "Jelszó",
"ownCloud password reset" => "ownCloud jelszó-visszaállítás",
"Use the following link to reset your password: {link}" => "Használja az alábbi linket a jelszó-visszaállításhoz: {link}",
"You will receive a link to reset your password via Email." => "Egy e-mailben kap értesítést a jelszóváltoztatás módjáról.",
@@ -42,7 +43,6 @@
"Edit categories" => "Kategóriák szerkesztése",
"Add" => "Hozzáadás",
"Create an <strong>admin account</strong>" => "<strong>Rendszergazdafiók</strong> létrehozása",
-"Password" => "Jelszó",
"Advanced" => "Haladó",
"Data folder" => "Adatkönyvtár",
"Configure the database" => "Adatbázis konfigurálása",
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index e202daafa32..862c5eb0a29 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -1,6 +1,7 @@
<?php $TRANSLATIONS = array(
"This category already exists: " => "Iste categoria jam existe:",
"Settings" => "Configurationes",
+"Password" => "Contrasigno",
"ownCloud password reset" => "Reinitialisation del contrasigno de ownCLoud",
"Requested" => "Requestate",
"Login failed!" => "Initio de session fallite!",
@@ -20,7 +21,6 @@
"Edit categories" => "Modificar categorias",
"Add" => "Adder",
"Create an <strong>admin account</strong>" => "Crear un <strong>conto de administration</strong>",
-"Password" => "Contrasigno",
"Advanced" => "Avantiate",
"Data folder" => "Dossier de datos",
"Configure the database" => "Configurar le base de datos",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 47758f8861b..c71d767dbf5 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -20,6 +20,7 @@
"Yes" => "Ya",
"Ok" => "Oke",
"No categories selected for deletion." => "Tidak ada kategori terpilih untuk penghapusan.",
+"Password" => "Password",
"ownCloud password reset" => "reset password ownCloud",
"Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk mereset password anda: {link}",
"You will receive a link to reset your password via Email." => "Anda akan mendapatkan link untuk mereset password anda lewat Email.",
@@ -41,7 +42,6 @@
"Edit categories" => "Edit kategori",
"Add" => "Tambahkan",
"Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
-"Password" => "Password",
"Advanced" => "Tingkat Lanjut",
"Data folder" => "Folder data",
"Configure the database" => "Konfigurasi database",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 8d9ac21cd43..d6f8df73eb9 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.",
"Error" => "Errore",
+"Password" => "Password",
"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}",
"You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email",
@@ -42,7 +43,6 @@
"Edit categories" => "Modifica le categorie",
"Add" => "Aggiungi",
"Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
-"Password" => "Password",
"Advanced" => "Avanzate",
"Data folder" => "Cartella dati",
"Configure the database" => "Configura il database",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 62f5e16f3ca..94f51ce76d1 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -21,6 +21,7 @@
"Ok" => "OK",
"No categories selected for deletion." => "削除するカテゴリが選択されていません。",
"Error" => "エラー",
+"Password" => "パスワード",
"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." => "メールでパスワードをリセットするリンクが届きます。",
@@ -42,7 +43,6 @@
"Edit categories" => "カテゴリを編集",
"Add" => "追加",
"Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
-"Password" => "パスワード",
"Advanced" => "詳細設定",
"Data folder" => "データフォルダ",
"Configure the database" => "データベースを設定してください",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 9f82a79c43c..0430495861d 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -21,6 +21,7 @@
"Ok" => "승락",
"No categories selected for deletion." => "삭제 카테고리를 선택하지 않았습니다.",
"Error" => "에러",
+"Password" => "암호",
"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." => "전자 우편으로 암호 재설정 링크를 보냈습니다.",
@@ -42,7 +43,6 @@
"Edit categories" => "카테고리 편집",
"Add" => "추가",
"Create an <strong>admin account</strong>" => "<strong>관리자 계정</strong>을 만드십시오",
-"Password" => "암호",
"Advanced" => "고급",
"Data folder" => "자료 폴더",
"Configure the database" => "데이터베이스 구성",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 0959e0ed25f..de8ab502721 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -21,6 +21,7 @@
"Ok" => "OK",
"No categories selected for deletion." => "Keng Kategorien ausgewielt fir ze läschen.",
"Error" => "Fehler",
+"Password" => "Passwuert",
"ownCloud password reset" => "ownCloud Passwuert reset",
"Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert ze reseten: {link}",
"You will receive a link to reset your password via Email." => "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt.",
@@ -42,7 +43,6 @@
"Edit categories" => "Kategorien editéieren",
"Add" => "Bäisetzen",
"Create an <strong>admin account</strong>" => "En <strong>Admin Account</strong> uleeën",
-"Password" => "Passwuert",
"Advanced" => "Advanced",
"Data folder" => "Daten Dossier",
"Configure the database" => "Datebank konfiguréieren",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 0a3320351cf..4839c667718 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -21,6 +21,7 @@
"Ok" => "Gerai",
"No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.",
"Error" => "Klaida",
+"Password" => "Slaptažodis",
"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}",
"You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
@@ -42,7 +43,6 @@
"Edit categories" => "Redaguoti kategorijas",
"Add" => "Pridėti",
"Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>",
-"Password" => "Slaptažodis",
"Advanced" => "Išplėstiniai",
"Data folder" => "Duomenų katalogas",
"Configure the database" => "Nustatyti duomenų bazę",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 6435c501587..7825d5aec1e 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Settings" => "Iestatījumi",
+"Password" => "Parole",
"Use the following link to reset your password: {link}" => "Izmantojiet šo linku lai mainītu paroli",
"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.",
"Requested" => "Obligāts",
@@ -16,7 +17,6 @@
"Admin" => "Administrators",
"Help" => "Palīdzība",
"Cloud not found" => "Mākonis netika atrasts",
-"Password" => "Parole",
"Data folder" => "Datu mape",
"Configure the database" => "Nokonfigurēt datubāzi",
"will be used" => "tiks izmantots",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 3eea6cd58d1..149dd4a5b40 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -21,6 +21,7 @@
"Ok" => "Во ред",
"No categories selected for deletion." => "Не е одбрана категорија за бришење.",
"Error" => "Грешка",
+"Password" => "Лозинка",
"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." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
@@ -42,7 +43,6 @@
"Edit categories" => "Уреди категории",
"Add" => "Додади",
"Create an <strong>admin account</strong>" => "Направете <strong>администраторска сметка</strong>",
-"Password" => "Лозинка",
"Advanced" => "Напредно",
"Data folder" => "Фолдер со податоци",
"Configure the database" => "Конфигурирај ја базата",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index c99c510be62..8a271660e4a 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "tiada kategori dipilih untuk penghapusan",
"Error" => "Ralat",
+"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",
@@ -42,7 +43,6 @@
"Edit categories" => "Edit kategori",
"Add" => "Tambah",
"Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
-"Password" => "Kata laluan",
"Advanced" => "Maju",
"Data folder" => "Fail data",
"Configure the database" => "Konfigurasi pangkalan data",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index a8bfebb8a55..e8e76bad4c3 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Ingen kategorier merket for sletting.",
"Error" => "Feil",
+"Password" => "Passord",
"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.",
@@ -42,7 +43,6 @@
"Edit categories" => "Rediger kategorier",
"Add" => "Legg til",
"Create an <strong>admin account</strong>" => "opprett en <strong>administrator-konto</strong>",
-"Password" => "Passord",
"Advanced" => "Avansert",
"Data folder" => "Datamappe",
"Configure the database" => "Konfigurer databasen",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 3497381f74c..eeb81d1c204 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Geen categorie geselecteerd voor verwijdering.",
"Error" => "Fout",
+"Password" => "Wachtwoord",
"ownCloud password reset" => "ownCloud wachtwoord herstellen",
"Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
"You will receive a link to reset your password via Email." => "U ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail.",
@@ -42,7 +43,6 @@
"Edit categories" => "Wijzigen categorieën",
"Add" => "Toevoegen",
"Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
-"Password" => "Wachtwoord",
"Advanced" => "Geavanceerd",
"Data folder" => "Gegevensmap",
"Configure the database" => "Configureer de databank",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 9dfce36049f..147afb35fbd 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Settings" => "Innstillingar",
+"Password" => "Passord",
"Use the following link to reset your password: {link}" => "Bruk føljane link til å tilbakestille passordet ditt: {link}",
"You will receive a link to reset your password via Email." => "Du vil få ei lenkje for å nullstilla passordet via epost.",
"Requested" => "Førespurt",
@@ -17,7 +18,6 @@
"Help" => "Hjelp",
"Cloud not found" => "Fann ikkje skyen",
"Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
-"Password" => "Passord",
"Advanced" => "Avansert",
"Data folder" => "Datamappe",
"Configure the database" => "Konfigurer databasen",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 5f8752b69bb..791bbf3d6ea 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Nie ma kategorii zaznaczonych do usunięcia.",
"Error" => "Błąd",
+"Password" => "Hasło",
"ownCloud password reset" => "restart hasła",
"Use the following link to reset your password: {link}" => "Proszę użyć tego odnośnika do zresetowania hasła: {link}",
"You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
@@ -42,7 +43,6 @@
"Edit categories" => "Edytuj kategorię",
"Add" => "Dodaj",
"Create an <strong>admin account</strong>" => "Tworzenie <strong>konta administratora</strong>",
-"Password" => "Hasło",
"Advanced" => "Zaawansowane",
"Data folder" => "Katalog danych",
"Configure the database" => "Konfiguracja bazy danych",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 9ad2f3de53f..4940e474157 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Nenhuma categoria selecionada para deletar.",
"Error" => "Erro",
+"Password" => "Senha",
"ownCloud password reset" => "Redefinir senha ownCloud",
"Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
"You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha via e-mail.",
@@ -42,7 +43,6 @@
"Edit categories" => "Editar categorias",
"Add" => "Adicionar",
"Create an <strong>admin account</strong>" => "Criar uma <strong>conta</strong> de <strong>administrador</strong>",
-"Password" => "Senha",
"Advanced" => "Avançado",
"Data folder" => "Pasta de dados",
"Configure the database" => "Configurar o banco de dados",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 4da513c1aec..4ab9958f430 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Nenhuma categoria seleccionar para eliminar",
"Error" => "Erro",
+"Password" => "Palavra chave",
"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}",
"You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
@@ -42,7 +43,6 @@
"Edit categories" => "Editar categorias",
"Add" => "Adicionar",
"Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>",
-"Password" => "Palavra chave",
"Advanced" => "Avançado",
"Data folder" => "Pasta de dados",
"Configure the database" => "Configure a base de dados",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 484a47727dc..8647cc11901 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -3,6 +3,25 @@
"No category to add?" => "Nici o categorie de adăugat?",
"This category already exists: " => "Această categorie deja există:",
"Settings" => "Configurări",
+"January" => "Ianuarie",
+"February" => "Februarie",
+"March" => "Martie",
+"April" => "Aprilie",
+"May" => "Mai",
+"June" => "Iunie",
+"July" => "Iulie",
+"August" => "August",
+"September" => "Septembrie",
+"October" => "Octombrie",
+"November" => "Noiembrie",
+"December" => "Decembrie",
+"Cancel" => "Anulare",
+"No" => "Nu",
+"Yes" => "Da",
+"Ok" => "Ok",
+"No categories selected for deletion." => "Nici o categorie selectată pentru ștergere.",
+"Error" => "Eroare",
+"Password" => "Parola",
"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}",
"You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
@@ -24,7 +43,6 @@
"Edit categories" => "Editează categoriile",
"Add" => "Adaugă",
"Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
-"Password" => "Parola",
"Advanced" => "Avansat",
"Data folder" => "Director date",
"Configure the database" => "Configurează baza de date",
@@ -32,6 +50,7 @@
"Database user" => "Utilizatorul bazei de date",
"Database password" => "Parola bazei de date",
"Database name" => "Numele bazei de date",
+"Database tablespace" => "Tabela de spațiu a bazei de date",
"Database host" => "Bază date",
"Finish setup" => "Finalizează instalarea",
"web services under your control" => "servicii web controlate de tine",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 81b579aeb0d..4aec059d407 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -21,6 +21,7 @@
"Ok" => "Ок",
"No categories selected for deletion." => "Нет категорий для удаления.",
"Error" => "Ошибка",
+"Password" => "Пароль",
"ownCloud password reset" => "Сброс пароля ",
"Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
"You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
@@ -42,7 +43,6 @@
"Edit categories" => "Редактировать категории",
"Add" => "Добавить",
"Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>",
-"Password" => "Пароль",
"Advanced" => "Дополнительно",
"Data folder" => "Директория с данными",
"Configure the database" => "Настройка базы данных",
@@ -50,6 +50,7 @@
"Database user" => "Имя пользователя для базы данных",
"Database password" => "Пароль для базы данных",
"Database name" => "Название базы данных",
+"Database tablespace" => "Табличое пространство базы данных",
"Database host" => "Хост базы данных",
"Finish setup" => "Завершить установку",
"web services under your control" => "Сетевые службы под твоим контролем",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
new file mode 100644
index 00000000000..6dc4dfea76a
--- /dev/null
+++ b/core/l10n/ru_RU.php
@@ -0,0 +1,64 @@
+<?php $TRANSLATIONS = array(
+"Application name not provided." => "Имя приложения не предоставлено.",
+"No category to add?" => "Нет категории для добавления?",
+"This category already exists: " => "Эта категория уже существует:",
+"Settings" => "Настройки",
+"January" => "Январь",
+"February" => "Февраль",
+"March" => "Март",
+"April" => "Апрель",
+"May" => "Май",
+"June" => "Июнь",
+"July" => "Июль",
+"August" => "Август",
+"September" => "Сентябрь",
+"October" => "Октябрь",
+"November" => "Ноябрь",
+"December" => "Декабрь",
+"Cancel" => "Отмена",
+"No" => "Нет",
+"Yes" => "Да",
+"Ok" => "Да",
+"No categories selected for deletion." => "Нет категорий, выбранных для удаления.",
+"Error" => "Ошибка",
+"Password" => "Пароль",
+"ownCloud password reset" => "Переназначение пароля",
+"Use the following link to reset your password: {link}" => "Воспользуйтесь следующей ссылкой для переназначения пароля: {link}",
+"You will receive a link to reset your password via Email." => "Вы получите ссылку для восстановления пароля по электронной почте.",
+"Requested" => "Запрашиваемое",
+"Login failed!" => "Войти не удалось!",
+"Username" => "Имя пользователя",
+"Request reset" => "Сброс запроса",
+"Your password was reset" => "Ваш пароль был переустановлен",
+"To login page" => "На страницу входа",
+"New password" => "Новый пароль",
+"Reset password" => "Переназначение пароля",
+"Personal" => "Персональный",
+"Users" => "Пользователи",
+"Apps" => "Приложения",
+"Admin" => "Администратор",
+"Help" => "Помощь",
+"Access forbidden" => "Доступ запрещен",
+"Cloud not found" => "Облако не найдено",
+"Edit categories" => "Редактирование категорий",
+"Add" => "Добавить",
+"Create an <strong>admin account</strong>" => "Создать <strong>admin account</strong>",
+"Advanced" => "Расширенный",
+"Data folder" => "Папка данных",
+"Configure the database" => "Настроить базу данных",
+"will be used" => "будет использоваться",
+"Database user" => "Пользователь базы данных",
+"Database password" => "Пароль базы данных",
+"Database name" => "Имя базы данных",
+"Database tablespace" => "Табличная область базы данных",
+"Database host" => "Сервер базы данных",
+"Finish setup" => "Завершение настройки",
+"web services under your control" => "веб-сервисы под Вашим контролем",
+"Log out" => "Выйти",
+"Lost your password?" => "Забыли пароль?",
+"remember" => "запомнить",
+"Log in" => "Войти",
+"You are logged out." => "Вы вышли из системы.",
+"prev" => "предыдущий",
+"next" => "следующий"
+);
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 8c3339170d6..069a169b5df 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Neboli vybrané žiadne kategórie pre odstránenie.",
"Error" => "Chyba",
+"Password" => "Heslo",
"ownCloud password reset" => "Obnovenie hesla pre ownCloud",
"Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
"You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte E-mailom.",
@@ -38,11 +39,10 @@
"Admin" => "Administrácia",
"Help" => "Pomoc",
"Access forbidden" => "Prístup odmietnutý",
-"Cloud not found" => "Nedokážem nájsť",
+"Cloud not found" => "Nenájdené",
"Edit categories" => "Úprava kategórií",
"Add" => "Pridať",
"Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>",
-"Password" => "Heslo",
"Advanced" => "Pokročilé",
"Data folder" => "Priečinok dát",
"Configure the database" => "Nastaviť databázu",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index b7850c28619..a87c6785ddb 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -21,6 +21,7 @@
"Ok" => "V redu",
"No categories selected for deletion." => "Za izbris ni bila izbrana nobena kategorija.",
"Error" => "Napaka",
+"Password" => "Geslo",
"ownCloud password reset" => "Ponastavitev gesla ownCloud",
"Use the following link to reset your password: {link}" => "Uporabite sledečo povezavo za ponastavitev gesla: {link}",
"You will receive a link to reset your password via Email." => "Na e-pošto boste prejeli povezavo s katero lahko ponastavite vaše geslo.",
@@ -42,7 +43,6 @@
"Edit categories" => "Uredi kategorije",
"Add" => "Dodaj",
"Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>",
-"Password" => "Geslo",
"Advanced" => "Napredne možnosti",
"Data folder" => "Mapa s podatki",
"Configure the database" => "Nastavi podatkovno zbirko",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index c2f2f07640e..dca207441fc 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Settings" => "Подешавања",
+"Password" => "Лозинка",
"Use the following link to reset your password: {link}" => "Овом везом ресетујте своју лозинку: {link}",
"You will receive a link to reset your password via Email." => "Добићете везу за ресетовање лозинке путем е-поште.",
"Requested" => "Захтевано",
@@ -17,7 +18,6 @@
"Help" => "Помоћ",
"Cloud not found" => "Облак није нађен",
"Create an <strong>admin account</strong>" => "Направи <strong>административни налог</strong>",
-"Password" => "Лозинка",
"Advanced" => "Напредно",
"Data folder" => "Фацикла података",
"Configure the database" => "Подешавање базе",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index 8bc20cf1a6f..c1d8a96073a 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Settings" => "Podešavanja",
+"Password" => "Lozinka",
"You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.",
"Requested" => "Zahtevano",
"Login failed!" => "Nesupela prijava!",
@@ -15,7 +16,6 @@
"Help" => "Pomoć",
"Cloud not found" => "Oblak nije nađen",
"Create an <strong>admin account</strong>" => "Napravi <strong>administrativni nalog</strong>",
-"Password" => "Lozinka",
"Advanced" => "Napredno",
"Data folder" => "Facikla podataka",
"Configure the database" => "Podešavanje baze",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 6b075f0aaf2..415573be169 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Inga kategorier valda för radering.",
"Error" => "Fel",
+"Password" => "Lösenord",
"ownCloud password reset" => "ownCloud lösenordsåterställning",
"Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
"You will receive a link to reset your password via Email." => "Du får en länk att återställa ditt lösenord via e-post.",
@@ -42,7 +43,6 @@
"Edit categories" => "Redigera kategorier",
"Add" => "Lägg till",
"Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
-"Password" => "Lösenord",
"Advanced" => "Avancerat",
"Data folder" => "Datamapp",
"Configure the database" => "Konfigurera databasen",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index fd25105f150..88b5ac5cee4 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -21,6 +21,7 @@
"Ok" => "ตกลง",
"No categories selected for deletion." => "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ",
"Error" => "พบข้อผิดพลาด",
+"Password" => "รหัสผ่าน",
"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." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
@@ -42,7 +43,6 @@
"Edit categories" => "แก้ไขหมวดหมู่",
"Add" => "เพิ่ม",
"Create an <strong>admin account</strong>" => "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
-"Password" => "รหัสผ่าน",
"Advanced" => "ขั้นสูง",
"Data folder" => "โฟลเดอร์เก็บข้อมูล",
"Configure the database" => "กำหนดค่าฐานข้อมูล",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 7d6d4a33a6d..4e86f9493f5 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -21,6 +21,7 @@
"Ok" => "Tamam",
"No categories selected for deletion." => "Silmek için bir kategori seçilmedi",
"Error" => "Hata",
+"Password" => "Parola",
"ownCloud password reset" => "ownCloud 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}",
"You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.",
@@ -42,7 +43,6 @@
"Edit categories" => "Kategorileri düzenle",
"Add" => "Ekle",
"Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
-"Password" => "Parola",
"Advanced" => "Gelişmiş",
"Data folder" => "Veri klasörü",
"Configure the database" => "Veritabanını ayarla",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 4a10a9fc745..73ad3f3dfb8 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -1,5 +1,22 @@
<?php $TRANSLATIONS = array(
"Settings" => "Налаштування",
+"January" => "Січень",
+"February" => "Лютий",
+"March" => "Березень",
+"April" => "Квітень",
+"May" => "Травень",
+"June" => "Червень",
+"July" => "Липень",
+"August" => "Серпень",
+"September" => "Вересень",
+"October" => "Жовтень",
+"November" => "Листопад",
+"December" => "Грудень",
+"Cancel" => "Відмінити",
+"No" => "Ні",
+"Yes" => "Так",
+"Error" => "Помилка",
+"Password" => "Пароль",
"You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на e-mail.",
"Username" => "Ім'я користувача",
"Your password was reset" => "Ваш пароль був скинутий",
@@ -10,7 +27,7 @@
"Users" => "Користувачі",
"Admin" => "Адміністратор",
"Help" => "Допомога",
-"Password" => "Пароль",
+"Add" => "Додати",
"Configure the database" => "Налаштування бази даних",
"will be used" => "буде використано",
"Database user" => "Користувач бази даних",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index de4764c3a54..26155a18663 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "Không có thể loại nào được chọn để xóa.",
"Error" => "Lỗi",
+"Password" => "Mật khẩu",
"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}",
"You will receive a link to reset your password via Email." => "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
@@ -42,7 +43,6 @@
"Edit categories" => "Sửa thể loại",
"Add" => "Thêm",
"Create an <strong>admin account</strong>" => "Tạo một <strong>tài khoản quản trị</strong>",
-"Password" => "Mật khẩu",
"Advanced" => "Nâng cao",
"Data folder" => "Thư mục dữ liệu",
"Configure the database" => "Cấu hình Cơ Sở Dữ Liệu",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 58104df3997..de437cf2e4c 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -21,6 +21,7 @@
"Ok" => "好的",
"No categories selected for deletion." => "没有选者要删除的分类.",
"Error" => "错误",
+"Password" => "密码",
"ownCloud password reset" => "私有云密码重置",
"Use the following link to reset your password: {link}" => "使用下面的链接来重置你的密码:{link}",
"You will receive a link to reset your password via Email." => "你将会收到一个重置密码的链接",
@@ -42,7 +43,6 @@
"Edit categories" => "编辑分类",
"Add" => "添加",
"Create an <strong>admin account</strong>" => "建立一个 <strong>管理帐户</strong>",
-"Password" => "密码",
"Advanced" => "进阶",
"Data folder" => "数据存放文件夹",
"Configure the database" => "配置数据库",
@@ -50,6 +50,7 @@
"Database user" => "数据库用户",
"Database password" => "数据库密码",
"Database name" => "数据库用户名",
+"Database tablespace" => "数据库表格空间",
"Database host" => "数据库主机",
"Finish setup" => "完成安装",
"web services under your control" => "你控制下的网络服务",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 4e0a37a8774..b84519a5c06 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -21,6 +21,7 @@
"Ok" => "好",
"No categories selected for deletion." => "没有选择要删除的类别",
"Error" => "错误",
+"Password" => "密码",
"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." => "您将会收到包含可以重置密码链接的邮件。",
@@ -42,7 +43,6 @@
"Edit categories" => "编辑分类",
"Add" => "添加",
"Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>",
-"Password" => "密码",
"Advanced" => "高级",
"Data folder" => "数据目录",
"Configure the database" => "配置数据库",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 57a087fae92..ccaa6b95eeb 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -21,6 +21,7 @@
"Ok" => "Ok",
"No categories selected for deletion." => "沒選擇要刪除的分類",
"Error" => "錯誤",
+"Password" => "密碼",
"ownCloud password reset" => "ownCloud 密碼重設",
"Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼: (聯結) ",
"You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱",
@@ -42,7 +43,6 @@
"Edit categories" => "編輯分類",
"Add" => "添加",
"Create an <strong>admin account</strong>" => "建立一個<strong>管理者帳號</strong>",
-"Password" => "密碼",
"Advanced" => "進階",
"Data folder" => "資料夾",
"Configure the database" => "設定資料庫",
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 4fa0fd01360..679be2657d4 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -36,7 +36,7 @@
<body id="<?php echo $_['bodyid'];?>">
<header><div id="header">
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
- <a class="header-right header-action" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
+ <a class="header-right header-action" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out'); echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
<form class="searchbox header-right" action="#" method="post">
<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])) {echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" x-webkit-speech />
</form>
diff --git a/db_structure.xml b/db_structure.xml
index 523329e66de..b1e620f8499 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -1,657 +1,674 @@
<?xml version="1.0" encoding="utf-8" ?>
<database>
- <name>*dbname*</name>
- <create>true</create>
- <overwrite>false</overwrite>
-
- <charset>utf8</charset>
-
- <table>
-
- <name>*dbprefix*appconfig</name>
-
- <declaration>
-
- <field>
- <name>appid</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
- <field>
- <name>configkey</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
- <field>
- <name>configvalue</name>
- <type>text</type>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
-
-
- </declaration>
-
- </table>
-
- <table>
-
- <name>*dbprefix*fscache</name>
-
- <declaration>
-
- <field>
- <name>id</name>
- <autoincrement>1</autoincrement>
- <type>integer</type>
- <default>0</default>
- <notnull>true</notnull>
- <length>4</length>
- </field>
-
- <field>
- <name>path</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>512</length>
- </field>
-
- <field>
- <name>path_hash</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>32</length>
- </field>
-
- <field>
- <name>parent</name>
- <type>integer</type>
- <default>
- </default>
- <notnull>true</notnull>
- <length>8</length>
- </field>
-
- <field>
- <name>name</name>
- <type>text</type>
- <default>
- </default>
- <notnull>true</notnull>
- <length>300</length>
- </field>
-
- <field>
- <name>user</name>
- <type>text</type>
- <default>
- </default>
- <notnull>true</notnull>
- <length>64</length>
- </field>
-
- <field>
- <name>size</name>
- <type>integer</type>
- <default></default>
- <notnull>true</notnull>
- <length>8</length>
- </field>
-
- <field>
- <name>ctime</name>
- <type>integer</type>
- <default>
- </default>
- <notnull>true</notnull>
- <length>8</length>
- </field>
-
- <field>
- <name>mtime</name>
- <type>integer</type>
- <default>
- </default>
- <notnull>true</notnull>
- <length>8</length>
- </field>
-
- <field>
- <name>mimetype</name>
- <type>text</type>
- <default>
- </default>
- <notnull>true</notnull>
- <length>96</length>
- </field>
-
- <field>
- <name>mimepart</name>
- <type>text</type>
- <default>
- </default>
- <notnull>true</notnull>
- <length>32</length>
- </field>
-
- <field>
- <name>encrypted</name>
- <type>integer</type>
- <default>0</default>
- <notnull>true</notnull>
- <length>1</length>
- </field>
-
- <field>
- <name>versioned</name>
- <type>integer</type>
- <default>0</default>
- <notnull>true</notnull>
- <length>1</length>
- </field>
-
- <field>
- <name>writable</name>
- <type>integer</type>
- <default>0</default>
- <notnull>true</notnull>
- <length>1</length>
- </field>
-
- <index>
- <name>fscache_path_hash_index</name>
- <field>
- <name>path_hash</name>
- <sorting>ascending</sorting>
- </field>
- </index>
-
- <index>
- <name>parent_index</name>
- <field>
- <name>parent</name>
- <sorting>ascending</sorting>
- </field>
- </index>
-
- <index>
- <name>name_index</name>
- <field>
- <name>name</name>
- <sorting>ascending</sorting>
- </field>
- </index>
-
- <index>
- <name>parent_name_index</name>
- <field>
- <name>parent</name>
- <sorting>ascending</sorting>
- </field>
- <field>
- <name>name</name>
- <sorting>ascending</sorting>
- </field>
- </index>
-
- </declaration>
-
- </table>
-
- <table>
-
- <name>*dbprefix*group_user</name>
-
- <declaration>
-
- <field>
- <name>gid</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>64</length>
- </field>
-
- <field>
- <name>uid</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>64</length>
- </field>
-
- </declaration>
-
- </table>
-
- <table>
-
- <name>*dbprefix*group_admin</name>
-
- <declaration>
-
- <field>
- <name>gid</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>64</length>
- </field>
-
- <field>
- <name>uid</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>64</length>
- </field>
-
- </declaration>
-
- </table>
-
- <table>
-
- <name>*dbprefix*groups</name>
-
- <declaration>
-
- <field>
- <name>gid</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>64</length>
- </field>
-
- <index>
- <name>groups_pKey</name>
- <primary>true</primary>
- <field>
- <name>gid</name>
- <sorting>ascending</sorting>
- </field>
- </index>
-
- </declaration>
-
- </table>
-
- <table>
-
- <name>*dbprefix*locks</name>
-
- <declaration>
-
- <field>
- <name>id</name>
- <type>integer</type>
- <default>0</default>
- <notnull>true</notnull>
- <autoincrement>1</autoincrement>
- <unsigned>true</unsigned>
- <length>4</length>
- </field>
-
- <field>
- <name>userid</name>
- <type>text</type>
- <default></default>
- <notnull>false</notnull>
- <length>200</length>
- </field>
-
- <field>
- <name>owner</name>
- <type>text</type>
- <default></default>
- <notnull>false</notnull>
- <length>100</length>
- </field>
-
- <field>
- <name>timeout</name>
- <type>integer</type>
- <default></default>
- <notnull>false</notnull>
- <unsigned>true</unsigned>
- <length>4</length>
- </field>
-
- <field>
- <name>created</name>
- <type>integer</type>
- <default></default>
- <notnull>false</notnull>
- <length>8</length>
- </field>
-
- <field>
- <name>token</name>
- <type>text</type>
- <default></default>
- <notnull>false</notnull>
- <length>100</length>
- </field>
-
- <field>
- <name>scope</name>
- <type>integer</type>
- <default></default>
- <notnull>false</notnull>
- <length>1</length>
- </field>
-
- <field>
- <name>depth</name>
- <type>integer</type>
- <default></default>
- <notnull>false</notnull>
- <length>1</length>
- </field>
-
- <field>
- <name>uri</name>
- <type>clob</type>
- <notnull>false</notnull>
- </field>
-
- </declaration>
-
- </table>
-
- <table>
-
- <name>*dbprefix*preferences</name>
-
- <declaration>
-
- <field>
- <name>userid</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
- <field>
- <name>appid</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
- <field>
- <name>configkey</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
- <field>
- <name>configvalue</name>
- <type>clob</type>
- <notnull>false</notnull>
- </field>
-
- </declaration>
-
- </table>
-
- <table>
-
- <name>*dbprefix*properties</name>
-
- <declaration>
-
- <field>
- <name>userid</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>200</length>
- </field>
-
- <field>
- <name>propertypath</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
- <field>
- <name>propertyname</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
- <field>
- <name>propertyvalue</name>
- <type>text</type>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
- </declaration>
-
- </table>
-
- <table>
-
- <name>*dbprefix*share</name>
-
- <declaration>
-
- <field>
- <name>id</name>
- <autoincrement>1</autoincrement>
- <type>integer</type>
- <default>0</default>
- <notnull>true</notnull>
- <length>4</length>
- </field>
-
- <field>
- <name>share_type</name>
- <type>integer</type>
- <default></default>
- <notnull>true</notnull>
- <length>1</length>
- </field>
-
- <field>
- <name>share_with</name>
- <type>text</type>
- <default></default>
- <notnull>false</notnull>
- <length>255</length>
- </field>
-
- <field>
- <name>uid_owner</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
- <field>
- <name>parent</name>
- <type>integer</type>
- <default></default>
- <notnull>false</notnull>
- <length>4</length>
- </field>
-
- <field>
- <name>item_type</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>64</length>
- </field>
-
- <field>
- <name>item_source</name>
- <type>text</type>
- <default></default>
- <notnull>false</notnull>
- <length>255</length>
- </field>
-
- <field>
- <name>item_target</name>
- <type>text</type>
- <default></default>
- <notnull>false</notnull>
- <length>255</length>
- </field>
-
- <field>
- <name>file_source</name>
- <type>integer</type>
- <default></default>
- <notnull>false</notnull>
- <length>4</length>
- </field>
-
- <field>
- <name>file_target</name>
- <type>text</type>
- <default></default>
- <notnull>false</notnull>
- <length>512</length>
- </field>
-
- <field>
- <name>permissions</name>
- <type>integer</type>
- <default></default>
- <notnull>true</notnull>
- <length>1</length>
- </field>
-
- <field>
- <name>stime</name>
- <type>integer</type>
- <default></default>
- <notnull>true</notnull>
- <length>8</length>
- </field>
-
- <field>
- <name>accepted</name>
- <type>integer</type>
- <default>0</default>
- <notnull>true</notnull>
- <length>1</length>
- </field>
-
- </declaration>
-
- </table>
-
- <table>
-
- <name>*dbprefix*queuedtasks</name>
-
- <declaration>
-
- <field>
- <name>id</name>
- <type>integer</type>
- <default>0</default>
- <notnull>true</notnull>
- <autoincrement>1</autoincrement>
- <unsigned>true</unsigned>
- <length>4</length>
- </field>
-
- <field>
- <name>app</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
- <field>
- <name>klass</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
- <field>
- <name>method</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
- <field>
- <name>parameters</name>
- <type>text</type>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
-
-
- </declaration>
-
- </table>
-
- <table>
-
- <name>*dbprefix*users</name>
-
- <declaration>
-
- <field>
- <name>uid</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>64</length>
- </field>
-
- <field>
- <name>password</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <length>255</length>
- </field>
-
- <index>
- <name>users_pKey</name>
- <primary>true</primary>
- <field>
- <name>uid</name>
- <sorting>ascending</sorting>
- </field>
- </index>
-
- </declaration>
-
- </table>
+ <name>*dbname*</name>
+ <create>true</create>
+ <overwrite>false</overwrite>
+
+ <charset>utf8</charset>
+
+ <table>
+
+ <name>*dbprefix*appconfig</name>
+
+ <declaration>
+
+ <field>
+ <name>appid</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>configkey</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>configvalue</name>
+ <type>clob</type>
+ <notnull>true</notnull>
+ </field>
+
+ <index>
+ <name>appconfig_appid_key_index</name>
+ <field>
+ <name>appid</name>
+ <sorting>ascending</sorting>
+ </field>
+ <field>
+ <name>configkey</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>*dbprefix*fscache</name>
+
+ <declaration>
+
+ <field>
+ <name>id</name>
+ <autoincrement>1</autoincrement>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>path</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>512</length>
+ </field>
+
+ <field>
+ <name>path_hash</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>32</length>
+ </field>
+
+ <field>
+ <name>parent</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>8</length>
+ </field>
+
+ <field>
+ <name>name</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>300</length>
+ </field>
+
+ <field>
+ <name>user</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>64</length>
+ </field>
+
+ <field>
+ <name>size</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>8</length>
+ </field>
+
+ <field>
+ <name>ctime</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>8</length>
+ </field>
+
+ <field>
+ <name>mtime</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>8</length>
+ </field>
+
+ <field>
+ <name>mimetype</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>96</length>
+ </field>
+
+ <field>
+ <name>mimepart</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>32</length>
+ </field>
+
+ <field>
+ <name>encrypted</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>1</length>
+ </field>
+
+ <field>
+ <name>versioned</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>1</length>
+ </field>
+
+ <field>
+ <name>writable</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>1</length>
+ </field>
+
+ <index>
+ <name>fscache_path_hash_index</name>
+ <field>
+ <name>path_hash</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ <index>
+ <name>parent_index</name>
+ <field>
+ <name>parent</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ <index>
+ <name>name_index</name>
+ <field>
+ <name>name</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ <index>
+ <name>parent_name_index</name>
+ <field>
+ <name>parent</name>
+ <sorting>ascending</sorting>
+ </field>
+ <field>
+ <name>name</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>*dbprefix*group_user</name>
+
+ <declaration>
+
+ <field>
+ <name>gid</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>64</length>
+ </field>
+
+ <field>
+ <name>uid</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>64</length>
+ </field>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>*dbprefix*group_admin</name>
+
+ <declaration>
+
+ <field>
+ <name>gid</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>64</length>
+ </field>
+
+ <field>
+ <name>uid</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>64</length>
+ </field>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>*dbprefix*groups</name>
+
+ <declaration>
+
+ <field>
+ <name>gid</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>64</length>
+ </field>
+
+ <index>
+ <name>groups_pKey</name>
+ <primary>true</primary>
+ <field>
+ <name>gid</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>*dbprefix*locks</name>
+
+ <declaration>
+
+ <field>
+ <name>id</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <autoincrement>1</autoincrement>
+ <unsigned>true</unsigned>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>userid</name>
+ <type>text</type>
+ <default></default>
+ <notnull>false</notnull>
+ <length>200</length>
+ </field>
+
+ <field>
+ <name>owner</name>
+ <type>text</type>
+ <default></default>
+ <notnull>false</notnull>
+ <length>100</length>
+ </field>
+
+ <field>
+ <name>timeout</name>
+ <type>integer</type>
+ <notnull>false</notnull>
+ <unsigned>true</unsigned>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>created</name>
+ <type>integer</type>
+ <notnull>false</notnull>
+ <length>8</length>
+ </field>
+
+ <field>
+ <name>token</name>
+ <type>text</type>
+ <default></default>
+ <notnull>false</notnull>
+ <length>100</length>
+ </field>
+
+ <field>
+ <name>scope</name>
+ <type>integer</type>
+ <notnull>false</notnull>
+ <length>1</length>
+ </field>
+
+ <field>
+ <name>depth</name>
+ <type>integer</type>
+ <notnull>false</notnull>
+ <length>1</length>
+ </field>
+
+ <field>
+ <name>uri</name>
+ <type>clob</type>
+ <notnull>false</notnull>
+ </field>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>*dbprefix*preferences</name>
+
+ <declaration>
+
+ <field>
+ <name>userid</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>appid</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>configkey</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>configvalue</name>
+ <type>clob</type>
+ <notnull>false</notnull>
+ </field>
+
+ <index>
+ <name>pref_userid_appid_key_index</name>
+ <field>
+ <name>userid</name>
+ <sorting>ascending</sorting>
+ </field>
+ <field>
+ <name>appid</name>
+ <sorting>ascending</sorting>
+ </field>
+ <field>
+ <name>configkey</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>*dbprefix*properties</name>
+
+ <declaration>
+
+ <field>
+ <name>userid</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>200</length>
+ </field>
+
+ <field>
+ <name>propertypath</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>propertyname</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>propertyvalue</name>
+ <type>text</type>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>*dbprefix*share</name>
+
+ <declaration>
+
+ <field>
+ <name>id</name>
+ <autoincrement>1</autoincrement>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>share_type</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>1</length>
+ </field>
+
+ <field>
+ <name>share_with</name>
+ <type>text</type>
+ <default></default>
+ <notnull>false</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>uid_owner</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>parent</name>
+ <type>integer</type>
+ <notnull>false</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>item_type</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>64</length>
+ </field>
+
+ <field>
+ <name>item_source</name>
+ <type>text</type>
+ <default></default>
+ <notnull>false</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>item_target</name>
+ <type>text</type>
+ <default></default>
+ <notnull>false</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>file_source</name>
+ <type>integer</type>
+ <notnull>false</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>file_target</name>
+ <type>text</type>
+ <default></default>
+ <notnull>false</notnull>
+ <length>512</length>
+ </field>
+
+ <field>
+ <name>permissions</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>1</length>
+ </field>
+
+ <field>
+ <name>stime</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>8</length>
+ </field>
+
+ <field>
+ <name>accepted</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>1</length>
+ </field>
+
+ <field>
+ <name>expiration</name>
+ <type>timestamp</type>
+ <default></default>
+ <notnull>false</notnull>
+ </field>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>*dbprefix*queuedtasks</name>
+
+ <declaration>
+
+ <field>
+ <name>id</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <autoincrement>1</autoincrement>
+ <unsigned>true</unsigned>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>app</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>klass</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>method</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>parameters</name>
+ <type>text</type>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>*dbprefix*users</name>
+
+ <declaration>
+
+ <field>
+ <name>uid</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>64</length>
+ </field>
+
+ <field>
+ <name>password</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <index>
+ <name>users_pKey</name>
+ <primary>true</primary>
+ <field>
+ <name>uid</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ </declaration>
+
+ </table>
</database>
diff --git a/l10n/af/core.po b/l10n/af/core.po
index 437c1e26953..0b65852a22a 100644
--- a/l10n/af/core.po
+++ b/l10n/af/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
"MIME-Version: 1.0\n"
@@ -29,58 +29,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -101,10 +105,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -190,10 +294,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr ""
-
#: templates/installation.php:36
msgid "Advanced"
msgstr ""
@@ -235,11 +335,11 @@ msgstr ""
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr ""
diff --git a/l10n/af/files.po b/l10n/af/files.po
index 31f2a00b0fa..42a6004c214 100644
--- a/l10n/af/files.po
+++ b/l10n/af/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
"MIME-Version: 1.0\n"
@@ -51,39 +51,51 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -99,7 +111,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -107,36 +119,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr ""
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr ""
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -188,7 +208,7 @@ msgstr ""
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr ""
@@ -196,36 +216,36 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr ""
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/af/files_sharing.po b/l10n/af/files_sharing.po
index 4e3ab5ee477..8bf34f8b164 100644
--- a/l10n/af/files_sharing.po
+++ b/l10n/af/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: af\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/af/files_versions.po b/l10n/af/files_versions.po
index 48efcf1e430..27b0fa36522 100644
--- a/l10n/af/files_versions.po
+++ b/l10n/af/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: af\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index b6b7b9e1565..f4b38781082 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
"MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -72,15 +76,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -109,63 +109,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,11 +220,8 @@ msgid "Answer"
msgstr ""
#: templates/personal.php:8
-msgid "You use"
-msgstr ""
-
-#: templates/personal.php:8
-msgid "of the available"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
msgstr ""
#: templates/personal.php:12
@@ -232,7 +233,7 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
+msgid "Your password was changed"
msgstr ""
#: templates/personal.php:20
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index febb0d7a637..0d9fd8dd3c5 100644
--- a/l10n/ar/core.po
+++ b/l10n/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -30,58 +30,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "تعديلات"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -102,10 +106,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "كلمة السر"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -191,10 +295,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "أضف </strong>مستخدم رئيسي <strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "كلمة السر"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "خيارات متقدمة"
@@ -236,11 +336,11 @@ msgstr "خادم قاعدة البيانات"
msgid "Finish setup"
msgstr "انهاء التعديلات"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "خدمات الوب تحت تصرفك"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "الخروج"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 52370a91d08..a2583c563c9 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -52,39 +52,51 @@ msgstr ""
msgid "Files"
msgstr "الملفات"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "محذوف"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -100,7 +112,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -108,36 +120,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "حجم"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "معدل"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -189,7 +209,7 @@ msgstr "مجلد"
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "إرفع"
@@ -197,36 +217,36 @@ msgstr "إرفع"
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "الاسم"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "تحميل"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "حجم الترفيع أعلى من المسموح"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index 6aeb9ddf0e5..4c6c7c44821 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
index ab6c4493898..850b57a0081 100644
--- a/l10n/ar/files_versions.po
+++ b/l10n/ar/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index ece25b8fda8..7a46fd4db26 100644
--- a/l10n/ar/settings.po
+++ b/l10n/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -74,15 +78,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -111,63 +111,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,12 +222,9 @@ msgid "Answer"
msgstr "الجواب"
#: templates/personal.php:8
-msgid "You use"
-msgstr "أنت تستخدم"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "من الموجود"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -234,8 +235,8 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "لقد تم تغيير كلمات السر"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index c251db4e530..42b7b828cc5 100644
--- a/l10n/ar_SA/core.po
+++ b/l10n/ar_SA/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
"MIME-Version: 1.0\n"
@@ -29,58 +29,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -101,10 +105,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -190,10 +294,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr ""
-
#: templates/installation.php:36
msgid "Advanced"
msgstr ""
@@ -235,11 +335,11 @@ msgstr ""
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr ""
diff --git a/l10n/ar_SA/files.po b/l10n/ar_SA/files.po
index f5fadbff02b..e433f76c253 100644
--- a/l10n/ar_SA/files.po
+++ b/l10n/ar_SA/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
"MIME-Version: 1.0\n"
@@ -51,39 +51,51 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -99,7 +111,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -107,36 +119,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr ""
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr ""
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -188,7 +208,7 @@ msgstr ""
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr ""
@@ -196,36 +216,36 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr ""
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ar_SA/files_sharing.po b/l10n/ar_SA/files_sharing.po
index b0c8fb706a3..66b122bea86 100644
--- a/l10n/ar_SA/files_sharing.po
+++ b/l10n/ar_SA/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ar_SA\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/ar_SA/files_versions.po b/l10n/ar_SA/files_versions.po
index 9596994e8a8..448d3b5b61e 100644
--- a/l10n/ar_SA/files_versions.po
+++ b/l10n/ar_SA/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ar_SA\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index 22e19d517db..a16336b7d75 100644
--- a/l10n/ar_SA/settings.po
+++ b/l10n/ar_SA/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
"MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -72,15 +76,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -109,63 +109,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,11 +220,8 @@ msgid "Answer"
msgstr ""
#: templates/personal.php:8
-msgid "You use"
-msgstr ""
-
-#: templates/personal.php:8
-msgid "of the available"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
msgstr ""
#: templates/personal.php:12
@@ -232,7 +233,7 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
+msgid "Your password was changed"
msgstr ""
#: templates/personal.php:20
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 681b5dd14b6..2eceb3fd863 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -33,58 +33,62 @@ msgstr ""
msgid "This category already exists: "
msgstr "Категорията вече съществува:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Настройки"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Януари"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Февруари"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Март"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Април"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Май"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Юни"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Юли"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Август"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Септември"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Октомври"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Ноември"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Декември"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Отказ"
@@ -105,10 +109,110 @@ msgstr "Добре"
msgid "No categories selected for deletion."
msgstr "Няма избрани категории за изтриване"
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Грешка"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Парола"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -194,10 +298,6 @@ msgstr "Добавяне"
msgid "Create an <strong>admin account</strong>"
msgstr "Създаване на <strong>админ профил</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Парола"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Разширено"
@@ -239,11 +339,11 @@ msgstr "Хост за базата"
msgid "Finish setup"
msgstr "Завършване на настройките"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Изход"
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index c51de878e98..706cc0477c7 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -53,39 +53,51 @@ msgstr "Грешка при запис на диска"
msgid "Files"
msgstr "Файлове"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Изтриване"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -101,7 +113,7 @@ msgstr ""
msgid "Upload Error"
msgstr "Грешка при качване"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -109,36 +121,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr "Качването е отменено."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Неправилно име – \"/\" не е позволено."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Размер"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Променено"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "папка"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "папки"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "файл"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -190,7 +210,7 @@ msgstr "Папка"
msgid "From url"
msgstr "От url-адрес"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Качване"
@@ -198,36 +218,36 @@ msgstr "Качване"
msgid "Cancel upload"
msgstr "Отказване на качването"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Няма нищо, качете нещо!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Име"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Споделяне"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Изтегляне"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Файлът е прекалено голям"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Файловете които се опитвате да качите са по-големи от позволеното за сървъра."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Файловете се претърсват, изчакайте."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index fa2d7899a7d..3e75975fb63 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: bg_BG\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
index bc5aaca01cc..df3fc299453 100644
--- a/l10n/bg_BG/files_versions.po
+++ b/l10n/bg_BG/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: bg_BG\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index fc6de0ffaac..52bb83794bc 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -37,6 +37,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Е-пощата е записана"
@@ -75,15 +79,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Изключване"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Включване"
@@ -112,63 +112,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -219,12 +223,9 @@ msgid "Answer"
msgstr "Отговор"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Вие ползвате"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "от наличните"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -235,8 +236,8 @@ msgid "Download"
msgstr "Изтегляне"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Вашата парола е сменена"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 6366450bdd3..1e75fefa393 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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -31,58 +31,62 @@ msgstr "No voleu afegir cap categoria?"
msgid "This category already exists: "
msgstr "Aquesta categoria ja existeix:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Arranjament"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Gener"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Febrer"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Març"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Abril"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Maig"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Juny"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Juliol"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Agost"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Setembre"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Octubre"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Novembre"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Desembre"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Cancel·la"
@@ -103,10 +107,110 @@ msgstr "D'acord"
msgid "No categories selected for deletion."
msgstr "No hi ha categories per eliminar."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Error"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Contrasenya"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "estableix de nou la contrasenya Owncloud"
@@ -192,10 +296,6 @@ msgstr "Afegeix"
msgid "Create an <strong>admin account</strong>"
msgstr "Crea un <strong>compte d'administrador</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Contrasenya"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Avançat"
@@ -237,11 +337,11 @@ msgstr "Ordinador central de la base de dades"
msgid "Finish setup"
msgstr "Acaba la configuració"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "controleu els vostres serveis web"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Surt"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index b00e52830d7..42160cdf8d1 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -5,14 +5,15 @@
# Translators:
# <bury1000@gmail.com>, 2012.
# <joan@montane.cat>, 2012.
+# <josep_tomas@hotmail.com>, 2012.
# <rcalvoi@yahoo.com>, 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 06:33+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"Last-Translator: I Robot <thomas.mueller@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"
@@ -54,39 +55,51 @@ msgstr "Ha fallat en escriure al disc"
msgid "Files"
msgstr "Fitxers"
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Deixa de compartir"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Suprimeix"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "ja existeix"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "substitueix"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr "sugereix un nom"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "cancel·la"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "substituït"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "desfés"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "per"
-#: js/filelist.js:266
+#: js/filelist.js:271
+msgid "unshared"
+msgstr "No compartits"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "esborrat"
@@ -102,7 +115,7 @@ msgstr "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes"
msgid "Upload Error"
msgstr "Error en la pujada"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Pendents"
@@ -110,36 +123,44 @@ msgstr "Pendents"
msgid "Upload cancelled."
msgstr "La pujada s'ha cancel·lat."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "El nom no és vàlid, no es permet '/'."
-#: js/files.js:746 templates/index.php:56
+#: js/files.js:667
+msgid "files scanned"
+msgstr "arxius escanejats"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "error durant l'escaneig"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Mida"
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "carpeta"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "carpetes"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "fitxer"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "fitxers"
@@ -191,7 +212,7 @@ msgstr "Carpeta"
msgid "From url"
msgstr "Des de la url"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Puja"
@@ -215,20 +236,20 @@ msgstr "Comparteix"
msgid "Download"
msgstr "Baixa"
-#: templates/index.php:65
+#: templates/index.php:75
msgid "Upload too large"
msgstr "La pujada és massa gran"
-#: templates/index.php:67
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor"
-#: templates/index.php:72
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "S'estan escanejant els fitxers, espereu"
-#: templates/index.php:75
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Actualment escanejant"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 2424e26a3c5..1bf9e7771c1 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 11:34+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -26,14 +26,24 @@ msgstr "Contrasenya"
msgid "Submit"
msgstr "Envia"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "Baixa"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "No hi ha vista prèvia disponible per a"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr "controleu els vostres serveis web"
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index 12b6059c7b6..5a70c6947cf 100644
--- a/l10n/ca/files_versions.po
+++ b/l10n/ca/files_versions.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <josep_tomas@hotmail.com>, 2012.
# <rcalvoi@yahoo.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 10:13+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
@@ -22,6 +23,10 @@ msgstr ""
msgid "Expire all versions"
msgstr "Expira totes les versions"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "Versions"
@@ -31,5 +36,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "Això eliminarà totes les versions de còpia de seguretat dels vostres fitxers"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Habilita les versions de fitxers"
+msgid "Files Versioning"
+msgstr "Fitxers de Versions"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Permetre"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 8065c1ebeec..bcfdd5a31c4 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -5,14 +5,15 @@
# Translators:
# <bury1000@gmail.com>, 2012.
# <joan@montane.cat>, 2012.
+# <josep_tomas@hotmail.com>, 2012.
# <rcalvoi@yahoo.com>, 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 06:39+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 22:01+0000\n"
+"Last-Translator: Josep Tomàs <jtomas.binsoft@gmail.com>\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"
@@ -37,6 +38,10 @@ msgstr "El grup ja existeix"
msgid "Unable to add group"
msgstr "No es pot afegir el grup"
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "No s'ha pogut activar l'apliació"
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "S'ha desat el correu electrònic"
@@ -75,15 +80,11 @@ msgstr "No es pot afegir l'usuari al grup %s"
msgid "Unable to remove user from group %s"
msgstr "No es pot eliminar l'usuari del grup %s"
-#: js/apps.js:18
-msgid "Error"
-msgstr "Error"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Desactiva"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Activa"
@@ -112,63 +113,67 @@ msgstr "La carpeta de dades i els vostres fitxersprobablement són accessibles d
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "executa una tasca en carregar cada pàgina"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "Executar una tasca de cada pàgina carregada"
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php està registrat en un servei web cron"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php està registrat en un servei webcron. Feu una crida a la pàgina cron.php a l'arrel de ownCloud cada minut a través de http."
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "usa el servei cron del sistema"
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "Utilitzeu el sistema de servei cron. Cridar el arxiu cron.php de la carpeta owncloud cada minut utilitzant el sistema de tasques cron."
-#: templates/admin.php:41
-msgid "Share API"
-msgstr "API de compartir"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Compartir"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Activa l'API de compartir"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "Permet que les aplicacions usin l'API de compartir"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "Permet enllaços"
-#: templates/admin.php:52
+#: templates/admin.php:68
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:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "Permet compartir de nou"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr "Permet als usuaris comparir elements ja compartits amb ells"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "Permet als usuaris compartir amb qualsevol"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr "Permet als usuaris compartir només amb usuaris del seu grup"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Registre"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Més"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -219,12 +224,9 @@ msgid "Answer"
msgstr "Resposta"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Esteu usant"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "d'un total disponible de"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "Ha utilitzat <strong>%s</strong> de la <strong>%s</strong> disponible"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -235,8 +237,8 @@ msgid "Download"
msgstr "Baixada"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "La contrasenya ha canviat"
+msgid "Your password was changed"
+msgstr "La seva contrasenya s'ha canviat"
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index c1d1ba2da07..4fa0563ad1f 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -33,58 +33,62 @@ msgstr "Žádná kategorie k přidání?"
msgid "This category already exists: "
msgstr "Tato kategorie již existuje: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Nastavení"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Leden"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Únor"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Březen"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Duben"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Květen"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Červen"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Červenec"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Srpen"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Září"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Říjen"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Listopad"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Prosinec"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Zrušit"
@@ -105,10 +109,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Žádné kategorie nebyly vybrány ke smazání."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Chyba"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Heslo"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Obnovení hesla pro ownCloud"
@@ -194,10 +298,6 @@ msgstr "Přidat"
msgid "Create an <strong>admin account</strong>"
msgstr "Vytvořit <strong>účet správce</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Heslo"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Pokročilé"
@@ -239,11 +339,11 @@ msgstr "Hostitel databáze"
msgid "Finish setup"
msgstr "Dokončit nastavení"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "webové služby pod Vaší kontrolou"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Odhlásit se"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 855b138c2ac..c1082a11389 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 08:41+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"Last-Translator: I Robot <thomas.mueller@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"
@@ -54,39 +54,51 @@ msgstr "Zápis na disk selhal"
msgid "Files"
msgstr "Soubory"
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Zrušit sdílení"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Smazat"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "již existuje"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "nahradit"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr "navrhnout název"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "zrušit"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "nahrazeno"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "zpět"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "s"
-#: js/filelist.js:266
+#: js/filelist.js:271
+msgid "unshared"
+msgstr "sdílení zrušeno"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "smazáno"
@@ -102,7 +114,7 @@ msgstr "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0
msgid "Upload Error"
msgstr "Chyba odesílání"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Čekající"
@@ -110,36 +122,44 @@ msgstr "Čekající"
msgid "Upload cancelled."
msgstr "Odesílání zrušeno."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Neplatný název, znak '/' není povolen"
-#: js/files.js:746 templates/index.php:56
+#: js/files.js:667
+msgid "files scanned"
+msgstr "soubory prohledány"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "chyba při prohledávání"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Velikost"
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Změněno"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "složka"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "složky"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "soubor"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "soubory"
@@ -191,7 +211,7 @@ msgstr "Složka"
msgid "From url"
msgstr "Z url"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Odeslat"
@@ -215,20 +235,20 @@ msgstr "Sdílet"
msgid "Download"
msgstr "Stáhnout"
-#: templates/index.php:65
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Odeslaný soubor je příliš velký"
-#: templates/index.php:67
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru."
-#: templates/index.php:72
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Soubory se prohledávají, prosím čekejte."
-#: templates/index.php:75
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Aktuální prohledávání"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index d4c56e76356..378f365cbfc 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 13:37+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
@@ -28,14 +28,24 @@ msgstr "Heslo"
msgid "Submit"
msgstr "Odeslat"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "Stáhnout"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "Náhled není dostupný pro"
-#: templates/public.php:25
+#: templates/public.php:37
msgid "web services under your control"
msgstr "služby webu pod Vaší kontrolou"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 0c6a43324f7..a2eb298df8a 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 13:37+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
@@ -23,6 +23,10 @@ msgstr ""
msgid "Expire all versions"
msgstr "Vypršet všechny verze"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "Verze"
@@ -32,5 +36,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "Odstraní všechny existující zálohované verze Vašich souborů"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Povolit verzování souborů"
+msgid "Files Versioning"
+msgstr "Verzování souborů"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Povolit"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 3511d379d65..420e26a8b37 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 13:36+0000\n"
+"POT-Creation-Date: 2012-09-20 02:05+0200\n"
+"PO-Revision-Date: 2012-09-19 17:40+0000\n"
"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -40,6 +40,10 @@ msgstr "Skupina již existuje"
msgid "Unable to add group"
msgstr "Nelze přidat skupinu"
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "Nelze povolit aplikaci."
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "E-mail uložen"
@@ -78,15 +82,11 @@ msgstr "Nelze přidat uživatele do skupiny %s"
msgid "Unable to remove user from group %s"
msgstr "Nelze odstranit uživatele ze skupiny %s"
-#: js/apps.js:18
-msgid "Error"
-msgstr "Chyba"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Zakázat"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Povolit"
@@ -115,63 +115,67 @@ msgstr "Váš adresář dat a soubory jsou pravděpodobně přístupné z intern
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "spustit jednu úlohu s každou načtenou stránkou"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "Spustit jednu úlohu s každou načtenou stránkou"
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php je registrován jako služba webcron"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php je registrován u služby webcron. Zavolá stránku cron.php v kořenovém adresáři owncloud každou minutu skrze http."
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "použít systémovou službu cron"
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "Použít systémovou službu cron. Zavolat soubor cron.php ze složky owncloud pomocí systémové úlohy cron každou minutu."
-#: templates/admin.php:41
-msgid "Share API"
-msgstr "API sdílení"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Sdílení"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Povolit API sdílení"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "Povolit aplikacím používat API sdílení"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "Povolit odkazy"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr "Povolit uživatelům sdílet položky s veřejností pomocí odkazů"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "Povolit znovu-sdílení"
-#: templates/admin.php:57
+#: templates/admin.php:74
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:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "Povolit uživatelům sdílet s kýmkoliv"
-#: templates/admin.php:62
+#: templates/admin.php:81
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:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Záznam"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Více"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -222,12 +226,9 @@ msgid "Answer"
msgstr "Odpověď"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Využíváte"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "z dostupných"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "Použili jste <strong>%s</strong> z dostupných <strong>%s<strong>"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -238,7 +239,7 @@ msgid "Download"
msgstr "Stáhnout"
#: templates/personal.php:19
-msgid "Your password got changed"
+msgid "Your password was changed"
msgstr "Vaše heslo bylo změněno"
#: templates/personal.php:20
diff --git a/l10n/da/core.po b/l10n/da/core.po
index bbb688dca57..1dd86a0492c 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -35,58 +35,62 @@ msgstr "Ingen kategori at tilføje?"
msgid "This category already exists: "
msgstr "Denne kategori eksisterer allerede: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Indstillinger"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Januar"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Februar"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Marts"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "April"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Maj"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Juni"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Juli"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "August"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "September"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Oktober"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "November"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "December"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Fortryd"
@@ -107,10 +111,110 @@ msgstr "OK"
msgid "No categories selected for deletion."
msgstr "Ingen kategorier valgt"
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Fejl"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Kodeord"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Nulstil ownCloud kodeord"
@@ -196,10 +300,6 @@ msgstr "Tilføj"
msgid "Create an <strong>admin account</strong>"
msgstr "Opret en <strong>administratorkonto</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Kodeord"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Avanceret"
@@ -241,11 +341,11 @@ msgstr "Databasehost"
msgid "Finish setup"
msgstr "Afslut opsætning"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "Webtjenester under din kontrol"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Log ud"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index ef7718c6d05..060fedddcb1 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -4,6 +4,7 @@
#
# Translators:
# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
+# <osos@openeyes.dk>, 2012.
# Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
# <simon@rosmi.dk>, 2012.
# Thomas Tanghus <>, 2012.
@@ -12,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -56,39 +57,51 @@ msgstr "Fejl ved skrivning til disk."
msgid "Files"
msgstr "Filer"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Fjern deling"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Slet"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "findes allerede"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "erstat"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "foreslå navn"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "fortryd"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "erstattet"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "fortryd"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "med"
#: js/filelist.js:271
+msgid "unshared"
+msgstr "udelt"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "Slettet"
@@ -104,7 +117,7 @@ msgstr "Kunne ikke uploade din fil, da det enten er en mappe eller er tom"
msgid "Upload Error"
msgstr "Fejl ved upload"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Afventer"
@@ -112,36 +125,44 @@ msgstr "Afventer"
msgid "Upload cancelled."
msgstr "Upload afbrudt."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Ugyldigt navn, '/' er ikke tilladt."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Størrelse"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Ændret"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "mappe"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "mapper"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "fil"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "filer"
@@ -175,7 +196,7 @@ msgstr "Maksimal størrelse på ZIP filer"
#: templates/admin.php:14
msgid "Save"
-msgstr ""
+msgstr "Gem"
#: templates/index.php:7
msgid "New"
@@ -193,7 +214,7 @@ msgstr "Mappe"
msgid "From url"
msgstr "Fra URL"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Upload"
@@ -201,36 +222,36 @@ msgstr "Upload"
msgid "Cancel upload"
msgstr "Fortryd upload"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Her er tomt. Upload noget!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Navn"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Del"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Download"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Upload for stor"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Filerne bliver indlæst, vent venligst."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Indlæser"
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index 94a4333bd18..bd1c9864514 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -3,32 +3,33 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <osos@openeyes.dk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-14 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 09:42+0000\n"
+"Last-Translator: osos <osos@openeyes.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"
"Content-Transfer-Encoding: 8bit\n"
"Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Kryptering"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Ekskluder følgende filtyper fra kryptering"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Ingen"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "Aktivér kryptering"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index cae9bfa4d9b..7abb72a92e9 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -3,36 +3,47 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <osos@openeyes.dk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
-msgstr ""
+msgstr "Kodeord"
#: templates/authenticate.php:6
msgid "Submit"
+msgstr "Send"
+
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
-msgid "Download"
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr "Download"
+
+#: templates/public.php:29
msgid "No preview available for"
-msgstr ""
+msgstr "Forhåndsvisning ikke tilgængelig for"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
-msgstr ""
+msgstr "Webtjenester under din kontrol"
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
index 667b5eef551..dea4d1ccbf3 100644
--- a/l10n/da/files_versions.po
+++ b/l10n/da/files_versions.po
@@ -3,32 +3,41 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <osos@openeyes.dk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
+msgstr "Lad alle versioner udløbe"
+
+#: js/versions.js:16
+msgid "History"
msgstr ""
#: templates/settings-personal.php:4
msgid "Versions"
-msgstr ""
+msgstr "Versioner"
#: templates/settings-personal.php:7
msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Dette vil slette alle eksisterende backupversioner af dine filer"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 75cf36398bc..e9b14de3e58 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -4,41 +4,42 @@
#
# Translators:
# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
+# <osos@openeyes.dk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-14 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 09:43+0000\n"
+"Last-Translator: osos <osos@openeyes.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"
"Content-Transfer-Encoding: 8bit\n"
"Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:288
+#: app.php:285
msgid "Help"
msgstr "Hjælp"
-#: app.php:295
+#: app.php:292
msgid "Personal"
msgstr "Personlig"
-#: app.php:300
+#: app.php:297
msgid "Settings"
msgstr "Indstillinger"
-#: app.php:305
+#: app.php:302
msgid "Users"
msgstr "Brugere"
-#: app.php:312
+#: app.php:309
msgid "Apps"
msgstr "Apps"
-#: app.php:314
+#: app.php:311
msgid "Admin"
msgstr "Admin"
@@ -70,56 +71,56 @@ msgstr "Adgangsfejl"
msgid "Token expired. Please reload page."
msgstr "Adgang er udløbet. Genindlæs siden."
-#: template.php:86
+#: template.php:87
msgid "seconds ago"
msgstr "sekunder siden"
-#: template.php:87
+#: template.php:88
msgid "1 minute ago"
msgstr "1 minut siden"
-#: template.php:88
+#: template.php:89
#, php-format
msgid "%d minutes ago"
msgstr "%d minutter siden"
-#: template.php:91
+#: template.php:92
msgid "today"
msgstr "I dag"
-#: template.php:92
+#: template.php:93
msgid "yesterday"
msgstr "I går"
-#: template.php:93
+#: template.php:94
#, php-format
msgid "%d days ago"
msgstr "%d dage siden"
-#: template.php:94
+#: template.php:95
msgid "last month"
msgstr "Sidste måned"
-#: template.php:95
+#: template.php:96
msgid "months ago"
msgstr "måneder siden"
-#: template.php:96
+#: template.php:97
msgid "last year"
msgstr "Sidste år"
-#: template.php:97
+#: template.php:98
msgid "years ago"
msgstr "år siden"
#: updater.php:66
#, php-format
msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s er tilgængelig. Få <a href=\"%s\">mere information</a>"
#: updater.php:68
msgid "up to date"
-msgstr ""
+msgstr "opdateret"
#: updater.php:71
msgid "updates check is disabled"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 022d5ee2338..fa494fbcb0a 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -42,6 +42,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Email adresse gemt"
@@ -80,15 +84,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr "Fejl"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Deaktiver"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Aktiver"
@@ -117,63 +117,67 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "udfør en opgave for hver indlæst side"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php er tilmeldt en webcron tjeneste"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
-msgstr "brug systemets cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
-msgstr "Del API"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Aktiver dele API"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "Tillad apps a bruge dele APIen"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "Tillad links"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr "Tillad brugere at dele elementer med offentligheden med links"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "Tillad gendeling"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "Tillad brugere at dele med hvem som helst"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr "Tillad kun deling med brugere i brugerens egen gruppe"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Log"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Mere"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -224,12 +228,9 @@ msgid "Answer"
msgstr "Svar"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Du benytter"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "af det tilgængelige"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -240,8 +241,8 @@ msgid "Download"
msgstr "Download"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Din adgangskode er blevet ændret"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index d2dca57566e..a8d24d92a6c 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -8,6 +8,7 @@
# <georg.stefan.germany@googlemail.com>, 2011.
# I Robot <thomas.mueller@tmit.eu>, 2012.
# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+# <mail@felixmoeller.de>, 2012.
# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
# <m.fresel@sysangels.com>, 2012.
# <niko@nik-o-mat.de>, 2012.
@@ -18,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 02:00+0200\n"
+"PO-Revision-Date: 2012-09-21 23:24+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -30,7 +31,7 @@ msgstr ""
#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
msgid "Application name not provided."
-msgstr "Applikationsname nicht angegeben"
+msgstr "Der Anwendungsname wurde nicht angegeben."
#: ajax/vcategories/add.php:29
msgid "No category to add?"
@@ -40,58 +41,62 @@ msgstr "Keine Kategorie hinzuzufügen?"
msgid "This category already exists: "
msgstr "Kategorie existiert bereits:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Einstellungen"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Januar"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Februar"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "März"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "April"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Mai"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Juni"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Juli"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "August"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "September"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Oktober"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "November"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Dezember"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr "Auswählen"
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Abbrechen"
@@ -112,10 +117,110 @@ msgstr "OK"
msgid "No categories selected for deletion."
msgstr "Es wurde keine Kategorien zum Löschen ausgewählt."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Fehler"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr "Fehler beim Teilen"
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr "Fehler beim Ändern der Rechte"
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Passwort"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr "kann bearbeiten"
+
+#: js/share.js:277
+msgid "access control"
+msgstr "Zugriffskontrolle"
+
+#: js/share.js:280
+msgid "create"
+msgstr "erstellen"
+
+#: js/share.js:283
+msgid "update"
+msgstr "aktualisieren"
+
+#: js/share.js:286
+msgid "delete"
+msgstr "löschen"
+
+#: js/share.js:289
+msgid "share"
+msgstr "teilen"
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr "Passwort geschützt"
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ownCloud-Passwort zurücksetzen"
@@ -201,10 +306,6 @@ msgstr "Hinzufügen"
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>Administrator-Konto</strong> anlegen"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Passwort"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Erweitert"
@@ -246,11 +347,11 @@ msgstr "Datenbank-Host"
msgid "Finish setup"
msgstr "Installation abschließen"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "Web-Services unter Ihrer Kontrolle"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Abmelden"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index a06845cc3bc..2ae5f807f64 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -4,8 +4,10 @@
#
# Translators:
# <admin@s-goecker.de>, 2012.
+# I Robot <thomas.mueller@tmit.eu>, 2012.
# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
# Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
+# <mail@felixmoeller.de>, 2012.
# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
# Michael Krell <m4dmike.mni@gmail.com>, 2012.
# <nelsonfritsch@gmail.com>, 2012.
@@ -18,9 +20,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 06:59+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"POT-Creation-Date: 2012-09-22 02:00+0200\n"
+"PO-Revision-Date: 2012-09-21 23:22+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -62,39 +64,51 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
msgid "Files"
msgstr "Dateien"
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Nicht mehr teilen"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Löschen"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr "Umbenennen"
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "ist bereits vorhanden"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "ersetzen"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr "Name vorschlagen"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "abbrechen"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "ersetzt"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "rückgängig machen"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "mit"
-#: js/filelist.js:266
+#: js/filelist.js:271
+msgid "unshared"
+msgstr "Nicht mehr teilen"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "gelöscht"
@@ -104,13 +118,13 @@ msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
#: js/files.js:208
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ihre Datei kann nicht hochgeladen werden, da sie ein Verzeichnis ist oder 0 Bytes hat."
+msgstr "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis ist oder 0 Bytes hat."
#: js/files.js:208
msgid "Upload Error"
msgstr "Fehler beim Hochladen"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Ausstehend"
@@ -118,36 +132,44 @@ msgstr "Ausstehend"
msgid "Upload cancelled."
msgstr "Hochladen abgebrochen."
-#: js/files.js:423
+#: js/files.js:424
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/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Ungültiger Name: \"/\" ist nicht erlaubt."
-#: js/files.js:746 templates/index.php:56
+#: js/files.js:667
+msgid "files scanned"
+msgstr "Dateien gescannt"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "Fehler beim Scannen"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Größe"
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Bearbeitet"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "Ordner"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "Ordner"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "Datei"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "Dateien"
@@ -199,7 +221,7 @@ msgstr "Ordner"
msgid "From url"
msgstr "Von der URL"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Hochladen"
@@ -223,20 +245,20 @@ msgstr "Teilen"
msgid "Download"
msgstr "Herunterladen"
-#: templates/index.php:65
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Upload zu groß"
-#: templates/index.php:67
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
-#: templates/index.php:72
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Dateien werden gescannt, bitte warten."
-#: templates/index.php:75
+#: templates/index.php:85
msgid "Current scanning"
-msgstr "Scannen"
+msgstr "Scanne"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 7d11d393690..64990416394 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -11,15 +11,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 09:46+0000\n"
-"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2012-09-22 02:00+0200\n"
+"PO-Revision-Date: 2012-09-21 23:22+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -29,14 +29,24 @@ msgstr "Passwort"
msgid "Submit"
msgstr "Absenden"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr "%s hat mit Ihnen den Ordner %s geteilt"
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr "%s hat mit Ihnen die Datei %s geteilt"
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "Download"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "Es ist keine Vorschau verfügbar für"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr "Web-Services unter Ihrer Kontrolle"
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index f4e27ec5144..d6e541868da 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -4,26 +4,31 @@
#
# Translators:
# I Robot <thomas.mueller@tmit.eu>, 2012.
+# <mail@felixmoeller.de>, 2012.
# <niko@nik-o-mat.de>, 2012.
# <thomas.mueller@tmit.eu>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-03 02:04+0200\n"
-"PO-Revision-Date: 2012-09-02 06:01+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2012-09-22 02:00+0200\n"
+"PO-Revision-Date: 2012-09-21 23:21+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "Alle Versionen löschen"
+#: js/versions.js:16
+msgid "History"
+msgstr "Historie"
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "Versionen"
@@ -33,5 +38,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "Dies löscht alle vorhandenen Sicherungsversionen Ihrer Dateien."
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Datei-Versionierung aktivieren"
+msgid "Files Versioning"
+msgstr "Dateiversionierung"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Aktivieren"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index b43e2799fd9..e066695345d 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -10,37 +10,37 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 08:07+0000\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 21:03+0000\n"
"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:288
+#: app.php:285
msgid "Help"
msgstr "Hilfe"
-#: app.php:295
+#: app.php:292
msgid "Personal"
msgstr "Persönlich"
-#: app.php:300
+#: app.php:297
msgid "Settings"
msgstr "Einstellungen"
-#: app.php:305
+#: app.php:302
msgid "Users"
msgstr "Benutzer"
-#: app.php:312
+#: app.php:309
msgid "Apps"
msgstr "Apps"
-#: app.php:314
+#: app.php:311
msgid "Admin"
msgstr "Administrator"
@@ -72,45 +72,45 @@ msgstr "Authentifizierungs-Fehler"
msgid "Token expired. Please reload page."
msgstr "Token abgelaufen. Bitte laden Sie die Seite neu."
-#: template.php:86
+#: template.php:87
msgid "seconds ago"
msgstr "Vor wenigen Sekunden"
-#: template.php:87
+#: template.php:88
msgid "1 minute ago"
msgstr "Vor einer Minute"
-#: template.php:88
+#: template.php:89
#, php-format
msgid "%d minutes ago"
-msgstr "Vor %d Minuten"
+msgstr "Vor %d Minute(n)"
-#: template.php:91
+#: template.php:92
msgid "today"
msgstr "Heute"
-#: template.php:92
+#: template.php:93
msgid "yesterday"
msgstr "Gestern"
-#: template.php:93
+#: template.php:94
#, php-format
msgid "%d days ago"
-msgstr "Vor %d Tagen"
+msgstr "Vor %d Tag(en)"
-#: template.php:94
+#: template.php:95
msgid "last month"
msgstr "Letzten Monat"
-#: template.php:95
+#: template.php:96
msgid "months ago"
msgstr "Vor Monaten"
-#: template.php:96
+#: template.php:97
msgid "last year"
msgstr "Letztes Jahr"
-#: template.php:97
+#: template.php:98
msgid "years ago"
msgstr "Vor Jahren"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index e0d81804f6a..de2fc62bcee 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -7,6 +7,8 @@
# <icewind1991@gmail.com>, 2012.
# I Robot <thomas.mueller@tmit.eu>, 2012.
# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+# Jan T <jan-temesinko@web.de>, 2012.
+# <mail@felixmoeller.de>, 2012.
# Marcel Kühlhorn <susefan93@gmx.de>, 2012.
# <nelsonfritsch@gmail.com>, 2012.
# <niko@nik-o-mat.de>, 2012.
@@ -17,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 07:52+0000\n"
+"POT-Creation-Date: 2012-09-20 02:05+0200\n"
+"PO-Revision-Date: 2012-09-19 21:46+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -44,6 +46,10 @@ msgstr "Gruppe existiert bereits"
msgid "Unable to add group"
msgstr "Gruppe konnte nicht angelegt werden"
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "App konnte nicht aktiviert werden."
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "E-Mail gespeichert"
@@ -82,15 +88,11 @@ msgstr "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden"
msgid "Unable to remove user from group %s"
msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
-#: js/apps.js:18
-msgid "Error"
-msgstr "Fehler"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Deaktivieren"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Aktivieren"
@@ -119,63 +121,67 @@ msgstr "Ihr Datenverzeichnis ist möglicher Weise aus dem Internet erreichbar. D
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr "Führe eine Aufgabe pro geladener Seite aus."
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php ist beim Webcron-Service registriert"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php ist bei einem Webcron-Dienst registriert. Rufen Sie die Seite cron.php im ownCloud-Root minütlich per HTTP auf."
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "Nutze System-Cron-Service"
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "Benutzen Sie den System-Crondienst. Rufen Sie die cron.php im ownCloud-Ordner über einen System-Cronjob minütlich auf."
-#: templates/admin.php:41
-msgid "Share API"
-msgstr "Teilungs-API"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Freigabe"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Teilungs-API aktivieren"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "Erlaubt Nutzern, die Teilungs-API zu nutzen"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "Links erlauben"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr "Erlaube Nutzern, Dateien mithilfe von Links mit der Öffentlichkeit zu teilen"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "Erneutes Teilen erlauben"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr "Erlaubt Nutzern, Dateien die mit ihnen geteilt wurden, erneut zu teilen"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "Erlaube Nutzern mit jedem zu Teilen"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr "Erlaube Nutzern nur das Teilen in ihrer Gruppe"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Log"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Mehr"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -226,23 +232,20 @@ msgid "Answer"
msgstr "Antwort"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Sie nutzen"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "der verfügbaren"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s<strong>"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
-msgstr "Desktop- und mobile Synchronierungs-Clients"
+msgstr "Desktop- und mobile Clients für die Synchronisation"
#: templates/personal.php:13
msgid "Download"
msgstr "Download"
#: templates/personal.php:19
-msgid "Your password got changed"
+msgid "Your password was changed"
msgstr "Ihr Passwort wurde geändert."
#: templates/personal.php:20
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index c8b3a60d6a6..951faf6839a 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -12,15 +12,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 15:48+0000\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 20:49+0000\n"
"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
msgid "Host"
@@ -134,7 +134,7 @@ msgstr "Schalte die SSL-Zertifikatsprüfung aus."
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
-msgstr "Falls die Verbindung es erfordert, wird das SSL-Zertifikat des LDAP-Server importiert werden."
+msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 0a9a6e0388f..d94f7b57dd6 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -4,6 +4,7 @@
#
# Translators:
# Dimitris M. <monopatis@gmail.com>, 2012.
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
# Marios Bekatoros <>, 2012.
# <petros.kyladitis@gmail.com>, 2011.
# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
@@ -11,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -33,58 +34,62 @@ msgstr "Δεν έχετε να προστέσθέσεται μια κα"
msgid "This category already exists: "
msgstr "Αυτή η κατηγορία υπάρχει ήδη"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Ιανουάριος"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Φεβρουάριος"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Μάρτιος"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Απρίλιος"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Μάϊος"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Ιούνιος"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Ιούλιος"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Αύγουστος"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Σεπτέμβριος"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Οκτώβριος"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Νοέμβριος"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Δεκέμβριος"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Ακύρωση"
@@ -105,10 +110,110 @@ msgstr "Οκ"
msgid "No categories selected for deletion."
msgstr "Δεν επιλέχτηκαν κατηγορίες για διαγραφή"
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Σφάλμα"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Κωδικός"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Επαναφορά κωδικού ownCloud"
@@ -194,10 +299,6 @@ msgstr "Προσθήκη"
msgid "Create an <strong>admin account</strong>"
msgstr "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Κωδικός"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Για προχωρημένους"
@@ -229,7 +330,7 @@ msgstr "Όνομα βάσης δεδομένων"
#: templates/installation.php:109
msgid "Database tablespace"
-msgstr ""
+msgstr "Κενά Πινάκων Βάσης Δεδομένων"
#: templates/installation.php:115
msgid "Database host"
@@ -239,11 +340,11 @@ msgstr "Διακομιστής βάσης δεδομένων"
msgid "Finish setup"
msgstr "Ολοκλήρωση εγκατάστασης"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "Υπηρεσίες web υπό τον έλεγχό σας"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Αποσύνδεση"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 8ddd036c716..55508dd47b4 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -4,14 +4,16 @@
#
# Translators:
# Dimitris M. <monopatis@gmail.com>, 2012.
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
# Marios Bekatoros <>, 2012.
-# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
+# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -40,53 +42,65 @@ msgstr "Το αρχείο μεταφορώθηκε μόνο εν μέρει"
#: ajax/upload.php:24
msgid "No file was uploaded"
-msgstr "Το αρχείο δεν μεταφορτώθηκε"
+msgstr "Κανένα αρχείο δεν μεταφορτώθηκε"
#: ajax/upload.php:25
msgid "Missing a temporary folder"
-msgstr "Λείπει ένας προσωρινός φάκελος"
+msgstr "Λείπει ο προσωρινός φάκελος"
#: ajax/upload.php:26
msgid "Failed to write to disk"
-msgstr "Η εγγραφή στο δίσκο απέτυχε"
+msgstr "Αποτυχία εγγραφής στο δίσκο"
#: appinfo/app.php:6
msgid "Files"
msgstr "Αρχεία"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Διακοπή κοινής χρήσης"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Διαγραφή"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "υπάρχει ήδη"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "αντικατέστησε"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "συνιστώμενο όνομα"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "ακύρωση"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "αντικαταστάθηκε"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "αναίρεση"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "με"
#: js/filelist.js:271
+msgid "unshared"
+msgstr "Διακόπηκε ο διαμοιρασμός"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "διαγράφηκε"
@@ -102,44 +116,52 @@ msgstr "Αδυναμία στην μεταφόρτωση του αρχείου
msgid "Upload Error"
msgstr "Σφάλμα Μεταφόρτωσης"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
-msgstr "Εν αναμονή"
+msgstr "Εκκρεμεί"
#: js/files.js:355
msgid "Upload cancelled."
msgstr "Η μεταφόρτωση ακυρώθηκε."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Η μεταφόρτωση του αρχείου βρίσκεται σε εξέλιξη. Έξοδος από την σελίδα τώρα θα ακυρώσει την μεταφόρτωση."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr "αρχεία σαρώθηκαν"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "σφάλμα κατά την ανίχνευση"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Μέγεθος"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Τροποποιήθηκε"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "φάκελος"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "φάκελοι"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "αρχείο"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "αρχεία"
@@ -173,7 +195,7 @@ msgstr "Μέγιστο μέγεθος για αρχεία ZIP"
#: templates/admin.php:14
msgid "Save"
-msgstr ""
+msgstr "Αποθήκευση"
#: templates/index.php:7
msgid "New"
@@ -191,44 +213,44 @@ msgstr "Φάκελος"
msgid "From url"
msgstr "Από την διεύθυνση"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Μεταφόρτωση"
#: templates/index.php:27
msgid "Cancel upload"
-msgstr "Ακύρωση ανεβάσματος"
+msgstr "Ακύρωση μεταφόρτωσης"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Όνομα"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
-msgstr "Διαμοίρασε"
+msgstr "Διαμοιρασμός"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Λήψη"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
-msgstr "Πολύ μεγάλο το αρχείο προς μεταφόρτωση"
+msgstr "Πολύ μεγάλο αρχείο προς μεταφόρτωση"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
-msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή."
+msgstr "Τα αρχεία που προσπαθείτε να μεταφορτώσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
-msgstr "Τα αρχεία ανιχνεύονται, παρακαλώ περιμένετε"
+msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε"
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Τρέχουσα αναζήτηση "
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index d11daf7f325..26acbf9da90 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -3,25 +3,26 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
# Petros Kyladitis <petros.kyladitis@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-27 02:01+0200\n"
-"PO-Revision-Date: 2012-08-26 21:45+0000\n"
-"Last-Translator: Petros Kyladitis <petros.kyladitis@gmail.com>\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 20:07+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:3
msgid "External Storage"
-msgstr "Εξωτερική αποθήκευση"
+msgstr "Εξωτερικό Αποθηκευτικό Μέσο"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
@@ -29,7 +30,7 @@ msgstr "Σημείο προσάρτησης"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "Σύστημα υποστήριξης"
#: templates/settings.php:9
msgid "Configuration"
@@ -41,15 +42,15 @@ msgstr "Επιλογές"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "Εφαρμόσιμο"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "Προσθήκη σημείου προσάρτησης"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "Κανένα επιλεγμένο"
#: templates/settings.php:63
msgid "All Users"
@@ -69,16 +70,16 @@ msgstr "Διαγραφή"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "Πιστοποιητικά SSL root"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Εισαγωγή Πιστοποιητικού Root"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Να επιτρέπεται στους χρήστες να προσαρτούν δικό τους εξωτερικό αποθηκευτικό χώρο"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index fafebf49441..d50968315c1 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -4,20 +4,21 @@
#
# Translators:
# Dimitris M. <monopatis@gmail.com>, 2012.
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -27,14 +28,24 @@ msgstr "Συνθηματικό"
msgid "Submit"
msgstr "Καταχώρηση"
-#: templates/public.php:9 templates/public.php:19
-msgid "Download"
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
msgstr ""
-#: templates/public.php:18
-msgid "No preview available for"
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr "Λήψη"
+
+#: templates/public.php:29
+msgid "No preview available for"
+msgstr "Δεν υπάρχει διαθέσιμη προεπισκόπηση για"
+
+#: templates/public.php:37
msgid "web services under your control"
-msgstr ""
+msgstr "υπηρεσίες δικτύου υπό τον έλεγχό σας"
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
index df855bfec12..1ebbed58c88 100644
--- a/l10n/el/files_versions.po
+++ b/l10n/el/files_versions.po
@@ -3,33 +3,42 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "Λήξη όλων των εκδόσεων"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
-msgstr ""
+msgstr "Εκδόσεις"
#: templates/settings-personal.php:7
msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Αυτό θα διαγράψει όλες τις υπάρχουσες εκδόσεις των αντιγράφων ασφαλείας των αρχείων σας"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Ενεργοποίηση παρακολούθησης εκδόσεων αρχείων"
+msgid "Files Versioning"
+msgstr "Εκδόσεις Αρχείων"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Ενεργοποίηση"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index 2a3ab249c25..754ee2ab0df 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -8,37 +8,37 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-20 02:05+0200\n"
+"PO-Revision-Date: 2012-09-19 23:21+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:288
+#: app.php:285
msgid "Help"
msgstr "Βοήθεια"
-#: app.php:295
+#: app.php:292
msgid "Personal"
msgstr "Προσωπικά"
-#: app.php:300
+#: app.php:297
msgid "Settings"
msgstr "Ρυθμίσεις"
-#: app.php:305
+#: app.php:302
msgid "Users"
msgstr "Χρήστες"
-#: app.php:312
+#: app.php:309
msgid "Apps"
msgstr "Εφαρμογές"
-#: app.php:314
+#: app.php:311
msgid "Admin"
msgstr "Διαχειριστής"
@@ -68,59 +68,59 @@ msgstr "Σφάλμα πιστοποίησης"
#: json.php:51
msgid "Token expired. Please reload page."
-msgstr "Το αναγνωριστικό έληξε. Παρακαλώ επανα-φορτώστε την σελίδα."
+msgstr "Το αναγνωριστικό έληξε. Παρακαλώ φορτώστε ξανά την σελίδα."
-#: template.php:86
+#: template.php:87
msgid "seconds ago"
msgstr "δευτερόλεπτα πριν"
-#: template.php:87
+#: template.php:88
msgid "1 minute ago"
msgstr "1 λεπτό πριν"
-#: template.php:88
+#: template.php:89
#, php-format
msgid "%d minutes ago"
msgstr "%d λεπτά πριν"
-#: template.php:91
+#: template.php:92
msgid "today"
msgstr "σήμερα"
-#: template.php:92
+#: template.php:93
msgid "yesterday"
msgstr "χθές"
-#: template.php:93
+#: template.php:94
#, php-format
msgid "%d days ago"
msgstr "%d ημέρες πριν"
-#: template.php:94
+#: template.php:95
msgid "last month"
msgstr "τον προηγούμενο μήνα"
-#: template.php:95
+#: template.php:96
msgid "months ago"
msgstr "μήνες πριν"
-#: template.php:96
+#: template.php:97
msgid "last year"
msgstr "τον προηγούμενο χρόνο"
-#: template.php:97
+#: template.php:98
msgid "years ago"
msgstr "χρόνια πριν"
#: updater.php:66
#, php-format
msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s είναι διαθέσιμα. Δείτε <a href=\"%s\">περισσότερες πληροφορίες</a>"
#: updater.php:68
msgid "up to date"
-msgstr ""
+msgstr "ενημερωμένο"
#: updater.php:71
msgid "updates check is disabled"
-msgstr ""
+msgstr "ο έλεγχος ενημερώσεων είναι απενεργοποιημένος"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index bbec7abd9bf..6ae56f02706 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -4,19 +4,20 @@
#
# Translators:
# Dimitris M. <monopatis@gmail.com>, 2012.
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
# <icewind1991@gmail.com>, 2012.
# Marios Bekatoros <>, 2012.
# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
# <petros.kyladitis@gmail.com>, 2011.
-# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012.
+# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-20 02:05+0200\n"
+"PO-Revision-Date: 2012-09-19 22:58+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\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,11 +36,15 @@ msgstr "Σφάλμα πιστοποίησης"
#: ajax/creategroup.php:19
msgid "Group already exists"
-msgstr ""
+msgstr "Η ομάδα υπάρχει ήδη"
#: ajax/creategroup.php:28
msgid "Unable to add group"
-msgstr ""
+msgstr "Αδυναμία προσθήκης ομάδας"
+
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "Αδυναμία ενεργοποίησης εφαρμογής "
#: ajax/lostpassword.php:14
msgid "Email saved"
@@ -59,11 +64,11 @@ msgstr "Μη έγκυρο αίτημα"
#: ajax/removegroup.php:16
msgid "Unable to delete group"
-msgstr ""
+msgstr "Αδυναμία διαγραφής ομάδας"
#: ajax/removeuser.php:22
msgid "Unable to delete user"
-msgstr ""
+msgstr "Αδυναμία διαγραφής χρήστη"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -72,22 +77,18 @@ msgstr "Η γλώσσα άλλαξε"
#: ajax/togglegroups.php:25
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Αδυναμία προσθήκη χρήστη στην ομάδα %s"
#: ajax/togglegroups.php:31
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
-
-#: js/apps.js:18
-msgid "Error"
-msgstr "Σφάλμα"
+msgstr "Αδυναμία αφαίρεσης χρήστη από την ομάδα %s"
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Απενεργοποίηση"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Ενεργοποίηση"
@@ -110,69 +111,73 @@ msgid ""
"strongly suggest that you configure your webserver in a way that the data "
"directory is no longer accessible or you move the data directory outside the"
" webserver document root."
-msgstr ""
+msgstr "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανότατα προσβάσιμα από το διαδίκτυο. Το αρχείο .htaccess που παρέχει το owncloud, δεν λειτουργεί. Σας συνιστούμε να ρυθμίσετε τον εξυπηρετητή σας έτσι ώστε ο κατάλογος δεδομένων να μην είναι πλεον προσβάσιμος ή μετακινήστε τον κατάλογο δεδομένων εκτός του καταλόγου document του εξυπηρετητή σας."
#: templates/admin.php:31
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "Εκτέλεση μίας εργασίας με κάθε σελίδα που φορτώνεται"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "Εκτέλεση μιας εργασίας με κάθε σελίδα που φορτώνεται"
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "Το cron.php έχει καταχωρηθεί σε μια webcron υπηρεσία"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "Το cron.php είναι καταχωρημένο στην υπηρεσία webcron. Να καλείται μια φορά το λεπτό η σελίδα cron.php από τον root του owncloud μέσω http"
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "Χρήση της υπηρεσίας cron του συστήματος"
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "Χρήση υπηρεσίας συστήματος cron. Να καλείται μια φορά το λεπτό, το αρχείο cron.php από τον φάκελο του owncloud μέσω του cronjob του συστήματος."
-#: templates/admin.php:41
-msgid "Share API"
-msgstr ""
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Διαμοιρασμός"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
-msgstr ""
+msgstr "Ενεργοποίηση API Διαμοιρασμού"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν το API Διαμοιρασμού"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
-msgstr ""
+msgstr "Να επιτρέπονται σύνδεσμοι"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζονται δημόσια με συνδέσμους"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
-msgstr ""
+msgstr "Να επιτρέπεται ο επαναδιαμοιρασμός"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Να επιτρέπεται ο διαμοιρασμός με οποιονδήποτε"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Να επιτρέπεται ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Αρχείο καταγραφής"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Περισσότερο"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -180,7 +185,7 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>, ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
#: templates/apps.php:10
msgid "Add your App"
@@ -196,7 +201,7 @@ msgstr "Η σελίδα εφαρμογών στο apps.owncloud.com"
#: templates/apps.php:30
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-άδεια από <span class=\"author\"></span>"
#: templates/help.php:9
msgid "Documentation"
@@ -223,12 +228,9 @@ msgid "Answer"
msgstr "Απάντηση"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Χρησιμοποιείτε"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "από τα διαθέσιμα"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "Έχετε χρησιμοποιήσει <strong>%s</strong> από τα διαθέσιμα <strong>%s<strong>"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -236,11 +238,11 @@ msgstr "Πελάτες συγχρονισμού για Desktop και Mobile"
#: templates/personal.php:13
msgid "Download"
-msgstr "Κατέβασε"
+msgstr "Λήψη"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Ο κωδικός πρόσβασής σας άλλαξε"
+msgid "Your password was changed"
+msgstr "Το συνθηματικό σας έχει αλλάξει"
#: templates/personal.php:20
msgid "Unable to change your password"
@@ -248,11 +250,11 @@ msgstr "Δεν ήταν δυνατή η αλλαγή του κωδικού πρ
#: templates/personal.php:21
msgid "Current password"
-msgstr "Τρέχων κωδικός πρόσβασης"
+msgstr "Τρέχων συνθηματικό"
#: templates/personal.php:22
msgid "New password"
-msgstr "Νέος κωδικός"
+msgstr "Νέο συνθηματικό"
#: templates/personal.php:23
msgid "show"
@@ -260,7 +262,7 @@ msgstr "εμφάνιση"
#: templates/personal.php:24
msgid "Change password"
-msgstr "Αλλαγή κωδικού πρόσβασης"
+msgstr "Αλλαγή συνθηματικού"
#: templates/personal.php:30
msgid "Email"
@@ -272,7 +274,7 @@ msgstr "Διεύθυνση ηλεκτρονικού ταχυδρομείου σ
#: templates/personal.php:32
msgid "Fill in an email address to enable password recovery"
-msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση κωδικού πρόσβασης"
+msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού"
#: templates/personal.php:38 templates/personal.php:39
msgid "Language"
@@ -292,7 +294,7 @@ msgstr "Όνομα"
#: templates/users.php:23 templates/users.php:77
msgid "Password"
-msgstr "Κωδικός"
+msgstr "Συνθηματικό"
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
@@ -312,7 +314,7 @@ msgstr "Άλλα"
#: templates/users.php:80 templates/users.php:112
msgid "Group Admin"
-msgstr "Διαχειρηστής ομάδας"
+msgstr "Ομάδα Διαχειριστών"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 3752a64b5d4..0509e10da4d 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -4,19 +4,20 @@
#
# Translators:
# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Marios Bekatoros <>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 07:17+0000\n"
+"Last-Translator: Marios Bekatoros <>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
msgid "Host"
@@ -29,7 +30,7 @@ msgstr ""
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "Base DN"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
@@ -37,7 +38,7 @@ msgstr ""
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "User DN"
#: templates/settings.php:10
msgid ""
@@ -56,7 +57,7 @@ msgstr ""
#: templates/settings.php:12
msgid "User Login Filter"
-msgstr ""
+msgstr "User Login Filter"
#: templates/settings.php:12
#, php-format
@@ -72,7 +73,7 @@ msgstr ""
#: templates/settings.php:13
msgid "User List Filter"
-msgstr ""
+msgstr "User List Filter"
#: templates/settings.php:13
msgid "Defines the filter to apply, when retrieving users."
@@ -84,7 +85,7 @@ msgstr ""
#: templates/settings.php:14
msgid "Group Filter"
-msgstr ""
+msgstr "Group Filter"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
@@ -100,19 +101,19 @@ msgstr "Θύρα"
#: templates/settings.php:18
msgid "Base User Tree"
-msgstr ""
+msgstr "Base User Tree"
#: templates/settings.php:19
msgid "Base Group Tree"
-msgstr ""
+msgstr "Base Group Tree"
#: templates/settings.php:20
msgid "Group-Member association"
-msgstr ""
+msgstr "Group-Member association"
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "Χρήση TLS"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
@@ -138,7 +139,7 @@ msgstr ""
#: templates/settings.php:24
msgid "User Display Name Field"
-msgstr ""
+msgstr "User Display Name Field"
#: templates/settings.php:24
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
@@ -146,7 +147,7 @@ msgstr ""
#: templates/settings.php:25
msgid "Group Display Name Field"
-msgstr ""
+msgstr "Group Display Name Field"
#: templates/settings.php:25
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 416d3dd21f8..49822abb505 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -32,58 +32,62 @@ msgstr "Ĉu neniu kategorio estas aldonota?"
msgid "This category already exists: "
msgstr "Ĉi tiu kategorio jam ekzistas: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Agordo"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Januaro"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Februaro"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Marto"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Aprilo"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Majo"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Junio"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Julio"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Aŭgusto"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Septembro"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Oktobro"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Novembro"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Decembro"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Nuligi"
@@ -104,10 +108,110 @@ msgstr "Akcepti"
msgid "No categories selected for deletion."
msgstr "Neniu kategorio elektiĝis por forigo."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Eraro"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Pasvorto"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "La pasvorto de ownCloud restariĝis."
@@ -193,10 +297,6 @@ msgstr "Aldoni"
msgid "Create an <strong>admin account</strong>"
msgstr "Krei <strong>administran konton</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Pasvorto"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Progresinta"
@@ -228,7 +328,7 @@ msgstr "Datumbaza nomo"
#: templates/installation.php:109
msgid "Database tablespace"
-msgstr ""
+msgstr "Datumbaza tabelospaco"
#: templates/installation.php:115
msgid "Database host"
@@ -238,11 +338,11 @@ msgstr "Datumbaza gastigo"
msgid "Finish setup"
msgstr "Fini la instalon"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "TTT-servoj sub via kontrolo"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Elsaluti"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index d0b82a0e4fd..1180ed8bb77 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -53,39 +53,51 @@ msgstr "Malsukcesis skribo al disko"
msgid "Files"
msgstr "Dosieroj"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Malkunhavigi"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Forigi"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "jam ekzistas"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "anstataŭigi"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "sugesti nomon"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "nuligi"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "anstataŭigita"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "malfari"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "kun"
#: js/filelist.js:271
+msgid "unshared"
+msgstr "malkunhavigita"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "forigita"
@@ -101,7 +113,7 @@ msgstr "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duum
msgid "Upload Error"
msgstr "Alŝuta eraro"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Traktotaj"
@@ -109,36 +121,44 @@ msgstr "Traktotaj"
msgid "Upload cancelled."
msgstr "La alŝuto nuliĝis."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Nevalida nomo, “/” ne estas permesata."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Grando"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Modifita"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "dosierujo"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "dosierujoj"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "dosiero"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "dosieroj"
@@ -172,7 +192,7 @@ msgstr "Maksimuma enirgrando por ZIP-dosieroj"
#: templates/admin.php:14
msgid "Save"
-msgstr ""
+msgstr "Konservi"
#: templates/index.php:7
msgid "New"
@@ -190,7 +210,7 @@ msgstr "Dosierujo"
msgid "From url"
msgstr "El URL"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Alŝuti"
@@ -198,36 +218,36 @@ msgstr "Alŝuti"
msgid "Cancel upload"
msgstr "Nuligi alŝuton"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Nenio estas ĉi tie. Alŝutu ion!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Nomo"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Kunhavigi"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Elŝuti"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Elŝuto tro larĝa"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Dosieroj estas skanataj, bonvolu atendi."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Nuna skano"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 8ad6599fb06..dc0d47ec89b 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -26,14 +26,24 @@ msgstr "Pasvorto"
msgid "Submit"
msgstr "Sendi"
-#: templates/public.php:9 templates/public.php:19
-msgid "Download"
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
msgstr ""
-#: templates/public.php:18
-msgid "No preview available for"
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr "Elŝuti"
+
+#: templates/public.php:29
+msgid "No preview available for"
+msgstr "Ne haveblas antaŭvido por"
+
+#: templates/public.php:37
msgid "web services under your control"
-msgstr ""
+msgstr "TTT-servoj regataj de vi"
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index d9e4f78ec13..ef4f6f190dd 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.po
@@ -8,28 +8,36 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "Eksvalidigi ĉiujn eldonojn"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
-msgstr ""
+msgstr "Eldonoj"
#: templates/settings-personal.php:7
msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Kapabligi dosiereldonkontrolon"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 6b56eeafdea..5e677a60455 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -8,37 +8,37 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 21:50+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:288
+#: app.php:285
msgid "Help"
msgstr "Helpo"
-#: app.php:295
+#: app.php:292
msgid "Personal"
msgstr "Persona"
-#: app.php:300
+#: app.php:297
msgid "Settings"
msgstr "Agordo"
-#: app.php:305
+#: app.php:302
msgid "Users"
msgstr "Uzantoj"
-#: app.php:312
+#: app.php:309
msgid "Apps"
msgstr "Aplikaĵoj"
-#: app.php:314
+#: app.php:311
msgid "Admin"
msgstr "Administranto"
@@ -70,57 +70,57 @@ msgstr "Aŭtentiga eraro"
msgid "Token expired. Please reload page."
msgstr "Ĵetono eksvalidiĝis. Bonvolu reŝargi la paĝon."
-#: template.php:86
+#: template.php:87
msgid "seconds ago"
msgstr "sekundojn antaŭe"
-#: template.php:87
+#: template.php:88
msgid "1 minute ago"
msgstr "antaŭ 1 minuto"
-#: template.php:88
+#: template.php:89
#, php-format
msgid "%d minutes ago"
msgstr "antaŭ %d minutoj"
-#: template.php:91
+#: template.php:92
msgid "today"
msgstr "hodiaŭ"
-#: template.php:92
+#: template.php:93
msgid "yesterday"
msgstr "hieraŭ"
-#: template.php:93
+#: template.php:94
#, php-format
msgid "%d days ago"
msgstr "antaŭ %d tagoj"
-#: template.php:94
+#: template.php:95
msgid "last month"
msgstr "lasta monato"
-#: template.php:95
+#: template.php:96
msgid "months ago"
msgstr "monatojn antaŭe"
-#: template.php:96
+#: template.php:97
msgid "last year"
msgstr "lasta jaro"
-#: template.php:97
+#: template.php:98
msgid "years ago"
msgstr "jarojn antaŭe"
#: updater.php:66
#, php-format
msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s haveblas. Ekhavu <a href=\"%s\">pli da informo</a>"
#: updater.php:68
msgid "up to date"
-msgstr ""
+msgstr "ĝisdata"
#: updater.php:71
msgid "updates check is disabled"
-msgstr ""
+msgstr "ĝisdateckontrolo estas malkapabligita"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index d51e0c54239..210466357e4 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "La retpoŝtadreso konserviĝis"
@@ -74,15 +78,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr "Eraro"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Malkapabligi"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Kapabligi"
@@ -111,63 +111,67 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "lanĉi unu taskon po ĉiu paĝo ŝargita"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php estas registrita kiel webcron-servilo"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
-msgstr "uzi la cron-servon de la sistemo"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Protokolo"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Pli"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,12 +222,9 @@ msgid "Answer"
msgstr "Respondi"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Vi uzas"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "el la disponeblaj"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -234,8 +235,8 @@ msgid "Download"
msgstr "Elŝuti"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Via pasvorto ŝanĝiĝis"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index efe18cd7f0a..98134cb585f 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -37,58 +37,62 @@ msgstr "¿Ninguna categoría para añadir?"
msgid "This category already exists: "
msgstr "Esta categoría ya existe: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Enero"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Febrero"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Marzo"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Abril"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Mayo"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Junio"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Julio"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Agosto"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Septiembre"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Octubre"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Noviembre"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Diciembre"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Cancelar"
@@ -109,10 +113,110 @@ msgstr "Aceptar"
msgid "No categories selected for deletion."
msgstr "No hay categorías seleccionadas para borrar."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Fallo"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Contraseña"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Reiniciar contraseña de ownCloud"
@@ -198,10 +302,6 @@ msgstr "Añadir"
msgid "Create an <strong>admin account</strong>"
msgstr "Crea una <strong>cuenta de administrador</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Contraseña"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Avanzado"
@@ -243,11 +343,11 @@ msgstr "Host de la base de datos"
msgid "Finish setup"
msgstr "Completar la instalación"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "servicios web bajo tu control"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Salir"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 1889dd54e98..38651e3854a 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -7,13 +7,14 @@
# <juanma@kde.org.ar>, 2012.
# Rubén Trujillo <rubentrf@gmail.com>, 2012.
# <sergioballesterossolanas@gmail.com>, 2011, 2012.
+# <sergio@entrecables.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 05:09+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"Last-Translator: I Robot <thomas.mueller@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"
@@ -55,39 +56,51 @@ msgstr "La escritura en disco ha fallado"
msgid "Files"
msgstr "Archivos"
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Dejar de compartir"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
-msgstr "Eliminado"
+msgstr "Eliminar"
+
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "ya existe"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "reemplazar"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr "sugerir nombre"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "cancelar"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "reemplazado"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "deshacer"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "con"
-#: js/filelist.js:266
+#: js/filelist.js:271
+msgid "unshared"
+msgstr "no compartido"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "borrado"
@@ -103,7 +116,7 @@ msgstr "No ha sido posible subir tu archivo porque es un directorio o tiene 0 by
msgid "Upload Error"
msgstr "Error al subir el archivo"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Pendiente"
@@ -111,36 +124,44 @@ msgstr "Pendiente"
msgid "Upload cancelled."
msgstr "Subida cancelada."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Nombre no válido, '/' no está permitido."
-#: js/files.js:746 templates/index.php:56
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "carpeta"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "carpetas"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "archivo"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "archivos"
@@ -192,7 +213,7 @@ msgstr "Carpeta"
msgid "From url"
msgstr "Desde la URL"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Subir"
@@ -216,20 +237,20 @@ msgstr "Compartir"
msgid "Download"
msgstr "Descargar"
-#: templates/index.php:65
+#: templates/index.php:75
msgid "Upload too large"
msgstr "El archivo es demasiado grande"
-#: templates/index.php:67
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor."
-#: templates/index.php:72
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Se están escaneando los archivos, por favor espere."
-#: templates/index.php:75
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Escaneo actual"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index d6c7ffea13d..7653ee57ec0 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -10,15 +10,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 22:41+0000\n"
-"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -28,14 +28,24 @@ msgstr "Contraseña"
msgid "Submit"
msgstr "Enviar"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "Descargar"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "No hay vista previa disponible para"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr "Servicios web bajo su control"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 05f6814b37a..d5e293e03aa 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -10,20 +10,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 18:22+0000\n"
-"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "Expirar todas las versiones"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "Versiones"
@@ -33,5 +37,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "Esto eliminará todas las versiones guardadas como copia de seguridad de tus archivos"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Habilitar versionamiento de archivos"
+msgid "Files Versioning"
+msgstr "Versionado de archivos"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Habilitar"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 8d1da62428c..e822d402fd8 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -8,6 +8,7 @@
# <juanma@kde.org.ar>, 2011-2012.
# <monty_2731@hotmail.com>, 2011.
# oSiNaReF <>, 2012.
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
# <rodrigo.calvo@gmail.com>, 2012.
# <rom1dep@gmail.com>, 2011.
# Rubén Trujillo <rubentrf@gmail.com>, 2012.
@@ -16,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 15:29+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@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"
@@ -43,6 +44,10 @@ msgstr "El grupo ya existe"
msgid "Unable to add group"
msgstr "No se pudo añadir el grupo"
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "No puedo habilitar la app."
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Correo guardado"
@@ -81,15 +86,11 @@ msgstr "Imposible añadir el usuario al grupo %s"
msgid "Unable to remove user from group %s"
msgstr "Imposible eliminar al usuario del grupo %s"
-#: js/apps.js:18
-msgid "Error"
-msgstr "Error"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Desactivar"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Activar"
@@ -118,63 +119,67 @@ msgstr "El directorio de datos -data- y sus archivos probablemente son accesible
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "ejecutar una tarea con cada página cargada"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "Ejecutar una tarea con cada página cargada"
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php se registra en un servicio webcron"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php está registrado como un servicio del webcron. Llama a la página de cron.php en la raíz de owncloud cada minuto sobre http."
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "usar servicio cron del sistema"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
-msgstr "API de compartición"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Compartir"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Activar API de compartición"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "Permitir a las aplicaciones usar la API de compartición"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "Permitir enlaces"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr "Permitir a los usuarios compartir elementos públicamente con enlaces"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "Permitir re-compartir"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr "Permitir a los usuarios compartir elementos compartidos con ellos de nuevo"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "Permitir a los usuarios compartir con cualquiera"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr "Permitir a los usuarios compartir con usuarios en sus grupos"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Registro"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Más"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -225,12 +230,9 @@ msgid "Answer"
msgstr "Respuesta"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Estás utilizando"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "del total disponible de"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -241,8 +243,8 @@ msgid "Download"
msgstr "Descargar"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Tu contraseña ha sido cambiada"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index f8d3d186521..f0c4468eefb 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -30,58 +30,62 @@ msgstr "Pole kategooriat, mida lisada?"
msgid "This category already exists: "
msgstr "See kategooria on juba olemas: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Seaded"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Jaanuar"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Veebruar"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Märts"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Aprill"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Mai"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Juuni"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Juuli"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "August"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "September"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Oktoober"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "November"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Detsember"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Loobu"
@@ -102,10 +106,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Kustutamiseks pole kategooriat valitud."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Viga"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Parool"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ownCloud parooli taastamine"
@@ -191,10 +295,6 @@ msgstr "Lisa"
msgid "Create an <strong>admin account</strong>"
msgstr "Loo <strong>admini konto</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Parool"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Lisavalikud"
@@ -236,11 +336,11 @@ msgstr "Andmebaasi host"
msgid "Finish setup"
msgstr "Lõpeta seadistamine"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "veebiteenused sinu kontrolli all"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Logi välja"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index fac2c5dc01b..95147571c8d 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Rivo Zängov <eraser@eraser.ee>, 2011, 2012.
+# Rivo Zängov <eraser@eraser.ee>, 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -52,39 +52,51 @@ msgstr "Kettale kirjutamine ebaõnnestus"
msgid "Files"
msgstr "Failid"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Lõpeta jagamine"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Kustuta"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "on juba olemas"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "asenda"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "soovita nime"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "loobu"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "asendatud"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "tagasi"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "millega"
#: js/filelist.js:271
+msgid "unshared"
+msgstr "jagamata"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "kustutatud"
@@ -100,7 +112,7 @@ msgstr "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suu
msgid "Upload Error"
msgstr "Üleslaadimise viga"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Ootel"
@@ -108,36 +120,44 @@ msgstr "Ootel"
msgid "Upload cancelled."
msgstr "Üleslaadimine tühistati."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Vigane nimi, '/' pole lubatud."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Suurus"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Muudetud"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "kaust"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "kausta"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "fail"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "faili"
@@ -171,7 +191,7 @@ msgstr "Maksimaalne ZIP-faili sisestatava faili suurus"
#: templates/admin.php:14
msgid "Save"
-msgstr ""
+msgstr "Salvesta"
#: templates/index.php:7
msgid "New"
@@ -189,7 +209,7 @@ msgstr "Kaust"
msgid "From url"
msgstr "URL-ilt"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Lae üles"
@@ -197,36 +217,36 @@ msgstr "Lae üles"
msgid "Cancel upload"
msgstr "Tühista üleslaadimine"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Siin pole midagi. Lae midagi üles!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Nimi"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Jaga"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Lae alla"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Üleslaadimine on liiga suur"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Faile skannitakse, palun oota"
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Praegune skannimine"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 3daaecb1633..e8e4379ae09 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 06:32+0000\n"
+"POT-Creation-Date: 2012-09-10 02:02+0200\n"
+"PO-Revision-Date: 2012-09-09 20:19+0000\n"
"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: et_EE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:3
msgid "External Storage"
@@ -28,7 +28,7 @@ msgstr "Ühenduspunkt"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "Admin"
#: templates/settings.php:9
msgid "Configuration"
@@ -40,7 +40,7 @@ msgstr "Valikud"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "Rakendatav"
#: templates/settings.php:23
msgid "Add mount point"
@@ -68,16 +68,16 @@ msgstr "Kustuta"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL root sertifikaadid"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Impordi root sertifikaadid"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Luba kasutajatele väline salvestamine"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Luba kasutajatel ühendada külge nende enda välised salvestusseadmed"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 7942c92767e..e877c9e1c25 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -8,32 +8,42 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: et_EE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
-msgstr ""
+msgstr "Parool"
#: templates/authenticate.php:6
msgid "Submit"
+msgstr "Saada"
+
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
-msgid "Download"
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr "Lae alla"
+
+#: templates/public.php:29
msgid "No preview available for"
-msgstr ""
+msgstr "Eelvaadet pole saadaval"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
-msgstr ""
+msgstr "veebitenused sinu kontrolli all"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index afd1bc89da2..33dc90ce2ff 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.po
@@ -8,28 +8,36 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: et_EE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "Kõikide versioonide aegumine"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
-msgstr ""
+msgstr "Versioonid"
#: templates/settings-personal.php:7
msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "See kustutab kõik sinu failidest tehtud varuversiooni"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Luba failide versioonihaldus"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 789beb732bf..da4dcfe5269 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -8,37 +8,37 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-12 02:01+0200\n"
+"PO-Revision-Date: 2012-09-11 10:18+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: et_EE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:288
+#: app.php:285
msgid "Help"
msgstr "Abiinfo"
-#: app.php:295
+#: app.php:292
msgid "Personal"
msgstr "Isiklik"
-#: app.php:300
+#: app.php:297
msgid "Settings"
msgstr "Seaded"
-#: app.php:305
+#: app.php:302
msgid "Users"
msgstr "Kasutajad"
-#: app.php:312
+#: app.php:309
msgid "Apps"
msgstr "Rakendused"
-#: app.php:314
+#: app.php:311
msgid "Admin"
msgstr "Admin"
@@ -70,57 +70,57 @@ msgstr "Autentimise viga"
msgid "Token expired. Please reload page."
msgstr "Kontrollkood aegus. Paelun lae leht uuesti."
-#: template.php:86
+#: template.php:87
msgid "seconds ago"
msgstr "sekundit tagasi"
-#: template.php:87
+#: template.php:88
msgid "1 minute ago"
msgstr "1 minut tagasi"
-#: template.php:88
+#: template.php:89
#, php-format
msgid "%d minutes ago"
msgstr "%d minutit tagasi"
-#: template.php:91
+#: template.php:92
msgid "today"
msgstr "täna"
-#: template.php:92
+#: template.php:93
msgid "yesterday"
msgstr "eile"
-#: template.php:93
+#: template.php:94
#, php-format
msgid "%d days ago"
msgstr "%d päeva tagasi"
-#: template.php:94
+#: template.php:95
msgid "last month"
msgstr "eelmisel kuul"
-#: template.php:95
+#: template.php:96
msgid "months ago"
msgstr "kuud tagasi"
-#: template.php:96
+#: template.php:97
msgid "last year"
msgstr "eelmisel aastal"
-#: template.php:97
+#: template.php:98
msgid "years ago"
msgstr "aastat tagasi"
#: updater.php:66
#, php-format
msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s on saadaval. Vaata <a href=\"%s\">lisainfot</a>"
#: updater.php:68
msgid "up to date"
-msgstr ""
+msgstr "ajakohane"
#: updater.php:71
msgid "updates check is disabled"
-msgstr ""
+msgstr "uuenduste kontrollimine on välja lülitatud"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 2060adcac0d..dc320ccf4cc 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -4,13 +4,13 @@
#
# Translators:
# <icewind1991@gmail.com>, 2012.
-# Rivo Zängov <eraser@eraser.ee>, 2011, 2012.
+# Rivo Zängov <eraser@eraser.ee>, 2011-2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -30,10 +30,14 @@ msgstr "Autentimise viga"
#: ajax/creategroup.php:19
msgid "Group already exists"
-msgstr ""
+msgstr "Grupp on juba olemas"
#: ajax/creategroup.php:28
msgid "Unable to add group"
+msgstr "Keela grupi lisamine"
+
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
msgstr ""
#: ajax/lostpassword.php:14
@@ -54,11 +58,11 @@ msgstr "Vigane päring"
#: ajax/removegroup.php:16
msgid "Unable to delete group"
-msgstr ""
+msgstr "Keela grupi kustutamine"
#: ajax/removeuser.php:22
msgid "Unable to delete user"
-msgstr ""
+msgstr "Keela kasutaja kustutamine"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -67,22 +71,18 @@ msgstr "Keel on muudetud"
#: ajax/togglegroups.php:25
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Kasutajat ei saa lisada gruppi %s"
#: ajax/togglegroups.php:31
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Kasutajat ei saa eemaldada grupist %s"
-#: js/apps.js:18
-msgid "Error"
-msgstr "Viga"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Lülita välja"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Lülita sisse"
@@ -111,63 +111,67 @@ msgstr ""
msgid "Cron"
msgstr "Ajastatud töö"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "käivita iga laetud lehe juures üks ülesanne"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php on webcron teenuses registreeritud"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
-msgstr "kasuta süsteemide cron teenuseid"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
-msgstr ""
+msgstr "Luba jagamise API"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Luba rakendustel kasutada jagamise API-t"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
-msgstr ""
+msgstr "Luba linke"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Luba kasutajatel jagada kirjeid avalike linkidega"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
-msgstr ""
+msgstr "Luba edasijagamine"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Luba kasutajatel kõigiga jagada"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Logi"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Veel"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -191,7 +195,7 @@ msgstr "Vaata rakenduste lehte aadressil apps.owncloud.com"
#: templates/apps.php:30
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>"
#: templates/help.php:9
msgid "Documentation"
@@ -218,12 +222,9 @@ msgid "Answer"
msgstr "Vasta"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Sa kasutad"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "saadaolevast"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -234,8 +235,8 @@ msgid "Download"
msgstr "Lae alla"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Sinu parooli on muudetud"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 80d9727ff0d..d955f91c9dd 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-12 02:01+0200\n"
+"PO-Revision-Date: 2012-09-11 10:46+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: et_EE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
msgid "Host"
@@ -29,7 +29,7 @@ msgstr ""
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "Baas DN"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
@@ -37,7 +37,7 @@ msgstr ""
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "Kasutaja DN"
#: templates/settings.php:10
msgid ""
@@ -56,7 +56,7 @@ msgstr ""
#: templates/settings.php:12
msgid "User Login Filter"
-msgstr ""
+msgstr "Kasutajanime filter"
#: templates/settings.php:12
#, php-format
@@ -68,19 +68,19 @@ msgstr ""
#: templates/settings.php:12
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\""
#: templates/settings.php:13
msgid "User List Filter"
-msgstr ""
+msgstr "Kasutajate nimekirja filter"
#: templates/settings.php:13
msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Määrab kasutajaid hankides filtri, mida rakendatakse."
#: templates/settings.php:13
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=person\"."
#: templates/settings.php:14
msgid "Group Filter"
@@ -88,11 +88,11 @@ msgstr "Grupi filter"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Määrab gruppe hankides filtri, mida rakendatakse."
#: templates/settings.php:14
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\"."
#: templates/settings.php:17
msgid "Port"
@@ -100,15 +100,15 @@ msgstr "Port"
#: templates/settings.php:18
msgid "Base User Tree"
-msgstr ""
+msgstr "Baaskasutaja puu"
#: templates/settings.php:19
msgid "Base Group Tree"
-msgstr ""
+msgstr "Baasgrupi puu"
#: templates/settings.php:20
msgid "Group-Member association"
-msgstr ""
+msgstr "Grupiliikme seotus"
#: templates/settings.php:21
msgid "Use TLS"
@@ -116,15 +116,15 @@ msgstr "Kasutaja TLS"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Ära kasuta seda SSL ühenduse jaoks, see ei toimi."
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Mittetõstutundlik LDAP server (Windows)"
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Lülita SSL sertifikaadi kontrollimine välja."
#: templates/settings.php:23
msgid ""
@@ -134,23 +134,23 @@ msgstr ""
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Pole soovitatav, kasuta ainult testimiseks."
#: templates/settings.php:24
msgid "User Display Name Field"
-msgstr ""
+msgstr "Kasutaja näidatava nime väli"
#: templates/settings.php:24
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks."
#: templates/settings.php:25
msgid "Group Display Name Field"
-msgstr ""
+msgstr "Grupi näidatava nime väli"
#: templates/settings.php:25
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks."
#: templates/settings.php:27
msgid "in bytes"
@@ -158,13 +158,13 @@ msgstr "baitides"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "sekundites. Muudatus tühjendab vahemälu."
#: templates/settings.php:30
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
-msgstr ""
+msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus."
#: templates/settings.php:32
msgid "Help"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 476fbcd0a11..a4e5903ebdd 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -31,58 +31,62 @@ msgstr "Ez dago gehitzeko kategoriarik?"
msgid "This category already exists: "
msgstr "Kategoria hau dagoeneko existitzen da:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Ezarpenak"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Urtarrila"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Otsaila"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Martxoa"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Apirila"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Maiatza"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Ekaina"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Uztaila"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Abuztua"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Iraila"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Urria"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Azaroa"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Abendua"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Ezeztatu"
@@ -103,10 +107,110 @@ msgstr "Ados"
msgid "No categories selected for deletion."
msgstr "Ez da ezabatzeko kategoriarik hautatu."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Errorea"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Pasahitza"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ownCloud-en pasahitza berrezarri"
@@ -192,10 +296,6 @@ msgstr "Gehitu"
msgid "Create an <strong>admin account</strong>"
msgstr "Sortu <strong>kudeatzaile kontu<strong> bat"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Pasahitza"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Aurreratua"
@@ -227,7 +327,7 @@ msgstr "Datubasearen izena"
#: templates/installation.php:109
msgid "Database tablespace"
-msgstr ""
+msgstr "Datu basearen taula-lekua"
#: templates/installation.php:115
msgid "Database host"
@@ -237,11 +337,11 @@ msgstr "Datubasearen hostalaria"
msgid "Finish setup"
msgstr "Bukatu konfigurazioa"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "web zerbitzuak zure kontrolpean"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Saioa bukatu"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 810a5ae18c5..3520afeeab3 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -53,39 +53,51 @@ msgstr "Errore bat izan da diskoan idazterakoan"
msgid "Files"
msgstr "Fitxategiak"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Ez partekatu"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Ezabatu"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "dagoeneko existitzen da"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "ordeztu"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "aholkatu izena"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "ezeztatu"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "ordeztua"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "desegin"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "honekin"
#: js/filelist.js:271
+msgid "unshared"
+msgstr "Ez partekatuta"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "ezabatuta"
@@ -101,7 +113,7 @@ msgstr "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu"
msgid "Upload Error"
msgstr "Igotzean errore bat suertatu da"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Zain"
@@ -109,36 +121,44 @@ msgstr "Zain"
msgid "Upload cancelled."
msgstr "Igoera ezeztatuta"
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Baliogabeko izena, '/' ezin da erabili. "
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr "fitxategiak eskaneatuta"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "errore bat egon da eskaneatzen zen bitartean"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Tamaina"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Aldatuta"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "karpeta"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "Karpetak"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "fitxategia"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "fitxategiak"
@@ -172,7 +192,7 @@ msgstr "ZIP fitxategien gehienezko tamaina"
#: templates/admin.php:14
msgid "Save"
-msgstr ""
+msgstr "Gorde"
#: templates/index.php:7
msgid "New"
@@ -190,7 +210,7 @@ msgstr "Karpeta"
msgid "From url"
msgstr "URLtik"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Igo"
@@ -198,36 +218,36 @@ msgstr "Igo"
msgid "Cancel upload"
msgstr "Ezeztatu igoera"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Ez dago ezer. Igo zerbait!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Izena"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Elkarbanatu"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Deskargatu"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Igotakoa handiegia da"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Orain eskaneatzen ari da"
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index f614dd9418d..5ba75efacda 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 20:52+0000\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 19:25+0000\n"
"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: eu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:3
msgid "External Storage"
@@ -40,7 +40,7 @@ msgstr "Aukerak"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "Aplikagarria"
#: templates/settings.php:23
msgid "Add mount point"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 162fca43720..ee689c3ee28 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/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: 2012-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 13:00+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
@@ -26,14 +26,24 @@ msgstr "Pasahitza"
msgid "Submit"
msgstr "Bidali"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "Deskargatu"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "Ez dago aurrebista eskuragarririk hauentzat "
-#: templates/public.php:25
+#: templates/public.php:37
msgid "web services under your control"
msgstr "web zerbitzuak zure kontrolpean"
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index 0f7610079ce..3d770fecbb5 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 12:58+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "Expire all versions"
msgstr "Iraungi bertsio guztiak"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "Bertsioak"
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "Honek zure fitxategien bertsio guztiak ezabatuko ditu"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Gaitu fitxategien bertsioak"
+msgid "Files Versioning"
+msgstr "Fitxategien Bertsioak"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Gaitu"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index f23e12e7289..6b7e9ae2ff5 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-21 02:02+0200\n"
+"PO-Revision-Date: 2012-09-20 09:46+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -31,11 +31,15 @@ msgstr "Autentifikazio errorea"
#: ajax/creategroup.php:19
msgid "Group already exists"
-msgstr ""
+msgstr "Taldea dagoeneko existitzenda"
#: ajax/creategroup.php:28
msgid "Unable to add group"
-msgstr ""
+msgstr "Ezin izan da taldea gehitu"
+
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "Ezin izan da aplikazioa gaitu."
#: ajax/lostpassword.php:14
msgid "Email saved"
@@ -55,11 +59,11 @@ msgstr "Baliogabeko eskaria"
#: ajax/removegroup.php:16
msgid "Unable to delete group"
-msgstr ""
+msgstr "Ezin izan da taldea ezabatu"
#: ajax/removeuser.php:22
msgid "Unable to delete user"
-msgstr ""
+msgstr "Ezin izan da erabiltzailea ezabatu"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -68,22 +72,18 @@ msgstr "Hizkuntza aldatuta"
#: ajax/togglegroups.php:25
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Ezin izan da erabiltzailea %s taldera gehitu"
#: ajax/togglegroups.php:31
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
-
-#: js/apps.js:18
-msgid "Error"
-msgstr "Errorea"
+msgstr "Ezin izan da erabiltzailea %s taldetik ezabatu"
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Ez-gaitu"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Gaitu"
@@ -112,63 +112,67 @@ msgstr "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "exekutatu zeregina orri karga bakoitzean"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "Exekutatu zeregin bat orri karga bakoitzean"
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php webcron zerbitzu batean erregistratuta dago"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php webcron zerbitzu batean erregistratua dago. Deitu cron.php orria ownclouden erroan minuturo http bidez."
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "erabili sistemaren cron zerbitzua"
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "Erabili sistemaren cron zerbitzua. Deitu cron.php fitxategia owncloud karpetan minuturo sistemaren cron lan baten bidez."
-#: templates/admin.php:41
-msgid "Share API"
-msgstr "Partekatze APIa"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Partekatzea"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Gaitu Partekatze APIa"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "Baimendu aplikazioak Partekatze APIa erabiltzeko"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "Baimendu loturak"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki partekatzen"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "Baimendu birpartekatzea"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr "Baimendu erabiltzaileak haiekin partekatutako fitxategiak berriz ere partekatzen"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "Baimendu erabiltzaileak edonorekin partekatzen"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin partekatzen"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Egunkaria"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Gehiago"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -192,7 +196,7 @@ msgstr "Ikusi programen orria apps.owncloud.com en"
#: templates/apps.php:30
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>"
#: templates/help.php:9
msgid "Documentation"
@@ -219,12 +223,9 @@ msgid "Answer"
msgstr "Erantzun"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Erabiltzen ari zara "
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "eta guztira erabil dezakezu "
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "Eskuragarri dituzun <strong>%s</strong>etik <strong>%s</strong> erabili duzu"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -235,8 +236,8 @@ msgid "Download"
msgstr "Deskargatu"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Zure pasahitza aldatu da"
+msgid "Your password was changed"
+msgstr "Zere pasahitza aldatu da"
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index b3baf2cb39f..619f8f78f48 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -29,58 +29,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -101,10 +105,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -190,10 +294,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr ""
-
#: templates/installation.php:36
msgid "Advanced"
msgstr ""
@@ -235,11 +335,11 @@ msgstr ""
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr ""
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index 0ed5582c4ff..a8a0becffa1 100644
--- a/l10n/eu_ES/files.po
+++ b/l10n/eu_ES/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -51,39 +51,51 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -99,7 +111,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -107,36 +119,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr ""
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr ""
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -188,7 +208,7 @@ msgstr ""
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr ""
@@ -196,36 +216,36 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr ""
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po
index da8e6d23662..73be8ca6501 100644
--- a/l10n/eu_ES/files_sharing.po
+++ b/l10n/eu_ES/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: eu_ES\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/eu_ES/files_versions.po b/l10n/eu_ES/files_versions.po
index cf5651aa222..522299c7a21 100644
--- a/l10n/eu_ES/files_versions.po
+++ b/l10n/eu_ES/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: eu_ES\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index bca1c25debd..237b2b7f9a6 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -72,15 +76,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -109,63 +109,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,11 +220,8 @@ msgid "Answer"
msgstr ""
#: templates/personal.php:8
-msgid "You use"
-msgstr ""
-
-#: templates/personal.php:8
-msgid "of the available"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
msgstr ""
#: templates/personal.php:12
@@ -232,7 +233,7 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
+msgid "Your password was changed"
msgstr ""
#: templates/personal.php:20
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index df531775248..9fcf2fdf13b 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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -30,58 +30,62 @@ msgstr "آیا گروه دیگری برای افزودن ندارید"
msgid "This category already exists: "
msgstr "این گروه از قبل اضافه شده"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "تنظیمات"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "ژانویه"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "فبریه"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "مارس"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "آوریل"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "می"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "ژوئن"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "جولای"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "آگوست"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "سپتامبر"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "اکتبر"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "نوامبر"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "دسامبر"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "منصرف شدن"
@@ -102,10 +106,110 @@ msgstr "قبول"
msgid "No categories selected for deletion."
msgstr "هیج دسته ای برای پاک شدن انتخاب نشده است"
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "خطا"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "گذرواژه"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "پسورد ابرهای شما تغییرکرد"
@@ -191,10 +295,6 @@ msgstr "افزودن"
msgid "Create an <strong>admin account</strong>"
msgstr "لطفا یک <strong> شناسه برای مدیر</strong> بسازید"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "گذرواژه"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "حرفه ای"
@@ -236,11 +336,11 @@ msgstr "هاست پایگاه داده"
msgid "Finish setup"
msgstr "اتمام نصب"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "سرویس وب تحت کنترل شما"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "خروج"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 2e1f1645041..8ec8a4c57f1 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -54,39 +54,51 @@ msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
msgid "Files"
msgstr "فایل ها"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "پاک کردن"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "وجود دارد"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "جایگزین"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "لغو"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "جایگزین‌شده"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "بازگشت"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "همراه"
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "حذف شده"
@@ -102,7 +114,7 @@ msgstr "ناتوان در بارگذاری یا فایل یک پوشه است ی
msgid "Upload Error"
msgstr "خطا در بار گذاری"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "در انتظار"
@@ -110,36 +122,44 @@ msgstr "در انتظار"
msgid "Upload cancelled."
msgstr "بار گذاری لغو شد"
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "نام نامناسب '/' غیرفعال است"
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "اندازه"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "تغییر یافته"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "پوشه"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "پوشه ها"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "پرونده"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "پرونده ها"
@@ -191,7 +211,7 @@ msgstr "پوشه"
msgid "From url"
msgstr "از نشانی"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "بارگذاری"
@@ -199,36 +219,36 @@ msgstr "بارگذاری"
msgid "Cancel upload"
msgstr "متوقف کردن بار گذاری"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "اینجا هیچ چیز نیست."
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "نام"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "به اشتراک گذاری"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "بارگیری"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "حجم بارگذاری بسیار زیاد است"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد"
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "بازرسی کنونی"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 84f1a537d3c..f7b3799df12 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -26,14 +26,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index 012dceedd11..b7da17a8178 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/files_versions.po
@@ -8,20 +8,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "انقضای تمامی نسخه‌ها"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "فعال‌کردن پرونده‌های نسخه‌بندی"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 9f3314e7060..5a1fe1206ab 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "ایمیل ذخیره شد"
@@ -74,15 +78,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr "خطا"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "غیرفعال"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "فعال"
@@ -111,63 +111,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "کارنامه"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "بیشتر"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,12 +222,9 @@ msgid "Answer"
msgstr "پاسخ"
#: templates/personal.php:8
-msgid "You use"
-msgstr "شما استفاده می کنید"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "از فعال ها"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -234,8 +235,8 @@ msgid "Download"
msgstr "بارگیری"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "گذرواژه شما تغییر یافته"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index 6b84b560723..bc43c823fb5 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
@@ -29,58 +29,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -101,10 +105,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -190,10 +294,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr ""
-
#: templates/installation.php:36
msgid "Advanced"
msgstr ""
@@ -235,11 +335,11 @@ msgstr ""
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr ""
diff --git a/l10n/fi/files.po b/l10n/fi/files.po
index 0a9580f3467..43384339abd 100644
--- a/l10n/fi/files.po
+++ b/l10n/fi/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
@@ -51,39 +51,51 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -99,7 +111,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -107,36 +119,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr ""
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr ""
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -188,7 +208,7 @@ msgstr ""
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr ""
@@ -196,36 +216,36 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr ""
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/fi/files_sharing.po b/l10n/fi/files_sharing.po
index 4cee2cd498e..fcba73eea44 100644
--- a/l10n/fi/files_sharing.po
+++ b/l10n/fi/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/fi/files_versions.po b/l10n/fi/files_versions.po
index cd80c0a4869..7317ba1f3e4 100644
--- a/l10n/fi/files_versions.po
+++ b/l10n/fi/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index b2daafd990f..369ba4da56e 100644
--- a/l10n/fi/settings.po
+++ b/l10n/fi/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
"MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -72,15 +76,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -109,63 +109,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,11 +220,8 @@ msgid "Answer"
msgstr ""
#: templates/personal.php:8
-msgid "You use"
-msgstr ""
-
-#: templates/personal.php:8
-msgid "of the available"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
msgstr ""
#: templates/personal.php:12
@@ -232,7 +233,7 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
+msgid "Your password was changed"
msgstr ""
#: templates/personal.php:20
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index cbce7313693..7b8a511c075 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -35,58 +35,62 @@ msgstr "Ei lisättävää luokkaa?"
msgid "This category already exists: "
msgstr "Tämä luokka on jo olemassa: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Asetukset"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Tammikuu"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Helmikuu"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Maaliskuu"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Huhtikuu"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Toukokuu"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Kesäkuu"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Heinäkuu"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Elokuu"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Syyskuu"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Lokakuu"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Marraskuu"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Joulukuu"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Peru"
@@ -107,10 +111,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Luokkia ei valittu poistettavaksi."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Virhe"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Salasana"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ownCloud-salasanan nollaus"
@@ -196,10 +300,6 @@ msgstr "Lisää"
msgid "Create an <strong>admin account</strong>"
msgstr "Luo <strong>ylläpitäjän tunnus</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Salasana"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Lisäasetukset"
@@ -241,11 +341,11 @@ msgstr "Tietokantapalvelin"
msgid "Finish setup"
msgstr "Viimeistele asennus"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "verkkopalvelut hallinnassasi"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Kirjaudu ulos"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 67278ea29fb..c2f27fc537d 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 10:47+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"Last-Translator: I Robot <thomas.mueller@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"
@@ -56,39 +56,51 @@ msgstr "Levylle kirjoitus epäonnistui"
msgid "Files"
msgstr "Tiedostot"
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Poista"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "on jo olemassa"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "korvaa"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr "ehdota nimeä"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "peru"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "korvattu"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "kumoa"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "käyttäen"
-#: js/filelist.js:266
+#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "poistettu"
@@ -104,7 +116,7 @@ msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä
msgid "Upload Error"
msgstr "Lähetysvirhe."
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Odottaa"
@@ -112,36 +124,44 @@ msgstr "Odottaa"
msgid "Upload cancelled."
msgstr "Lähetys peruttu."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Virheellinen nimi, merkki '/' ei ole sallittu."
-#: js/files.js:746 templates/index.php:56
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Koko"
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Muutettu"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "kansio"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "kansiota"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "tiedosto"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "tiedostoa"
@@ -193,7 +213,7 @@ msgstr "Kansio"
msgid "From url"
msgstr "Verkko-osoitteesta"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Lähetä"
@@ -217,20 +237,20 @@ msgstr "Jaa"
msgid "Download"
msgstr "Lataa"
-#: templates/index.php:65
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Lähetettävä tiedosto on liian suuri"
-#: templates/index.php:67
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan."
-#: templates/index.php:72
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Tiedostoja tarkistetaan, odota hetki."
-#: templates/index.php:75
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Tämänhetkinen tutkinta"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index f55a4520322..9817d499c7f 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 15:46+0000\n"
-"Last-Translator: teho <tehoratopato@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
@@ -27,14 +27,24 @@ msgstr "Salasana"
msgid "Submit"
msgstr "Lähetä"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "Lataa"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "Ei esikatselua kohteelle"
-#: templates/public.php:25
+#: templates/public.php:37
msgid "web services under your control"
msgstr "verkkopalvelut hallinnassasi"
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index 7d47ae42141..3a27d9ef9f7 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.po
@@ -8,20 +8,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-03 02:04+0200\n"
-"PO-Revision-Date: 2012-09-02 15:39+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fi_FI\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "Vanhenna kaikki versiot"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "Versiot"
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "Tämä poistaa kaikki tiedostojesi olemassa olevat varmuuskopioversiot"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Käytä tiedostojen versiointia"
+msgid "Files Versioning"
+msgstr "Tiedostojen versiointi"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Käytä"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 2f9cfc602d5..32e588ad004 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 16:14+0000\n"
-"Last-Translator: teho <tehoratopato@gmail.com>\n"
+"POT-Creation-Date: 2012-09-21 02:02+0200\n"
+"PO-Revision-Date: 2012-09-20 18:06+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"
@@ -37,6 +37,10 @@ msgstr "Ryhmä on jo olemassa"
msgid "Unable to add group"
msgstr "Ryhmän lisäys epäonnistui"
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "Sovelluksen käyttöönotto epäonnistui."
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Sähköposti tallennettu"
@@ -75,15 +79,11 @@ msgstr "Käyttäjän tai ryhmän %s lisääminen ei onnistu"
msgid "Unable to remove user from group %s"
msgstr "Käyttäjän poistaminen ryhmästä %s ei onnistu"
-#: js/apps.js:18
-msgid "Error"
-msgstr "Virhe"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Poista käytöstä"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Käytä"
@@ -112,63 +112,67 @@ msgstr "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htac
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "suorita yksi tehtävä jokaisella ladatulla sivulla"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php on rekisteröity webcron-palvelulla"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
-msgstr "käytä järjestelmän cron-palvelua"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
-msgstr "Jaon ohelmointirajapinta (Share API)"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Jakaminen"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Ota käyttöön jaon ohjelmoitirajapinta (Share API)"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "Salli sovellusten käyttää jaon ohjelmointirajapintaa (Share API)"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "Salli linkit"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr "Salli käyttäjien jakaa kohteita julkisesti linkkejä käyttäen"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "Salli uudelleenjako"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr "Salli käyttäjien jakaa heille itselleen jaettuja tietoja edelleen"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "Salli käyttäjien jakaa kohteita kenen tahansa kanssa"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr "Salli käyttäjien jakaa kohteita vain omien ryhmien jäsenten kesken"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Loki"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Lisää"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -219,12 +223,9 @@ msgid "Answer"
msgstr "Vastaus"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Olet käyttänyt"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr ", käytettävissäsi on yhteensä"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "Käytössäsi on <strong>%s</strong>/<strong>%s<strong>"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -235,8 +236,8 @@ msgid "Download"
msgstr "Lataa"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Salasanasi on vaihdettu"
+msgid "Your password was changed"
+msgstr "Salasanasi vaihdettiin"
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index c6fd6a40412..e224bab81f6 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -35,58 +35,62 @@ msgstr "Pas de catégorie à ajouter ?"
msgid "This category already exists: "
msgstr "Cette catégorie existe déjà : "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Paramètres"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "janvier"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "février"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "mars"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "avril"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "mai"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "juin"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "juillet"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "août"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "septembre"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "octobre"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "novembre"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "décembre"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Annuler"
@@ -107,10 +111,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Aucune catégorie sélectionnée pour suppression"
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Erreur"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Mot de passe"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Réinitialisation de votre mot de passe Owncloud"
@@ -196,10 +300,6 @@ msgstr "Ajouter"
msgid "Create an <strong>admin account</strong>"
msgstr "Créer un <strong>compte administrateur</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Mot de passe"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Avancé"
@@ -241,11 +341,11 @@ msgstr "Serveur de la base de données"
msgid "Finish setup"
msgstr "Terminer l'installation"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "services web sous votre contrôle"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Se déconnecter"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 222dbece715..804104d8ed6 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -60,39 +60,51 @@ msgstr "Erreur d'écriture sur le disque"
msgid "Files"
msgstr "Fichiers"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Ne plus partager"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Supprimer"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "existe déjà"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "remplacer"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "Suggérer un nom"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "annuler"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "remplacé"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "annuler"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "avec"
#: js/filelist.js:271
+msgid "unshared"
+msgstr "non partagée"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "supprimé"
@@ -108,7 +120,7 @@ msgstr "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fich
msgid "Upload Error"
msgstr "Erreur de chargement"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "En cours"
@@ -116,36 +128,44 @@ msgstr "En cours"
msgid "Upload cancelled."
msgstr "Chargement annulé."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Nom invalide, '/' n'est pas autorisé."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Taille"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Modifié"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "dossier"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "dossiers"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "fichier"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "fichiers"
@@ -197,7 +217,7 @@ msgstr "Dossier"
msgid "From url"
msgstr "Depuis URL"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Envoyer"
@@ -205,36 +225,36 @@ msgstr "Envoyer"
msgid "Cancel upload"
msgstr "Annuler l'envoi"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Nom"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Partager"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Téléchargement"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Fichier trop volumineux"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Analyse en cours"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 13fe8b5a464..758a757d00b 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -12,15 +12,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 19:11+0000\n"
-"Last-Translator: Florentin Le Moal <florentin.lemoal@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -30,14 +30,24 @@ msgstr "Mot de passe"
msgid "Submit"
msgstr "Envoyer"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "Télécharger"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "Pas d'aperçu disponible pour"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr "services web sous votre contrôle"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index 70771893524..4e000bd8b09 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.po
@@ -8,20 +8,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 16:41+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "Supprimer les versions intermédiaires"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "Versions"
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date)."
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Activer le versionnage"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index bdf3e67d242..6eaa58ee2de 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Brice <bmaron@gmail.com>, 2012.
# Cyril Glapa <kyriog@gmail.com>, 2012.
# <fboulogne@april.org>, 2011.
# <florentin.lemoal@gmail.com>, 2012.
@@ -18,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 13:18+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -45,6 +46,10 @@ msgstr "Ce groupe existe déjà"
msgid "Unable to add group"
msgstr "Impossible d'ajouter le groupe"
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "E-mail sauvegardé"
@@ -83,15 +88,11 @@ msgstr "Impossible d'ajouter l'utilisateur au groupe %s"
msgid "Unable to remove user from group %s"
msgstr "Impossible de supprimer l'utilisateur du groupe %s"
-#: js/apps.js:18
-msgid "Error"
-msgstr "Erreur"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Désactiver"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Activer"
@@ -120,63 +121,67 @@ msgstr "Votre répertoire de données et vos fichiers sont probablement accessib
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "exécuter une tâche pour chaque page chargée"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php est enregistré comme un service webcron"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
-msgstr "utiliser le service cron du système "
+#: templates/admin.php:49
+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:41
-msgid "Share API"
-msgstr "API de partage"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Activer l'API de partage"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "Autoriser les applications à utiliser l'API de partage"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "Autoriser les liens"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr "Autoriser les utilisateurs à partager du contenu public avec des liens"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "Autoriser le re-partage"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr "Autoriser les utilisateurs à partager des éléments déjà partagés entre eux"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "Autoriser les utilisateurs à partager avec tout le monde"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr "Autoriser les utilisateurs à ne partager qu'avec les utilisateurs dans leurs groupes"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Journaux"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Plus"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -200,7 +205,7 @@ msgstr "Voir la page des applications à l'url apps.owncloud.com"
#: templates/apps.php:30
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr "<span class=\"licence\"></span>-sous licence, par <span class=\"author\"></span>"
+msgstr "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>"
#: templates/help.php:9
msgid "Documentation"
@@ -227,12 +232,9 @@ msgid "Answer"
msgstr "Réponse"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Vous utilisez"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "de votre espace de stockage d'une taille totale de"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -243,8 +245,8 @@ msgid "Download"
msgstr "Télécharger"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Votre mot de passe a été changé"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 98c21db78b2..febe7b56173 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -31,58 +31,62 @@ msgstr "Sen categoría que engadir?"
msgid "This category already exists: "
msgstr "Esta categoría xa existe: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Preferencias"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Xaneiro"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Febreiro"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Marzo"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Abril"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Maio"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Xuño"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Xullo"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Agosto"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Setembro"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Outubro"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Novembro"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Nadal"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Cancelar"
@@ -103,10 +107,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Non hai categorías seleccionadas para eliminar."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Erro"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Contrasinal"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Restablecer contrasinal de ownCloud"
@@ -192,10 +296,6 @@ msgstr "Engadir"
msgid "Create an <strong>admin account</strong>"
msgstr "Crear unha <strong>contra de administrador</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Contrasinal"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Avanzado"
@@ -237,11 +337,11 @@ msgstr "Servidor da base de datos"
msgid "Finish setup"
msgstr "Rematar configuración"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "servizos web baixo o seu control"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Desconectar"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 0de0ff2a7df..feda2df42f9 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -53,39 +53,51 @@ msgstr "Erro ao escribir no disco"
msgid "Files"
msgstr "Ficheiros"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Deixar de compartir"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Eliminar"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "xa existe"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "substituír"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "suxira nome"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "cancelar"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "substituído"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "desfacer"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "con"
#: js/filelist.js:271
+msgid "unshared"
+msgstr "non compartido"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "eliminado"
@@ -101,7 +113,7 @@ msgstr "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes"
msgid "Upload Error"
msgstr "Erro na subida"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Pendentes"
@@ -109,36 +121,44 @@ msgstr "Pendentes"
msgid "Upload cancelled."
msgstr "Subida cancelada."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "A subida do ficheiro está en curso. Saír agora da páxina cancelará a subida."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Nome non válido, '/' non está permitido."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr "ficheiros analizados"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "erro mentras analizaba"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "cartafol"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "cartafoles"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "ficheiro"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "ficheiros"
@@ -172,7 +192,7 @@ msgstr "Tamaño máximo de descarga para os ZIP"
#: templates/admin.php:14
msgid "Save"
-msgstr ""
+msgstr "Gardar"
#: templates/index.php:7
msgid "New"
@@ -190,7 +210,7 @@ msgstr "Cartafol"
msgid "From url"
msgstr "Desde url"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Enviar"
@@ -198,36 +218,36 @@ msgstr "Enviar"
msgid "Cancel upload"
msgstr "Cancelar subida"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Nada por aquí. Envíe algo."
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Nome"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Compartir"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Descargar"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Envío demasiado grande"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Os ficheiros que trata de subir superan o tamaño máximo permitido neste servidor"
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Estanse analizando os ficheiros, espere por favor."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Análise actual."
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index c401e95b840..42f3744efd3 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -3,32 +3,33 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-18 10:02+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: gl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Encriptado"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Excluír os seguintes tipos de ficheiro da encriptación"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Nada"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "Habilitar encriptación"
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index 056cc10b6a9..d700ed9f805 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -3,80 +3,81 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-18 10:13+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: gl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Almacenamento externo"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "Punto de montaxe"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "Almacén"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "Opcións"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "Aplicable"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "Engadir punto de montaxe"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "Non establecido"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "Tódolos usuarios"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "Grupos"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "Usuarios"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "Eliminar"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "Certificados raíz SSL"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importar Certificado Raíz"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Habilitar almacenamento externo do usuario"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Permitir aos usuarios montar os seus propios almacenamentos externos"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 88ab1587760..4fdd23736cd 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -3,36 +3,47 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: gl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
-msgstr ""
+msgstr "Contrasinal"
#: templates/authenticate.php:6
msgid "Submit"
+msgstr "Enviar"
+
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
-msgid "Download"
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr "Baixar"
+
+#: templates/public.php:29
msgid "No preview available for"
-msgstr ""
+msgstr "Sen vista previa dispoñible para "
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
-msgstr ""
+msgstr "servizos web baixo o seu control"
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
index 035f8080242..05d15205747 100644
--- a/l10n/gl/files_versions.po
+++ b/l10n/gl/files_versions.po
@@ -3,32 +3,41 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: gl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
+msgstr "Caducar todas as versións"
+
+#: js/versions.js:16
+msgid "History"
msgstr ""
#: templates/settings-personal.php:4
msgid "Versions"
-msgstr ""
+msgstr "Versións"
#: templates/settings-personal.php:7
msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Esto eliminará todas as copias de respaldo existentes dos seus ficheiros"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr ""
+msgid "Files Versioning"
+msgstr "Versionado de ficheiros"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Habilitar"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index a0531aaba0b..677bba794df 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -3,123 +3,124 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-18 09:28+0000\n"
+"Last-Translator: Xosé M. Lamas <correo.xmgz@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: gl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: app.php:288
+#: app.php:285
msgid "Help"
-msgstr ""
+msgstr "Axuda"
-#: app.php:295
+#: app.php:292
msgid "Personal"
-msgstr ""
+msgstr "Personal"
-#: app.php:300
+#: app.php:297
msgid "Settings"
-msgstr ""
+msgstr "Preferencias"
-#: app.php:305
+#: app.php:302
msgid "Users"
-msgstr ""
+msgstr "Usuarios"
-#: app.php:312
+#: app.php:309
msgid "Apps"
-msgstr ""
+msgstr "Apps"
-#: app.php:314
+#: app.php:311
msgid "Admin"
-msgstr ""
+msgstr "Administración"
#: files.php:280
msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Descargas ZIP está deshabilitadas"
#: files.php:281
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Os ficheiros necesitan ser descargados de un en un"
#: files.php:281 files.php:306
msgid "Back to Files"
-msgstr ""
+msgstr "Voltar a ficheiros"
#: files.php:305
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Os ficheiros seleccionados son demasiado grandes para xerar un ficheiro ZIP"
#: json.php:28
msgid "Application is not enabled"
-msgstr ""
+msgstr "O aplicativo non está habilitado"
#: json.php:39 json.php:63 json.php:75
msgid "Authentication error"
-msgstr ""
+msgstr "Erro na autenticación"
#: json.php:51
msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Testemuño caducado. Por favor recargue a páxina."
-#: template.php:86
+#: template.php:87
msgid "seconds ago"
-msgstr ""
+msgstr "hai segundos"
-#: template.php:87
+#: template.php:88
msgid "1 minute ago"
-msgstr ""
+msgstr "hai 1 minuto"
-#: template.php:88
+#: template.php:89
#, php-format
msgid "%d minutes ago"
-msgstr ""
+msgstr "hai %d minutos"
-#: template.php:91
+#: template.php:92
msgid "today"
-msgstr ""
+msgstr "hoxe"
-#: template.php:92
+#: template.php:93
msgid "yesterday"
-msgstr ""
+msgstr "onte"
-#: template.php:93
+#: template.php:94
#, php-format
msgid "%d days ago"
-msgstr ""
+msgstr "hai %d días"
-#: template.php:94
+#: template.php:95
msgid "last month"
-msgstr ""
+msgstr "último mes"
-#: template.php:95
+#: template.php:96
msgid "months ago"
-msgstr ""
+msgstr "meses atrás"
-#: template.php:96
+#: template.php:97
msgid "last year"
-msgstr ""
+msgstr "último ano"
-#: template.php:97
+#: template.php:98
msgid "years ago"
-msgstr ""
+msgstr "anos atrás"
#: updater.php:66
#, php-format
msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s está dispoñible. Obteña <a href=\"%s\">máis información</a>"
#: updater.php:68
msgid "up to date"
-msgstr ""
+msgstr "ao día"
#: updater.php:71
msgid "updates check is disabled"
-msgstr ""
+msgstr "comprobación de actualizacións está deshabilitada"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 60828ee96fa..948cb35b5a0 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Correo electrónico gardado"
@@ -74,15 +78,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr "Erro"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Deshabilitar"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Habilitar"
@@ -111,63 +111,67 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "executar unha tarefa con cada páxina cargada"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php está rexistrada como un servizo webcron"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
-msgstr "utilice o servizo cron do sistema"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Conectar"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Máis"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,12 +222,9 @@ msgid "Answer"
msgstr "Resposta"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Vostede usa"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "dun total de"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -234,8 +235,8 @@ msgid "Download"
msgstr "Descargar"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "O seu contrasinal mudou"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index babf202fb32..ecc55b07d2c 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dovix Dovix <dovix2003@gmail.com>, 2012.
# <ido.parag@gmail.com>, 2012.
# <tomerc+transifex.net@gmail.com>, 2011.
# Yaron Shahrabani <sh.yaron@gmail.com>, 2011, 2012.
@@ -10,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -32,58 +33,62 @@ msgstr "אין קטגוריה להוספה?"
msgid "This category already exists: "
msgstr "קטגוריה זאת כבר קיימת: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "הגדרות"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "ינואר"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "פברואר"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "מרץ"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "אפריל"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "מאי"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "יוני"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "יולי"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "אוגוסט"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "ספטמבר"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "אוקטובר"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "נובמבר"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "דצמבר"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "ביטול"
@@ -104,10 +109,110 @@ msgstr "בסדר"
msgid "No categories selected for deletion."
msgstr "לא נבחרו קטגוריות למחיקה"
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "שגיאה"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "ססמה"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "איפוס הססמה של ownCloud"
@@ -193,10 +298,6 @@ msgstr "הוספה"
msgid "Create an <strong>admin account</strong>"
msgstr "יצירת <strong>חשבון מנהל</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "ססמה"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "מתקדם"
@@ -228,7 +329,7 @@ msgstr "שם מסד הנתונים"
#: templates/installation.php:109
msgid "Database tablespace"
-msgstr ""
+msgstr "מרחב הכתובות של מסד הנתונים"
#: templates/installation.php:115
msgid "Database host"
@@ -238,11 +339,11 @@ msgstr "שרת בסיס נתונים"
msgid "Finish setup"
msgstr "סיום התקנה"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "שירותי רשת בשליטתך"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "התנתקות"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 808345fa8f7..6d5e49aa7f9 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Dovix Dovix <dovix2003@gmail.com>, 2012.
# <ido.parag@gmail.com>, 2012.
# <tomerc+transifex.net@gmail.com>, 2011.
# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
@@ -10,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -54,39 +55,51 @@ msgstr "הכתיבה לכונן נכשלה"
msgid "Files"
msgstr "קבצים"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "מחיקה"
-#: js/filelist.js:186 js/filelist.js:188
-msgid "already exists"
+#: js/fileactions.js:182
+msgid "Rename"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
+msgid "already exists"
+msgstr "כבר קיים"
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -102,7 +115,7 @@ msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה
msgid "Upload Error"
msgstr "שגיאת העלאה"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "ממתין"
@@ -110,36 +123,44 @@ msgstr "ממתין"
msgid "Upload cancelled."
msgstr "ההעלאה בוטלה."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "שם לא חוקי, '/' אסור לשימוש."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "גודל"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "זמן שינוי"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "תקיה"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "תקיות"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "קובץ"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "קבצים"
@@ -191,7 +212,7 @@ msgstr "תיקייה"
msgid "From url"
msgstr "מכתובת"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "העלאה"
@@ -199,36 +220,36 @@ msgstr "העלאה"
msgid "Cancel upload"
msgstr "ביטול ההעלאה"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "אין כאן שום דבר. אולי ברצונך להעלות משהו?"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "שם"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "שיתוף"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "הורדה"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "העלאה גדולה מידי"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "הקבצים נסרקים, נא להמתין."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "הסריקה הנוכחית"
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 0e6dea4b5b1..51347af93b6 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/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: 2012-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-04 23:20+0000\n"
-"Last-Translator: Tomer Cohen <tomerc+transifex.net@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,14 +26,24 @@ msgstr "ססמה"
msgid "Submit"
msgstr "שליחה"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "הורדה"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "אין תצוגה מקדימה זמינה עבור"
-#: templates/public.php:25
+#: templates/public.php:37
msgid "web services under your control"
msgstr "שירותי רשת תחת השליטה שלך"
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
index e0cb0e526e3..20cfd9e7379 100644
--- a/l10n/he/files_versions.po
+++ b/l10n/he/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-04 23:22+0000\n"
-"Last-Translator: Tomer Cohen <tomerc+transifex.net@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,10 @@ msgstr ""
msgid "Expire all versions"
msgstr "הפגת תוקף כל הגרסאות"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "גרסאות"
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "פעולה זו תמחק את כל גיבויי הגרסאות הקיימים של הקבצים שלך"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "הפעלת ניהול גרסאות לקבצים"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index bd56d364279..f92518c05e8 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -37,6 +37,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "הדוא״ל נשמר"
@@ -75,15 +79,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "בטל"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "הפעל"
@@ -112,63 +112,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "יומן"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "עוד"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -219,12 +223,9 @@ msgid "Answer"
msgstr "מענה"
#: templates/personal.php:8
-msgid "You use"
-msgstr "הנך משתמש "
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "מתוך "
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -235,8 +236,8 @@ msgid "Download"
msgstr "הורדה"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "הססמה שלך שונתה"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 67cd5aa9ff7..74a6fe208cd 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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -30,58 +30,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -102,10 +106,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "पासवर्ड"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -191,10 +295,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "व्यवस्थापक खाता बनाएँ"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "पासवर्ड"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "उन्नत"
@@ -236,11 +336,11 @@ msgstr ""
msgid "Finish setup"
msgstr "सेटअप समाप्त करे"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr ""
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index b4b909333c0..111225d0cda 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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -51,39 +51,51 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -99,7 +111,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -107,36 +119,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr ""
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr ""
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -188,7 +208,7 @@ msgstr ""
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr ""
@@ -196,36 +216,36 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr ""
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index 2c1a5c69458..65e94288b42 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/hi/files_versions.po b/l10n/hi/files_versions.po
index c1e27c1c31d..1f21f8aca78 100644
--- a/l10n/hi/files_versions.po
+++ b/l10n/hi/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index db0cc7e30fa..34276cb01c0 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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -72,15 +76,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -109,63 +109,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,11 +220,8 @@ msgid "Answer"
msgstr ""
#: templates/personal.php:8
-msgid "You use"
-msgstr ""
-
-#: templates/personal.php:8
-msgid "of the available"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
msgstr ""
#: templates/personal.php:12
@@ -232,7 +233,7 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
+msgid "Your password was changed"
msgstr ""
#: templates/personal.php:20
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 3c0fc971861..9d79184ade4 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -32,58 +32,62 @@ msgstr "Nemate kategorija koje možete dodati?"
msgid "This category already exists: "
msgstr "Ova kategorija već postoji: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Postavke"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Siječanj"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Veljača"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Ožujak"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Travanj"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Svibanj"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Lipanj"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Srpanj"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Kolovoz"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Rujan"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Listopad"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Studeni"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Prosinac"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Odustani"
@@ -104,10 +108,110 @@ msgstr "U redu"
msgid "No categories selected for deletion."
msgstr "Nema odabranih kategorija za brisanje."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Pogreška"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Lozinka"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ownCloud resetiranje lozinke"
@@ -193,10 +297,6 @@ msgstr "Dodaj"
msgid "Create an <strong>admin account</strong>"
msgstr "Stvori <strong>administratorski račun</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Lozinka"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Dodatno"
@@ -238,11 +338,11 @@ msgstr "Poslužitelj baze podataka"
msgid "Finish setup"
msgstr "Završi postavljanje"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "web usluge pod vašom kontrolom"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Odjava"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 6163c004ba4..c441df9906e 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -54,39 +54,51 @@ msgstr "Neuspjelo pisanje na disk"
msgid "Files"
msgstr "Datoteke"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Briši"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "već postoji"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "zamjeni"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "odustani"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "zamjenjeno"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "vrati"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "sa"
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "izbrisano"
@@ -102,7 +114,7 @@ msgstr "Nemoguće poslati datoteku jer je prazna ili je direktorij"
msgid "Upload Error"
msgstr "Pogreška pri slanju"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "U tijeku"
@@ -110,36 +122,44 @@ msgstr "U tijeku"
msgid "Upload cancelled."
msgstr "Slanje poništeno."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Neispravan naziv, znak '/' nije dozvoljen."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Veličina"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Zadnja promjena"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "mapa"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "mape"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "datoteka"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "datoteke"
@@ -191,7 +211,7 @@ msgstr "mapa"
msgid "From url"
msgstr "od URL-a"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Pošalji"
@@ -199,36 +219,36 @@ msgstr "Pošalji"
msgid "Cancel upload"
msgstr "Prekini upload"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Nema ničega u ovoj mapi. Pošalji nešto!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Naziv"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "podjeli"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Preuzmi"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Prijenos je preobiman"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Datoteke se skeniraju, molimo pričekajte."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Trenutno skeniranje"
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index d104bf184a1..90582fb7374 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
index 46ae1068273..557b2117806 100644
--- a/l10n/hr/files_versions.po
+++ b/l10n/hr/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index ef3eacff148..39c7bc61ee7 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -37,6 +37,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Email spremljen"
@@ -75,15 +79,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr "Greška"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Isključi"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Uključi"
@@ -112,63 +112,67 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php je registriran kod webcron servisa"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
-msgstr "koristi sistemski cron servis"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "dnevnik"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "više"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -219,12 +223,9 @@ msgid "Answer"
msgstr "Odgovor"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Koristite"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "od dostupno"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -235,8 +236,8 @@ msgid "Download"
msgstr "preuzimanje"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Vaša lozinka je promijenjena"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 6d1680b032c..6a2c15a999f 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -32,58 +32,62 @@ msgstr "Nincs hozzáadandó kategória?"
msgid "This category already exists: "
msgstr "Ez a kategória már létezik"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Beállítások"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Január"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Február"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Március"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Április"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Május"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Június"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Július"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Augusztus"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Szeptember"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Október"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "November"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "December"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Mégse"
@@ -104,10 +108,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Nincs törlésre jelölt kategória"
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Hiba"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Jelszó"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ownCloud jelszó-visszaállítás"
@@ -193,10 +297,6 @@ msgstr "Hozzáadás"
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>Rendszergazdafiók</strong> létrehozása"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Jelszó"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Haladó"
@@ -238,11 +338,11 @@ msgstr "Adatbázis szerver"
msgid "Finish setup"
msgstr "Beállítás befejezése"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "webszolgáltatások az irányításod alatt"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Kilépés"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index ca00f037928..04c4402b711 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -54,39 +54,51 @@ msgstr "Nem írható lemezre"
msgid "Files"
msgstr "Fájlok"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Törlés"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "már létezik"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "cserél"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "mégse"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "kicserélve"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "visszavon"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "-val/-vel"
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "törölve"
@@ -102,7 +114,7 @@ msgstr "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű"
msgid "Upload Error"
msgstr "Feltöltési hiba"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Folyamatban"
@@ -110,36 +122,44 @@ msgstr "Folyamatban"
msgid "Upload cancelled."
msgstr "Feltöltés megszakítva"
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Érvénytelen név, a '/' nem megengedett"
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Méret"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Módosítva"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "mappa"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "mappák"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "fájl"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "fájlok"
@@ -191,7 +211,7 @@ msgstr "Mappa"
msgid "From url"
msgstr "URL-ből"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Feltöltés"
@@ -199,36 +219,36 @@ msgstr "Feltöltés"
msgid "Cancel upload"
msgstr "Feltöltés megszakítása"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Töltsön fel egy fájlt."
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Név"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Megosztás"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Letöltés"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Feltöltés túl nagy"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "A fájlokat amit próbálsz feltölteni meghaladta a legnagyobb fájlméretet ezen a szerveren."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "File-ok vizsgálata, kis türelmet"
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Aktuális vizsgálat"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 11d84d4a408..4379b279a64 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: hu_HU\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -26,14 +26,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index 8110815df5c..b55e474da7f 100644
--- a/l10n/hu_HU/files_versions.po
+++ b/l10n/hu_HU/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: hu_HU\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 5f3d66a4dd9..1da66e28540 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Email mentve"
@@ -74,15 +78,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr "Hiba"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Letiltás"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Engedélyezés"
@@ -111,63 +111,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Napló"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Tovább"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,12 +222,9 @@ msgid "Answer"
msgstr "Válasz"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Használatban: "
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr ", rendelkezésre áll: "
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -234,8 +235,8 @@ msgid "Download"
msgstr "Letöltés"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "A jelszavad megváltozott"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index bd1b74571d7..bf9a5951f24 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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -29,58 +29,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -101,10 +105,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -190,10 +294,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr ""
-
#: templates/installation.php:36
msgid "Advanced"
msgstr ""
@@ -235,11 +335,11 @@ msgstr ""
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr ""
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index e94b8536495..0f2cf5f16a7 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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -51,39 +51,51 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -99,7 +111,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -107,36 +119,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr ""
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr ""
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -188,7 +208,7 @@ msgstr ""
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr ""
@@ -196,36 +216,36 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr ""
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index b21d68c6831..8d83b7805c5 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/hy/files_versions.po b/l10n/hy/files_versions.po
index 7ac5f7649e7..4caf1f18271 100644
--- a/l10n/hy/files_versions.po
+++ b/l10n/hy/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 394122cdf15..19c237b32ae 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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -72,15 +76,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -109,63 +109,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,11 +220,8 @@ msgid "Answer"
msgstr ""
#: templates/personal.php:8
-msgid "You use"
-msgstr ""
-
-#: templates/personal.php:8
-msgid "of the available"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
msgstr ""
#: templates/personal.php:12
@@ -232,7 +233,7 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
+msgid "Your password was changed"
msgstr ""
#: templates/personal.php:20
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 100482b0244..22919becdf7 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -30,58 +30,62 @@ msgstr ""
msgid "This category already exists: "
msgstr "Iste categoria jam existe:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Configurationes"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -102,10 +106,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Contrasigno"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Reinitialisation del contrasigno de ownCLoud"
@@ -191,10 +295,6 @@ msgstr "Adder"
msgid "Create an <strong>admin account</strong>"
msgstr "Crear un <strong>conto de administration</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Contrasigno"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Avantiate"
@@ -236,11 +336,11 @@ msgstr "Hospite de base de datos"
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "servicios web sub tu controlo"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Clauder le session"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 0324e32bd0b..740b2cc451b 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -53,39 +53,51 @@ msgstr ""
msgid "Files"
msgstr "Files"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Deler"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -101,7 +113,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -109,36 +121,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Dimension"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Modificate"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -190,7 +210,7 @@ msgstr "Dossier"
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Incargar"
@@ -198,36 +218,36 @@ msgstr "Incargar"
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Nihil hic. Incarga alcun cosa!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Nomine"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Discargar"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Incargamento troppo longe"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 2c01e0d398a..05ecbbb1465 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ia\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
index c874ecb7e46..d0287f45fff 100644
--- a/l10n/ia/files_versions.po
+++ b/l10n/ia/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ia\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index ab80ed851ad..62552205415 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -74,15 +78,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -111,63 +111,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Registro"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Plus"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,12 +222,9 @@ msgid "Answer"
msgstr "Responsa"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Tu usa"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "del disponibile"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -234,8 +235,8 @@ msgid "Download"
msgstr "Discargar"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Tu contrasigno esseva cambiate"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 9cb0f7651e1..84d20b48de8 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -32,58 +32,62 @@ msgstr "Tidak ada kategori yang akan ditambahkan?"
msgid "This category already exists: "
msgstr "Kategori ini sudah ada:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Setelan"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Januari"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Februari"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Maret"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "April"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Mei"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Juni"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Juli"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Agustus"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "September"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Oktober"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Nopember"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Desember"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Batalkan"
@@ -104,10 +108,110 @@ msgstr "Oke"
msgid "No categories selected for deletion."
msgstr "Tidak ada kategori terpilih untuk penghapusan."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Password"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "reset password ownCloud"
@@ -193,10 +297,6 @@ msgstr "Tambahkan"
msgid "Create an <strong>admin account</strong>"
msgstr "Buat sebuah <strong>akun admin</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Password"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Tingkat Lanjut"
@@ -238,11 +338,11 @@ msgstr "Host database"
msgid "Finish setup"
msgstr "Selesaikan instalasi"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "web service dibawah kontrol anda"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Keluar"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 5e1a38df08a..beaad8f6154 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -54,39 +54,51 @@ msgstr "Gagal menulis ke disk"
msgid "Files"
msgstr "Berkas"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Hapus"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "sudah ada"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "mengganti"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "batalkan"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "diganti"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "batal dikerjakan"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "dengan"
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "dihapus"
@@ -102,7 +114,7 @@ msgstr "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukur
msgid "Upload Error"
msgstr "Terjadi Galat Pengunggahan"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Menunggu"
@@ -110,36 +122,44 @@ msgstr "Menunggu"
msgid "Upload cancelled."
msgstr "Pengunggahan dibatalkan."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Kesalahan nama, '/' tidak diijinkan."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Ukuran"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "folder"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "folder-folder"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "berkas"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "berkas-berkas"
@@ -191,7 +211,7 @@ msgstr "Folder"
msgid "From url"
msgstr "Dari url"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Unggah"
@@ -199,36 +219,36 @@ msgstr "Unggah"
msgid "Cancel upload"
msgstr "Batal mengunggah"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Nama"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Bagikan"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Unduh"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Unggahan terlalu besar"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Berkas yang anda coba unggah melebihi ukuran maksimum untuk pengunggahan berkas di server ini."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Berkas sedang dipindai, silahkan tunggu."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Sedang memindai"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index e2be0ffdea8..8acea84a1ef 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: id\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
index b28e40950f1..41ffd9c7525 100644
--- a/l10n/id/files_versions.po
+++ b/l10n/id/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: id\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index c2bd93b9e17..460b492bef4 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -37,6 +37,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Email tersimpan"
@@ -75,15 +79,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "NonAktifkan"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Aktifkan"
@@ -112,63 +112,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Log"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Lebih"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -219,12 +223,9 @@ msgid "Answer"
msgstr "Jawab"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Anda menggunakan"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "dari yang tersedia"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -235,8 +236,8 @@ msgid "Download"
msgstr "Unduh"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Password anda telah dirubah"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index a7ada9179b8..e0be383ee81 100644
--- a/l10n/id_ID/core.po
+++ b/l10n/id_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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
"MIME-Version: 1.0\n"
@@ -29,58 +29,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -101,10 +105,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -190,10 +294,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr ""
-
#: templates/installation.php:36
msgid "Advanced"
msgstr ""
@@ -235,11 +335,11 @@ msgstr ""
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr ""
diff --git a/l10n/id_ID/files.po b/l10n/id_ID/files.po
index 3ef54242d32..9bf600b905a 100644
--- a/l10n/id_ID/files.po
+++ b/l10n/id_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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
"MIME-Version: 1.0\n"
@@ -51,39 +51,51 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -99,7 +111,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -107,36 +119,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr ""
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr ""
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -188,7 +208,7 @@ msgstr ""
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr ""
@@ -196,36 +216,36 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr ""
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/id_ID/files_sharing.po b/l10n/id_ID/files_sharing.po
index c3989d22074..59a11d31957 100644
--- a/l10n/id_ID/files_sharing.po
+++ b/l10n/id_ID/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: id_ID\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/id_ID/files_versions.po b/l10n/id_ID/files_versions.po
index 027df71e5ea..581fac1e7d7 100644
--- a/l10n/id_ID/files_versions.po
+++ b/l10n/id_ID/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: id_ID\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index b70af6b0c3f..1258d3790eb 100644
--- a/l10n/id_ID/settings.po
+++ b/l10n/id_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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
"MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -72,15 +76,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -109,63 +109,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,11 +220,8 @@ msgid "Answer"
msgstr ""
#: templates/personal.php:8
-msgid "You use"
-msgstr ""
-
-#: templates/personal.php:8
-msgid "of the available"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
msgstr ""
#: templates/personal.php:12
@@ -232,7 +233,7 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
+msgid "Your password was changed"
msgstr ""
#: templates/personal.php:20
diff --git a/l10n/it/core.po b/l10n/it/core.po
index f4904b27927..3032b3b1885 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 05:05+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"Last-Translator: I Robot <thomas.mueller@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"
@@ -34,58 +34,62 @@ msgstr "Nessuna categoria da aggiungere?"
msgid "This category already exists: "
msgstr "Questa categoria esiste già: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Impostazioni"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Gennaio"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Febbraio"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Marzo"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Aprile"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Maggio"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Giugno"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Luglio"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Agosto"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Settembre"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Ottobre"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Novembre"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Dicembre"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Annulla"
@@ -106,10 +110,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Nessuna categoria selezionata per l'eliminazione."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Errore"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Password"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Ripristino password di ownCloud"
@@ -195,10 +299,6 @@ msgstr "Aggiungi"
msgid "Create an <strong>admin account</strong>"
msgstr "Crea un <strong>account amministratore</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Password"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Avanzate"
@@ -240,11 +340,11 @@ msgstr "Host del database"
msgid "Finish setup"
msgstr "Termina la configurazione"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "servizi web nelle tue mani"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Esci"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 6175346abd7..9ab7065e163 100644
--- a/l10n/it/files.po
+++ b/l10n/it/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: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 04:57+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"Last-Translator: I Robot <thomas.mueller@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"
@@ -55,39 +55,51 @@ msgstr "Scrittura su disco non riuscita"
msgid "Files"
msgstr "File"
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Rimuovi condivisione"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Elimina"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "esiste già"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "sostituisci"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr "suggerisci nome"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "annulla"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "sostituito"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "annulla"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "con"
-#: js/filelist.js:266
+#: js/filelist.js:271
+msgid "unshared"
+msgstr "condivisione rimossa"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "eliminati"
@@ -103,7 +115,7 @@ msgstr "Impossibile inviare il file poiché è una cartella o ha dimensione 0 by
msgid "Upload Error"
msgstr "Errore di invio"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "In corso"
@@ -111,36 +123,44 @@ msgstr "In corso"
msgid "Upload cancelled."
msgstr "Invio annullato"
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Nome non valido"
-#: js/files.js:746 templates/index.php:56
+#: js/files.js:667
+msgid "files scanned"
+msgstr "file analizzati"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "errore durante la scansione"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Dimensione"
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Modificato"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "cartella"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "cartelle"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "file"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "file"
@@ -192,7 +212,7 @@ msgstr "Cartella"
msgid "From url"
msgstr "Da URL"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Carica"
@@ -216,20 +236,20 @@ msgstr "Condividi"
msgid "Download"
msgstr "Scarica"
-#: templates/index.php:65
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Il file caricato è troppo grande"
-#: templates/index.php:67
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "I file che stai provando a caricare superano la dimensione massima consentita su questo server."
-#: templates/index.php:72
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Scansione dei file in corso, attendi"
-#: templates/index.php:75
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Scansione corrente"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index b2494f4211e..34d6166c865 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 05:29+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -26,14 +26,24 @@ msgstr "Password"
msgid "Submit"
msgstr "Invia"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "Scarica"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "Nessuna anteprima disponibile per"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr "servizi web nelle tue mani"
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 9e8a8ae6bb3..01a0dce6d2f 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/files_versions.po
@@ -8,20 +8,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 11:42+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "Scadenza di tutte le versioni"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "Versioni"
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "Ciò eliminerà tutte le versioni esistenti dei tuoi file"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Abilita controllo di versione"
+msgid "Files Versioning"
+msgstr "Controllo di versione dei file"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Abilita"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 1ec0daf688c..9b7f3967cfc 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 05:39+0000\n"
+"POT-Creation-Date: 2012-09-20 02:05+0200\n"
+"PO-Revision-Date: 2012-09-19 05:42+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"
@@ -41,6 +41,10 @@ msgstr "Il gruppo esiste già"
msgid "Unable to add group"
msgstr "Impossibile aggiungere il gruppo"
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "Impossibile abilitare l'applicazione."
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Email salvata"
@@ -79,15 +83,11 @@ msgstr "Impossibile aggiungere l'utente al gruppo %s"
msgid "Unable to remove user from group %s"
msgstr "Impossibile rimuovere l'utente dal gruppo %s"
-#: js/apps.js:18
-msgid "Error"
-msgstr "Errore"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Disabilita"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Abilita"
@@ -116,63 +116,67 @@ msgstr "La cartella dei dati e i tuoi file sono probabilmente accessibili da Int
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "esegui un'attività con ogni pagina caricata"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "Esegui un'operazione per ogni pagina caricata"
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php è registrato a un servizio webcron"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php è registrato su un servizio webcron. Chiama la pagina cron.php nella radice di owncloud ogni minuto su http."
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "usa il servizio cron di sistema"
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "Usa il servizio cron di sistema. Chiama il file cron.php nella cartella di owncloud tramite una pianificazione del cron di sistema ogni minuto."
-#: templates/admin.php:41
-msgid "Share API"
-msgstr "API di condivisione"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Condivisione"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Abilita API di condivisione"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "Consenti alle applicazioni di utilizzare le API di condivisione"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "Consenti collegamenti"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr "Consenti agli utenti di condividere elementi al pubblico con collegamenti"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "Consenti la ri-condivisione"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr "Consenti agli utenti di condividere elementi già condivisi"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "Consenti agli utenti di condividere con chiunque"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr "Consenti agli utenti di condividere con gli utenti del proprio gruppo"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Registro"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Altro"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -223,12 +227,9 @@ msgid "Answer"
msgstr "Risposta"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Stai utilizzando"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "su un totale di"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "Hai utilizzato <strong>%s</strong> dei <strong>%s<strong> disponibili"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -239,8 +240,8 @@ msgid "Download"
msgstr "Scaricamento"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "La tua password è stata cambiata"
+msgid "Your password was changed"
+msgstr "La tua password è cambiata"
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 139012d619a..a49d43bc5c9 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -31,58 +31,62 @@ msgstr "追加するカテゴリはありませんか?"
msgid "This category already exists: "
msgstr "このカテゴリはすでに存在します: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "設定"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "1月"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "2月"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "3月"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "4月"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "5月"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "6月"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "7月"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "8月"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "9月"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "10月"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "11月"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "12月"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "キャンセル"
@@ -103,10 +107,110 @@ msgstr "OK"
msgid "No categories selected for deletion."
msgstr "削除するカテゴリが選択されていません。"
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "エラー"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "パスワード"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ownCloudのパスワードをリセットします"
@@ -192,10 +296,6 @@ msgstr "追加"
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>管理者アカウント</strong>を作成してください"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "パスワード"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "詳細設定"
@@ -237,11 +337,11 @@ msgstr "データベースのホスト名"
msgid "Finish setup"
msgstr "セットアップを完了します"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "管理下にあるウェブサービス"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "ログアウト"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index c73d204ecbc..8d508cfda68 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -53,39 +53,51 @@ msgstr "ディスクへの書き込みに失敗しました"
msgid "Files"
msgstr "ファイル"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "共有しない"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "削除"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "既に存在します"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "置き換え"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "推奨名称"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "キャンセル"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "置換:"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "元に戻す"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "←"
#: js/filelist.js:271
+msgid "unshared"
+msgstr "未共有"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "削除"
@@ -101,7 +113,7 @@ msgstr "アップロード使用としているファイルがディレクトリ
msgid "Upload Error"
msgstr "アップロードエラー"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "保留"
@@ -109,36 +121,44 @@ msgstr "保留"
msgid "Upload cancelled."
msgstr "アップロードはキャンセルされました。"
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "無効な名前、'/' は使用できません。"
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr "ファイルをスキャンしました"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "スキャン中のエラー"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "サイズ"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "更新日時"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "フォルダ"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "フォルダ"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "ファイル"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "ファイル"
@@ -190,7 +210,7 @@ msgstr "フォルダ"
msgid "From url"
msgstr "URL"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "アップロード"
@@ -198,36 +218,36 @@ msgstr "アップロード"
msgid "Cancel upload"
msgstr "アップロードをキャンセル"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "ここには何もありません。何かアップロードしてください。"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "名前"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "共有"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "ダウンロード"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "ファイルサイズが大きすぎます"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。"
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "ファイルをスキャンしています、しばらくお待ちください。"
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "スキャン中"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index 648cb83f0f4..883d56f3416 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -9,15 +9,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 07:43+0000\n"
-"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ja_JP\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -27,14 +27,24 @@ msgstr "パスワード"
msgid "Submit"
msgstr "送信"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "ダウンロード"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "プレビューはありません"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr "管理下のウェブサービス"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index a2dc0289007..c711428a53a 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 15:56+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
@@ -22,6 +22,10 @@ msgstr ""
msgid "Expire all versions"
msgstr "すべてのバージョンを削除する"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "バージョン"
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "これは、あなたのファイルのすべてのバックアップバージョンを削除します"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "ファイルのバージョン管理を有効にする"
+msgid "Files Versioning"
+msgstr "ファイルのバージョン管理"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "有効化"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 9652d0d9757..073691da01e 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 02:09+0000\n"
+"POT-Creation-Date: 2012-09-21 02:02+0200\n"
+"PO-Revision-Date: 2012-09-20 01:05+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,10 @@ msgstr "グループは既に存在しています"
msgid "Unable to add group"
msgstr "グループを追加できません"
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "アプリを有効にできませんでした。"
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "メールアドレスを保存しました"
@@ -74,15 +78,11 @@ msgstr "ユーザをグループ %s に追加できません"
msgid "Unable to remove user from group %s"
msgstr "ユーザをグループ %s から削除できません"
-#: js/apps.js:18
-msgid "Error"
-msgstr "エラー"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "無効"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "有効"
@@ -111,63 +111,67 @@ msgstr "データディレクトリとファイルが恐らくインターネッ
msgid "Cron"
msgstr "cron(自動定期実行)"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "ページを開く毎にタスクを1つ実行"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "各ページの読み込み時にタスクを1つ実行する"
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.phpをwebcronサービスに登録しました"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php は webcron サービスとして登録されています。HTTP経由で1分間に1回の頻度で owncloud のルートページ内の cron.php ページを呼び出します。"
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "システムのcronサービスを使用"
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "システムのcronサービスを利用する。1分に1回の頻度でシステムのcronジョブによりowncloudフォルダ内のcron.phpファイルを呼び出してください。"
-#: templates/admin.php:41
-msgid "Share API"
-msgstr "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "共有中"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Share APIを有効"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "Share APIの使用をアプリケーションに許可"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "リンクを許可"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr "ユーザーがリンクによる公開でアイテムを共有することが出来るようにする"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "再共有を許可"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr "ユーザーが共有されているアイテムをさらに共有することが出来るようにする"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "ユーザーが誰にでも共有出来るようにする"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr "ユーザーがグループの人にしか共有出来ないようにする"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "ログ"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "もっと"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,12 +222,9 @@ msgid "Answer"
msgstr "解答"
#: templates/personal.php:8
-msgid "You use"
-msgstr "あなたは"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "を利用しています。利用可能容量:"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "現在、<strong>%s</strong> / <strong>%s<strong> を利用しています"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -234,8 +235,8 @@ msgid "Download"
msgstr "ダウンロード"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "パスワードは変更されました"
+msgid "Your password was changed"
+msgstr "パスワードを変更しました"
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 4d2f0561de8..2e11cd4aa4c 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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -31,58 +31,62 @@ msgstr "추가할 카테고리가 없습니까?"
msgid "This category already exists: "
msgstr "이 카테고리는 이미 존재합니다:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "설정"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "1월"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "2월"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "3월"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "4월"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "5월"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "6월"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "7월"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "8월"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "9월"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "10월"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "11월"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "12월"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "취소"
@@ -103,10 +107,110 @@ msgstr "승락"
msgid "No categories selected for deletion."
msgstr "삭제 카테고리를 선택하지 않았습니다."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "에러"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "암호"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ownCloud 비밀번호 재설정"
@@ -192,10 +296,6 @@ msgstr "추가"
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>관리자 계정</strong>을 만드십시오"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "암호"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "고급"
@@ -237,11 +337,11 @@ msgstr "데이터베이스 호스트"
msgid "Finish setup"
msgstr "설치 완료"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "내가 관리하는 웹 서비스"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "로그아웃"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 2abe6f9ed62..1a563136f76 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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -53,39 +53,51 @@ msgstr "디스크에 쓰지 못했습니다"
msgid "Files"
msgstr "파일"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "삭제"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "이미 존재 합니다"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "대체"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "취소"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "대체됨"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "복구"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "와"
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "삭제"
@@ -101,7 +113,7 @@ msgstr "이 파일은 디렉토리이거나 0 바이트이기 때문에 업로
msgid "Upload Error"
msgstr "업로드 에러"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "보류 중"
@@ -109,36 +121,44 @@ msgstr "보류 중"
msgid "Upload cancelled."
msgstr "업로드 취소."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "잘못된 이름, '/' 은 허용이 되지 않습니다."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "크기"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "수정됨"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "폴더"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "폴더"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "파일"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "파일"
@@ -190,7 +210,7 @@ msgstr "폴더"
msgid "From url"
msgstr "URL 에서"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "업로드"
@@ -198,36 +218,36 @@ msgstr "업로드"
msgid "Cancel upload"
msgstr "업로드 취소"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "내용이 없습니다. 업로드할 수 있습니다!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "이름"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "공유"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "다운로드"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "업로드 용량 초과"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "파일을 검색중입니다, 기다려 주십시오."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "커런트 스캐닝"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index c02f8ffff56..3b01080f8d5 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ko\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
index bf42a0a8c89..58730e41e0b 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ko\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 74a1df47382..20ae40411c8 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "이메일 저장"
@@ -74,15 +78,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr "에러"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "비활성화"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "활성화"
@@ -111,63 +111,67 @@ msgstr ""
msgid "Cron"
msgstr "크론"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "각 페이지가 로드 된 하나의 작업을 실행"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php는 webcron 서비스에 등록이 되어 있습니다."
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
-msgstr "cron 시스템 서비스를 사용"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "로그"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "더"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,12 +222,9 @@ msgid "Answer"
msgstr "대답"
#: templates/personal.php:8
-msgid "You use"
-msgstr "현재 사용 중:"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "사용 가능:"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -234,8 +235,8 @@ msgid "Download"
msgstr "다운로드"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "암호가 변경되었습니다"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 6c3da7e6b59..4dd3253269b 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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -30,58 +30,62 @@ msgstr "Keng Kategorie fir bäizesetzen?"
msgid "This category already exists: "
msgstr "Des Kategorie existéiert schonn:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Astellungen"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Januar"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Februar"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Mäerz"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Abrëll"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Mee"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Juni"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Juli"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "August"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "September"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Oktober"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "November"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Dezember"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Ofbriechen"
@@ -102,10 +106,110 @@ msgstr "OK"
msgid "No categories selected for deletion."
msgstr "Keng Kategorien ausgewielt fir ze läschen."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Fehler"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Passwuert"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ownCloud Passwuert reset"
@@ -191,10 +295,6 @@ msgstr "Bäisetzen"
msgid "Create an <strong>admin account</strong>"
msgstr "En <strong>Admin Account</strong> uleeën"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Passwuert"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Advanced"
@@ -236,11 +336,11 @@ msgstr "Datebank Server"
msgid "Finish setup"
msgstr "Installatioun ofschléissen"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "Web Servicer ënnert denger Kontroll"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Ausloggen"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index bdce420aa1c..970d2400779 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -52,39 +52,51 @@ msgstr "Konnt net op den Disk schreiwen"
msgid "Files"
msgstr "Dateien"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Läschen"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "existéiert schonn"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "ersetzen"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "ofbriechen"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "ersat"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "réckgängeg man"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "mat"
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "geläscht"
@@ -100,7 +112,7 @@ msgstr "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss
msgid "Upload Error"
msgstr "Fehler beim eroplueden"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -108,36 +120,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr "Upload ofgebrach."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Ongültege Numm, '/' net erlaabt."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Gréisst"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Geännert"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "Dossier"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "Dossieren"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "Datei"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "Dateien"
@@ -189,7 +209,7 @@ msgstr "Dossier"
msgid "From url"
msgstr "From URL"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Eroplueden"
@@ -197,36 +217,36 @@ msgstr "Eroplueden"
msgid "Cancel upload"
msgstr "Upload ofbriechen"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Hei ass näischt. Lued eppes rop!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Numm"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Share"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Eroflueden"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Upload ze grouss"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "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."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Fichieren gi gescannt, war weg."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Momentane Scan"
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index 83d2cf1bb5b..ebdb3f59320 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lb\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/lb/files_versions.po b/l10n/lb/files_versions.po
index b2a52fe3680..9f3294d11f6 100644
--- a/l10n/lb/files_versions.po
+++ b/l10n/lb/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lb\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index ae12b3db40d..034503e12cf 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -35,6 +35,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "E-mail gespäichert"
@@ -73,15 +77,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr "Fehler"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Ofschalten"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Aschalten"
@@ -110,63 +110,67 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php ass als en webcron Service registréiert"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
-msgstr "benotz den systems cron Service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
-msgstr "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Share API aschalten"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "Erlab Apps d'Share API ze benotzen"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "Links erlaben"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "Resharing erlaben"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "Useren erlaben mat egal wiem ze sharen"
-#: templates/admin.php:62
+#: templates/admin.php:81
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:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Log"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Méi"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,12 +221,9 @@ msgid "Answer"
msgstr "Äntwert"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Du benotz"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "vun den disponibelen"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -233,8 +234,8 @@ msgid "Download"
msgstr "Download"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Däin Passwuert ass geännert ginn"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 1e9dd8d63af..a8c9f4c4349 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -30,58 +30,62 @@ msgstr "Nepridėsite jokios kategorijos?"
msgid "This category already exists: "
msgstr "Tokia kategorija jau yra:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Nustatymai"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Sausis"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Vasaris"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Kovas"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Balandis"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Gegužė"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Birželis"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Liepa"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Rugpjūtis"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Rugsėjis"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Spalis"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Lapkritis"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Gruodis"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Atšaukti"
@@ -102,10 +106,110 @@ msgstr "Gerai"
msgid "No categories selected for deletion."
msgstr "Trynimui nepasirinkta jokia kategorija."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Klaida"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Slaptažodis"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ownCloud slaptažodžio atkūrimas"
@@ -191,10 +295,6 @@ msgstr "Pridėti"
msgid "Create an <strong>admin account</strong>"
msgstr "Sukurti <strong>administratoriaus paskyrą</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Slaptažodis"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Išplėstiniai"
@@ -236,11 +336,11 @@ msgstr "Duomenų bazės serveris"
msgid "Finish setup"
msgstr "Baigti diegimą"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "jūsų valdomos web paslaugos"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Atsijungti"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 058124ee7fa..4f91320a12b 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -53,39 +53,51 @@ msgstr "Nepavyko įrašyti į diską"
msgid "Files"
msgstr "Failai"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Ištrinti"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "atšaukti"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -101,7 +113,7 @@ msgstr "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai kataloga
msgid "Upload Error"
msgstr "Įkėlimo klaida"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Laukiantis"
@@ -109,36 +121,44 @@ msgstr "Laukiantis"
msgid "Upload cancelled."
msgstr "Įkėlimas atšauktas."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Pavadinime negali būti naudojamas ženklas \"/\"."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Dydis"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Pakeista"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "katalogas"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "katalogai"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "failas"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "failai"
@@ -190,7 +210,7 @@ msgstr "Katalogas"
msgid "From url"
msgstr "Iš adreso"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Įkelti"
@@ -198,36 +218,36 @@ msgstr "Įkelti"
msgid "Cancel upload"
msgstr "Atšaukti siuntimą"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Čia tuščia. Įkelkite ką nors!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Pavadinimas"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Dalintis"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Atsisiųsti"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Įkėlimui failas per didelis"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje"
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Skenuojami failai, prašome palaukti."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Šiuo metu skenuojama"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index c51f93d5cf6..e6c1c3865f0 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lt_LT\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -26,14 +26,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index 02e8567562e..9e25e328168 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.po
@@ -8,20 +8,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lt_LT\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "Panaikinti visų versijų galiojimą"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Įjungti failų versijų vedimą"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 5db913f5a2b..a04942dae16 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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -35,6 +35,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "El. paštas išsaugotas"
@@ -73,15 +77,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr "Klaida"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Išjungti"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Įjungti"
@@ -110,63 +110,67 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
-msgstr "naudoti sistemos cron servisą"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Žurnalas"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Daugiau"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,12 +221,9 @@ msgid "Answer"
msgstr "Atsakyti"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Jūs naudojate"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "iš galimų"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -233,8 +234,8 @@ msgid "Download"
msgstr "Atsisiųsti"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Jūsų slaptažodis buvo pakeistas"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 3716a06f25b..69a215cc008 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -30,58 +30,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Iestatījumi"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -102,10 +106,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Parole"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -191,10 +295,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Parole"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr ""
@@ -236,11 +336,11 @@ msgstr "Datubāzes mājvieta"
msgid "Finish setup"
msgstr "Pabeigt uzstādījumus"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Izlogoties"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 5b5c7464b7d..874190de6c3 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -52,39 +52,51 @@ msgstr "Nav iespējams saglabāt"
msgid "Files"
msgstr "Faili"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Izdzēst"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "tāds fails jau eksistē"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "aizvietot"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "atcelt"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "aizvietots"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "vienu soli atpakaļ"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "ar"
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "izdzests"
@@ -100,7 +112,7 @@ msgstr "Nav iespējams augšuplādēt jūsu failu, jo tāds jau eksistē vai ar
msgid "Upload Error"
msgstr "Augšuplādēšanas laikā radās kļūda"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Gaida savu kārtu"
@@ -108,36 +120,44 @@ msgstr "Gaida savu kārtu"
msgid "Upload cancelled."
msgstr "Augšuplāde ir atcelta"
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Šis simbols '/', nav atļauts."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Izmērs"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Izmainīts"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "mape"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "mapes"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "fails"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "faili"
@@ -189,7 +209,7 @@ msgstr "Mape"
msgid "From url"
msgstr "No URL saites"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Augšuplādet"
@@ -197,36 +217,36 @@ msgstr "Augšuplādet"
msgid "Cancel upload"
msgstr "Atcelt augšuplādi"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Te vēl nekas nav. Rīkojies, sāc augšuplādēt"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Nosaukums"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Līdzdalīt"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Lejuplādēt"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Fails ir par lielu lai to augšuplādetu"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Faili šobrīd tiek caurskatīti, nedaudz jāpagaida."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Šobrīd tiek pārbaudīti"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index f102c0e8e37..77168f1b72c 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/lv/files_versions.po b/l10n/lv/files_versions.po
index 11755dfbc98..8f4cc2911f8 100644
--- a/l10n/lv/files_versions.po
+++ b/l10n/lv/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 6c04e77d75a..455a3b65ea5 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -35,6 +35,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Epasts tika saglabāts"
@@ -73,15 +77,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr "Kļūme"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Atvienot"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Pievienot"
@@ -110,63 +110,67 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Log"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Vairāk"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,12 +221,9 @@ msgid "Answer"
msgstr "Atbildēt"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Jūs iymantojat"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "no pieejamajiem"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -233,8 +234,8 @@ msgid "Download"
msgstr "Lejuplādēt"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Jūsu parole tika nomainīta"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index f818b6bad6c..a6e4facf85c 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -32,58 +32,62 @@ msgstr "Нема категорија да се додаде?"
msgid "This category already exists: "
msgstr "Оваа категорија веќе постои:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Поставки"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Јануари"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Февруари"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Март"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Април"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Мај"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Јуни"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Јули"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Август"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Септември"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Октомври"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Ноември"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Декември"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Откажи"
@@ -104,10 +108,110 @@ msgstr "Во ред"
msgid "No categories selected for deletion."
msgstr "Не е одбрана категорија за бришење."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Грешка"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Лозинка"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ресетирање на лозинка за ownCloud"
@@ -193,10 +297,6 @@ msgstr "Додади"
msgid "Create an <strong>admin account</strong>"
msgstr "Направете <strong>администраторска сметка</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Лозинка"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Напредно"
@@ -238,11 +338,11 @@ msgstr "Сервер со база"
msgid "Finish setup"
msgstr "Заврши го подесувањето"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "веб сервиси под Ваша контрола"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Одјава"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 7b01b543419..bac3c16fb5a 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -54,39 +54,51 @@ msgstr "Неуспеав да запишам на диск"
msgid "Files"
msgstr "Датотеки"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Избриши"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -102,7 +114,7 @@ msgstr "Не може да се преземе вашата датотека б
msgid "Upload Error"
msgstr "Грешка при преземање"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Чека"
@@ -110,36 +122,44 @@ msgstr "Чека"
msgid "Upload cancelled."
msgstr "Преземањето е прекинато."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "неисправно име, '/' не е дозволено."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Големина"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Променето"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "фолдер"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "фолдери"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "датотека"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "датотеки"
@@ -191,7 +211,7 @@ msgstr "Папка"
msgid "From url"
msgstr "Од адреса"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Подигни"
@@ -199,36 +219,36 @@ msgstr "Подигни"
msgid "Cancel upload"
msgstr "Откажи прикачување"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Тука нема ништо. Снимете нешто!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Име"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Сподели"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Преземи"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Датотеката е премногу голема"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Се скенираат датотеки, ве молам почекајте."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Моментално скенирам"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 53057883d04..99f5454f5a5 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: mk\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
index a19a0758d7e..c611ab40b13 100644
--- a/l10n/mk/files_versions.po
+++ b/l10n/mk/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: mk\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 6bd27051c39..0d2b29fc077 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Електронската пошта е снимена"
@@ -74,15 +78,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Оневозможи"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Овозможи"
@@ -111,63 +111,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Записник"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Повеќе"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,12 +222,9 @@ msgid "Answer"
msgstr "Одговор"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Вие користите"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "од достапните"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -234,8 +235,8 @@ msgid "Download"
msgstr "Преземање"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Вашата лозинка беше сменета"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 9902f55e846..c7d33e452ea 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -32,58 +32,62 @@ msgstr "Tiada kategori untuk di tambah?"
msgid "This category already exists: "
msgstr "Kategori ini telah wujud"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Tetapan"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Januari"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Februari"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Mac"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "April"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Mei"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Jun"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Julai"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Ogos"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "September"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Oktober"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "November"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Disember"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Batal"
@@ -104,10 +108,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "tiada kategori dipilih untuk penghapusan"
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Ralat"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Kata laluan"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Set semula kata lalaun ownCloud"
@@ -193,10 +297,6 @@ msgstr "Tambah"
msgid "Create an <strong>admin account</strong>"
msgstr "buat <strong>akaun admin</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Kata laluan"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Maju"
@@ -238,11 +338,11 @@ msgstr "Hos pangkalan data"
msgid "Finish setup"
msgstr "Setup selesai"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "Perkhidmatan web di bawah kawalan anda"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Log keluar"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 8c80a09dc7c..b7feaa058e4 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -55,39 +55,51 @@ msgstr "Gagal untuk disimpan"
msgid "Files"
msgstr "fail"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Padam"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "Sudah wujud"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "ganti"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "Batal"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "diganti"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "dengan"
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "dihapus"
@@ -103,7 +115,7 @@ msgstr "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau sai
msgid "Upload Error"
msgstr "Muat naik ralat"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Dalam proses"
@@ -111,36 +123,44 @@ msgstr "Dalam proses"
msgid "Upload cancelled."
msgstr "Muatnaik dibatalkan."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "penggunaa nama tidak sah, '/' tidak dibenarkan."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Saiz"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "direktori"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "direktori"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "fail"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "fail"
@@ -192,7 +212,7 @@ msgstr "Folder"
msgid "From url"
msgstr "Dari url"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Muat naik"
@@ -200,36 +220,36 @@ msgstr "Muat naik"
msgid "Cancel upload"
msgstr "Batal muat naik"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Nama "
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Kongsi"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Muat turun"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Muat naik terlalu besar"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server"
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Fail sedang diimbas, harap bersabar."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Imbasan semasa"
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index ed56ac1736f..6518fcc4c6b 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ms_MY\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/ms_MY/files_versions.po b/l10n/ms_MY/files_versions.po
index d8056fb58ec..46f3f7ed90f 100644
--- a/l10n/ms_MY/files_versions.po
+++ b/l10n/ms_MY/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ms_MY\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 585daefb75b..a1f4ffdd297 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -38,6 +38,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Emel disimpan"
@@ -76,15 +80,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Nyahaktif"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Aktif"
@@ -113,63 +113,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Log"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Lanjutan"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -220,12 +224,9 @@ msgid "Answer"
msgstr "Jawapan"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Anda menggunakan"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "yang tersedia"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -236,8 +237,8 @@ msgid "Download"
msgstr "Muat turun"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Kata laluan anda diubah"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index edb38d95e59..abe385bf88a 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@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,58 +34,62 @@ msgstr "Ingen kategorier å legge til?"
msgid "This category already exists: "
msgstr "Denne kategorien finnes allerede:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Innstillinger"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Januar"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Februar"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Mars"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "April"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Mai"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Juni"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Juli"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "August"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "September"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Oktober"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "November"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Desember"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Avbryt"
@@ -106,10 +110,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Ingen kategorier merket for sletting."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Feil"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Passord"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Tilbakestill ownCloud passord"
@@ -195,10 +299,6 @@ msgstr "Legg til"
msgid "Create an <strong>admin account</strong>"
msgstr "opprett en <strong>administrator-konto</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Passord"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Avansert"
@@ -240,11 +340,11 @@ msgstr "Databasevert"
msgid "Finish setup"
msgstr "Fullfør oppsetting"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "nettjenester under din kontroll"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Logg ut"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index c39e87c9823..a029ccb1bd1 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -7,13 +7,14 @@
# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
# Christer Eriksson <post@hc3web.com>, 2012.
# Daniel <i18n@daniel.priv.no>, 2012.
+# <olamaekle@gmail.com>, 2012.
# <runesudden@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@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"
@@ -56,39 +57,51 @@ msgstr "Klarte ikke å skrive til disk"
msgid "Files"
msgstr "Filer"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Slett"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "eksisterer allerede"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "erstatt"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "avbryt"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "erstattet"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "angre"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "med"
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "slettet"
@@ -104,7 +117,7 @@ msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes
msgid "Upload Error"
msgstr "Opplasting feilet"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Ventende"
@@ -112,36 +125,44 @@ msgstr "Ventende"
msgid "Upload cancelled."
msgstr "Opplasting avbrutt."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Ugyldig navn, '/' er ikke tillatt. "
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Størrelse"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Endret"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "mappe"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "mapper"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "fil"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "filer"
@@ -175,7 +196,7 @@ msgstr "Maksimal størrelse på ZIP-filer"
#: templates/admin.php:14
msgid "Save"
-msgstr ""
+msgstr "Lagre"
#: templates/index.php:7
msgid "New"
@@ -193,7 +214,7 @@ msgstr "Mappe"
msgid "From url"
msgstr "Fra url"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Last opp"
@@ -201,36 +222,36 @@ msgstr "Last opp"
msgid "Cancel upload"
msgstr "Avbryt opplasting"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Ingenting her. Last opp noe!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Navn"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Del"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Last ned"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Opplasting for stor"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Filene du prøver å laste opp er for store for å laste opp til denne serveren."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Skanner etter filer, vennligst vent."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Pågående skanning"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index 941f7443cfb..f449d2b5d8d 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nb_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -26,14 +26,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
index 536b4d262ea..de2fd2c9766 100644
--- a/l10n/nb_NO/files_versions.po
+++ b/l10n/nb_NO/files_versions.po
@@ -8,20 +8,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nb_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Slå på versjonering"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 4b095682b56..6660a5baa73 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@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"
@@ -40,6 +40,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Epost lagret"
@@ -78,15 +82,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr "Feil"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Slå avBehandle "
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Slå på"
@@ -115,63 +115,67 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "utfør en oppgave med hver side som blir lastet"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php er registrert som en webcron tjeneste"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
-msgstr "benytt systemets cron tjeneste"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Logg"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Mer"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -222,12 +226,9 @@ msgid "Answer"
msgstr "Svar"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Du bruker"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "av den tilgjengelige"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -238,8 +239,8 @@ msgid "Download"
msgstr "Last ned"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Passordet ditt ble endret"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 03a847800eb..9cee3d290dd 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -37,58 +37,62 @@ msgstr "Geen categorie toevoegen?"
msgid "This category already exists: "
msgstr "De categorie bestaat al."
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Instellingen"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Januari"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Februari"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Maart"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "April"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Mei"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Juni"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Juli"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Augustus"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "September"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Oktober"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "November"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "December"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Annuleren"
@@ -109,10 +113,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Geen categorie geselecteerd voor verwijdering."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Fout"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ownCloud wachtwoord herstellen"
@@ -198,10 +302,6 @@ msgstr "Toevoegen"
msgid "Create an <strong>admin account</strong>"
msgstr "Maak een <strong>beheerdersaccount</strong> aan"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Wachtwoord"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Geavanceerd"
@@ -243,11 +343,11 @@ msgstr "Database server"
msgid "Finish setup"
msgstr "Installatie afronden"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "webdiensten die je beheerst"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Afmelden"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index b710bae7f68..b10b3cfa2d1 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -60,39 +60,51 @@ msgstr "Schrijven naar schijf mislukt"
msgid "Files"
msgstr "Bestanden"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Stop delen"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Verwijder"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "bestaat al"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "vervang"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "Stel een naam voor"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "annuleren"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "vervangen"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "ongedaan maken"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "door"
#: js/filelist.js:271
+msgid "unshared"
+msgstr "niet gedeeld"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "verwijderd"
@@ -108,7 +120,7 @@ msgstr "uploaden van de file mislukt, het is of een directory of de bestandsgroo
msgid "Upload Error"
msgstr "Upload Fout"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Wachten"
@@ -116,36 +128,44 @@ msgstr "Wachten"
msgid "Upload cancelled."
msgstr "Uploaden geannuleerd."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Bestands upload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Ongeldige naam, '/' is niet toegestaan."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Bestandsgrootte"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Laatst aangepast"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "map"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "mappen"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "bestand"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "bestanden"
@@ -197,7 +217,7 @@ msgstr "Map"
msgid "From url"
msgstr "Van hyperlink"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Upload"
@@ -205,36 +225,36 @@ msgstr "Upload"
msgid "Cancel upload"
msgstr "Upload afbreken"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Er bevindt zich hier niets. Upload een bestand!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Naam"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Delen"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Download"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Bestanden te groot"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Bestanden worden gescand, even wachten."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Er wordt gescand"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 7027b587198..9d3e5f6d2df 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 11:13+0000\n"
-"Last-Translator: diederikdehaas <didi.debian@cknow.org>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
@@ -27,14 +27,24 @@ msgstr "Wachtwoord"
msgid "Submit"
msgstr "Verzenden"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "Downloaden"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "Geen voorbeeldweergave beschikbaar voor"
-#: templates/public.php:25
+#: templates/public.php:37
msgid "web services under your control"
msgstr "Webdiensten in eigen beheer"
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
index 9e4a68ec09b..f1022b967f6 100644
--- a/l10n/nl/files_versions.po
+++ b/l10n/nl/files_versions.po
@@ -8,20 +8,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 20:09+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "Alle versies laten verlopen"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "Versies"
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "Dit zal alle bestaande backup versies van uw bestanden verwijderen"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Activeer file versioning"
+msgid "Files Versioning"
+msgstr "Bestand versies"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Zet aan"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 207f04819e1..b1e94660893 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -4,6 +4,7 @@
#
# Translators:
# <bart.formosus@gmail.com>, 2011.
+# <bramdv@me.com>, 2012.
# <didi.debian@cknow.org>, 2012.
# Erik Bent <hj.bent.60@gmail.com>, 2012.
# <icewind1991@gmail.com>, 2011, 2012.
@@ -15,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 11:28+0000\n"
-"Last-Translator: diederikdehaas <didi.debian@cknow.org>\n"
+"POT-Creation-Date: 2012-09-20 02:05+0200\n"
+"PO-Revision-Date: 2012-09-19 11:36+0000\n"
+"Last-Translator: Bramdv <bramdv@me.com>\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"
@@ -42,6 +43,10 @@ msgstr "Groep bestaat al"
msgid "Unable to add group"
msgstr "Niet in staat om groep toe te voegen"
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "Kan de app. niet activeren"
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "E-mail bewaard"
@@ -80,15 +85,11 @@ msgstr "Niet in staat om gebruiker toe te voegen aan groep %s"
msgid "Unable to remove user from group %s"
msgstr "Niet in staat om gebruiker te verwijderen uit groep %s"
-#: js/apps.js:18
-msgid "Error"
-msgstr "Fout"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Uitschakelen"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Inschakelen"
@@ -111,69 +112,73 @@ msgid ""
"strongly suggest that you configure your webserver in a way that the data "
"directory is no longer accessible or you move the data directory outside the"
" webserver document root."
-msgstr ""
+msgstr "Uw data folder en uw bestanden zijn hoogst waarschijnlijk vanaf het internet bereikbaar. Het .htaccess bestand dat ownCloud meelevert werkt niet. Het is ten zeerste aangeraden om uw webserver zodanig te configureren, dat de data folder niet bereikbaar is vanaf het internet of verplaatst uw data folder naar een locatie buiten de webserver document root."
#: templates/admin.php:31
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "Voer 1 taak uit bij elke geladen pagina"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php is geregistreerd bij een webcron service"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php is bij een webcron dienst geregistreerd. Roep de cron.php pagina in de owncloud root via http één maal per minuut op."
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "gebruik de systeem cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
-msgstr "Deel API"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Delen"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Zet de Deel API aan"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "Sta apps toe om de Deel API te gebruiken"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "Sta links toe"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr "Sta gebruikers toe om items via links publiekelijk te maken"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "Sta verder delen toe"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr "Sta gebruikers toe om items nogmaals te delen"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "Sta gebruikers toe om met iedereen te delen"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr "Sta gebruikers toe om alleen met gebruikers in hun groepen te delen"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Log"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Meer"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -224,12 +229,9 @@ msgid "Answer"
msgstr "Beantwoord"
#: templates/personal.php:8
-msgid "You use"
-msgstr "U gebruikt"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "van de beschikbare"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -240,8 +242,8 @@ msgid "Download"
msgstr "Download"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Uw wachtwoord is aangepast"
+msgid "Your password was changed"
+msgstr "Je wachtwoord is veranderd"
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index ea34767b84e..f2eb243d958 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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -31,58 +31,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Innstillingar"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -103,10 +107,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Passord"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -192,10 +296,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Lag ein <strong>admin-konto</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Passord"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Avansert"
@@ -237,11 +337,11 @@ msgstr "Databasetenar"
msgid "Finish setup"
msgstr "Fullfør oppsettet"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "Vev tjenester under din kontroll"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Logg ut"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index fc058e3f3ea..805decf8ae3 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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -53,39 +53,51 @@ msgstr ""
msgid "Files"
msgstr "Filer"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Slett"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -101,7 +113,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -109,36 +121,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Storleik"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Endra"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -190,7 +210,7 @@ msgstr "Mappe"
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Last opp"
@@ -198,36 +218,36 @@ msgstr "Last opp"
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Ingenting her. Last noko opp!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Namn"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Last ned"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "For stor opplasting"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index e5055f0809b..6a569d362f5 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nn_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index d440d7524f0..4e0539875ac 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nn_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 8276d41ed6d..474aa16ec7d 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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "E-postadresse lagra"
@@ -74,15 +78,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr "Feil"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Slå av"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Slå på"
@@ -111,63 +111,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -218,12 +222,9 @@ msgid "Answer"
msgstr "Svar"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Du bruker"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "av dei tilgjengelege"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -234,8 +235,8 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Passordet ditt er endra"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
new file mode 100644
index 00000000000..59d4ddcdc8f
--- /dev/null
+++ b/l10n/oc/core.po
@@ -0,0 +1,368 @@
+# 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: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr ""
+
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:642
+msgid "January"
+msgstr ""
+
+#: js/js.js:642
+msgid "February"
+msgstr ""
+
+#: js/js.js:642
+msgid "March"
+msgstr ""
+
+#: js/js.js:642
+msgid "April"
+msgstr ""
+
+#: js/js.js:642
+msgid "May"
+msgstr ""
+
+#: js/js.js:642
+msgid "June"
+msgstr ""
+
+#: js/js.js:643
+msgid "July"
+msgstr ""
+
+#: js/js.js:643
+msgid "August"
+msgstr ""
+
+#: js/js.js:643
+msgid "September"
+msgstr ""
+
+#: js/js.js:643
+msgid "October"
+msgstr ""
+
+#: js/js.js:643
+msgid "November"
+msgstr ""
+
+#: js/js.js:643
+msgid "December"
+msgstr ""
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
+msgid "Error"
+msgstr ""
+
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
+#: lostpassword/index.php:26
+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:3
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
+#: templates/login.php:9
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+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:14
+msgid "Add"
+msgstr ""
+
+#: templates/installation.php:24
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:36
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:38
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:45
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:93
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:97
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:101
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:120
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:36
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:39
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:6
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:17
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Log in"
+msgstr ""
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
new file mode 100644
index 00000000000..29bef236534
--- /dev/null
+++ b/l10n/oc/files.po
@@ -0,0 +1,251 @@
+# 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: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr ""
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr ""
+
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:188
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:237 js/filelist.js:239
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:239
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
+msgid "deleted"
+msgstr ""
+
+#: js/files.js:179
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:208
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:208
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:236 js/files.js:341 js/files.js:371
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:355
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:424
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:494
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
+msgid "Size"
+msgstr ""
+
+#: js/files.js:750 templates/index.php:58
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:777
+msgid "folder"
+msgstr ""
+
+#: js/files.js:779
+msgid "folders"
+msgstr ""
+
+#: js/files.js:787
+msgid "file"
+msgstr ""
+
+#: js/files.js:789
+msgid "files"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:11
+msgid "From url"
+msgstr ""
+
+#: templates/index.php:20
+msgid "Upload"
+msgstr ""
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Share"
+msgstr ""
+
+#: templates/index.php:52
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:75
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:77
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:82
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:85
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
new file mode 100644
index 00000000000..d6e0c7a83be
--- /dev/null
+++ b/l10n/oc/files_encryption.po
@@ -0,0 +1,34 @@
+# 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: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
new file mode 100644
index 00000000000..5ddc431f8ca
--- /dev/null
+++ b/l10n/oc/files_external.po
@@ -0,0 +1,82 @@
+# 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: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:96
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:102
+msgid "Import Root Certificate"
+msgstr ""
+
+#: templates/settings.php:108
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Allow users to mount their own external storage"
+msgstr ""
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
new file mode 100644
index 00000000000..0e83b850761
--- /dev/null
+++ b/l10n/oc/files_sharing.po
@@ -0,0 +1,48 @@
+# 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: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:29
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:37
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/oc/files_versions.po b/l10n/oc/files_versions.po
new file mode 100644
index 00000000000..8ea27eb3243
--- /dev/null
+++ b/l10n/oc/files_versions.po
@@ -0,0 +1,42 @@
+# 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: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: js/settings-personal.js:31 templates/settings-personal.php:10
+msgid "Expire all versions"
+msgstr ""
+
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
new file mode 100644
index 00000000000..499df461d8e
--- /dev/null
+++ b/l10n/oc/lib.po
@@ -0,0 +1,125 @@
+# 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: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: app.php:285
+msgid "Help"
+msgstr ""
+
+#: app.php:292
+msgid "Personal"
+msgstr ""
+
+#: app.php:297
+msgid "Settings"
+msgstr ""
+
+#: app.php:302
+msgid "Users"
+msgstr ""
+
+#: app.php:309
+msgid "Apps"
+msgstr ""
+
+#: app.php:311
+msgid "Admin"
+msgstr ""
+
+#: files.php:280
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:281
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:281 files.php:306
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:305
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:63 json.php:75
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:87
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:88
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:89
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:92
+msgid "today"
+msgstr ""
+
+#: template.php:93
+msgid "yesterday"
+msgstr ""
+
+#: template.php:94
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:95
+msgid "last month"
+msgstr ""
+
+#: template.php:96
+msgid "months ago"
+msgstr ""
+
+#: template.php:97
+msgid "last year"
+msgstr ""
+
+#: template.php:98
+msgid "years ago"
+msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
new file mode 100644
index 00000000000..0489ec6c623
--- /dev/null
+++ b/l10n/oc/settings.po
@@ -0,0 +1,317 @@
+# 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: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:15
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr ""
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr ""
+
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: js/apps.js:27 js/apps.js:61
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:27 js/apps.js:50
+msgid "Enable"
+msgstr ""
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr ""
+
+#: personal.php:46 personal.php:47
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:17
+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:31
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:43
+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:49
+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:56
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:61
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:62
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:67
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:68
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:73
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:74
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:79
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:81
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:88
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:116
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:124
+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:10
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:26
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:29
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:30
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Documentation"
+msgstr ""
+
+#: templates/help.php:10
+msgid "Managing Big Files"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:23
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:24
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:32
+msgid "Answer"
+msgstr ""
+
+#: templates/personal.php:8
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr ""
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:23
+msgid "show"
+msgstr ""
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:76
+msgid "Name"
+msgstr ""
+
+#: templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr ""
+
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
+msgid "Groups"
+msgstr ""
+
+#: templates/users.php:32
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:35
+msgid "Default Quota"
+msgstr ""
+
+#: templates/users.php:55 templates/users.php:138
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:80 templates/users.php:112
+msgid "Group Admin"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:146
+msgid "Delete"
+msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
new file mode 100644
index 00000000000..e4321202c2f
--- /dev/null
+++ b/l10n/oc/user_ldap.po
@@ -0,0 +1,170 @@
+# 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: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+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:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Help"
+msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 0cd447bf8ed..6d7fa8caff8 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -35,58 +35,62 @@ msgstr "Brak kategorii"
msgid "This category already exists: "
msgstr "Ta kategoria już istnieje"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Ustawienia"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Styczeń"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Luty"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Marzec"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Kwiecień"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Maj"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Czerwiec"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Lipiec"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Sierpień"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Wrzesień"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Październik"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Listopad"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Grudzień"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Anuluj"
@@ -107,10 +111,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Nie ma kategorii zaznaczonych do usunięcia."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Błąd"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Hasło"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "restart hasła"
@@ -196,10 +300,6 @@ msgstr "Dodaj"
msgid "Create an <strong>admin account</strong>"
msgstr "Tworzenie <strong>konta administratora</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Hasło"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Zaawansowane"
@@ -241,11 +341,11 @@ msgstr "Komputer bazy danych"
msgid "Finish setup"
msgstr "Zakończ konfigurowanie"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "usługi internetowe pod kontrolą"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Wylogowuje użytkownika"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index a3ea40e9bd8..0f293c533ad 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -4,6 +4,7 @@
#
# Translators:
# Cyryl Sochacki <>, 2012.
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012.
# Marcin Małecki <gerber@tkdami.net>, 2011-2012.
# <mosslar@gmail.com>, 2011.
# <mplichta@gmail.com>, 2012.
@@ -12,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 13:42+0000\n"
-"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"Last-Translator: I Robot <thomas.mueller@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"
@@ -56,39 +57,51 @@ msgstr "Błąd zapisu na dysk"
msgid "Files"
msgstr "Pliki"
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Nie udostępniaj"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Usuwa element"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "Już istnieje"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "zastap"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr "zasugeruj nazwę"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "anuluj"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "zastąpione"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "wróć"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "z"
-#: js/filelist.js:266
+#: js/filelist.js:271
+msgid "unshared"
+msgstr "Nie udostępnione"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "skasuj"
@@ -104,7 +117,7 @@ msgstr "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów"
msgid "Upload Error"
msgstr "Błąd wczytywania"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Oczekujące"
@@ -112,36 +125,44 @@ msgstr "Oczekujące"
msgid "Upload cancelled."
msgstr "Wczytywanie anulowane."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zostanie anulowane."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Nieprawidłowa nazwa '/' jest niedozwolone."
-#: js/files.js:746 templates/index.php:56
+#: js/files.js:667
+msgid "files scanned"
+msgstr "Pliki skanowane"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "Wystąpił błąd podczas skanowania"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Rozmiar"
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Czas modyfikacji"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "folder"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "foldery"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "plik"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "pliki"
@@ -193,7 +214,7 @@ msgstr "Katalog"
msgid "From url"
msgstr "Z adresu"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Prześlij"
@@ -217,20 +238,20 @@ msgstr "Współdziel"
msgid "Download"
msgstr "Pobiera element"
-#: templates/index.php:65
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Wysyłany plik ma za duży rozmiar"
-#: templates/index.php:67
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Pliki które próbujesz przesłać, przekraczają maksymalną, dopuszczalną wielkość."
-#: templates/index.php:72
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Skanowanie plików, proszę czekać."
-#: templates/index.php:75
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Aktualnie skanowane"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index fee8ef8b65a..48e19e9d4f6 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 07:03+0000\n"
-"Last-Translator: Cyryl Sochacki <>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
@@ -27,14 +27,24 @@ msgstr "Hasło"
msgid "Submit"
msgstr "Wyślij"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "Pobierz"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "Podgląd nie jest dostępny dla"
-#: templates/public.php:25
+#: templates/public.php:37
msgid "web services under your control"
msgstr "Kontrolowane serwisy"
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
index ea579c0b6a4..8dc13b9fec9 100644
--- a/l10n/pl/files_versions.po
+++ b/l10n/pl/files_versions.po
@@ -4,13 +4,14 @@
#
# Translators:
# Cyryl Sochacki <>, 2012.
+# <mplichta@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 06:57+0000\n"
-"Last-Translator: Cyryl Sochacki <>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
@@ -22,6 +23,10 @@ msgstr ""
msgid "Expire all versions"
msgstr "Wygasają wszystkie wersje"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "Wersje"
@@ -31,5 +36,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "Spowoduje to usunięcie wszystkich istniejących wersji kopii zapasowych plików"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Włącz wersjonowanie plików"
+msgid "Files Versioning"
+msgstr "Wersjonowanie plików"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Włącz"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index adfbe39053c..b0dd960626d 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -4,6 +4,7 @@
#
# Translators:
# Cyryl Sochacki <>, 2012.
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012.
# <icewind1991@gmail.com>, 2012.
# Kamil Domański <kdomanski@kdemail.net>, 2011.
# Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
@@ -15,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 12:06+0000\n"
-"Last-Translator: emc <mplichta@gmail.com>\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@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"
@@ -42,6 +43,10 @@ msgstr "Grupa już istnieje"
msgid "Unable to add group"
msgstr "Nie można dodać grupy"
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "Nie można włączyć aplikacji."
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Email zapisany"
@@ -80,15 +85,11 @@ msgstr "Nie można dodać użytkownika do grupy %s"
msgid "Unable to remove user from group %s"
msgstr "Nie można usunąć użytkownika z grupy %s"
-#: js/apps.js:18
-msgid "Error"
-msgstr "Błąd"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Wyłączone"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Włączone"
@@ -117,63 +118,67 @@ msgstr "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. P
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "wykonanie jednego zadania z każdej załadowanej strony"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "Wykonanie jednego zadania z każdej strony wczytywania"
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php jest zarejestrowany w usłudze webcron"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php jest zarejestrowany w usłudze webcron. Przywołaj stronę cron.php w katalogu głównym owncloud raz na minute przez http."
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "korzystaj z usługi systemowej cron"
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "Użyj usługi systemowej cron. Przywołaj plik cron.php z katalogu owncloud przez systemowe cronjob raz na minute."
-#: templates/admin.php:41
-msgid "Share API"
-msgstr "Udostępnij API"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Udostępnianij"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Włącz udostępniane API"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "Zezwalaj aplikacjom na używanie API"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "Zezwalaj na łącza"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr "Zezwalaj użytkownikom na puliczne współdzielenie elementów za pomocą linków"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "Zezwól na ponowne udostępnianie"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr "Zezwalaj użytkownikom na ponowne współdzielenie elementów już z nimi współdzilonych"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "Zezwalaj użytkownikom na współdzielenie z kimkolwiek"
-#: templates/admin.php:62
+#: templates/admin.php:81
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:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Log"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Więcej"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -224,12 +229,9 @@ msgid "Answer"
msgstr "Odpowiedź"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Używane"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "z dostępnych"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -240,8 +242,8 @@ msgid "Download"
msgstr "Ściągnij"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Zmieniono hasło"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
index 55486564fd2..c0655913251 100644
--- a/l10n/pl_PL/core.po
+++ b/l10n/pl_PL/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
@@ -29,58 +29,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -101,10 +105,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -190,10 +294,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr ""
-
#: templates/installation.php:36
msgid "Advanced"
msgstr ""
@@ -235,11 +335,11 @@ msgstr ""
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr ""
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index 227d04a1ecb..1ff3d1e08fc 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
@@ -51,39 +51,51 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -99,7 +111,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -107,36 +119,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr ""
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr ""
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -188,7 +208,7 @@ msgstr ""
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr ""
@@ -196,36 +216,36 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr ""
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/pl_PL/files_sharing.po b/l10n/pl_PL/files_sharing.po
index f92619c2f71..5735894fdf4 100644
--- a/l10n/pl_PL/files_sharing.po
+++ b/l10n/pl_PL/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/pl_PL/files_versions.po b/l10n/pl_PL/files_versions.po
index 5f9feef04fd..40053b76ef7 100644
--- a/l10n/pl_PL/files_versions.po
+++ b/l10n/pl_PL/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index 0d571388740..3a26454d139 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -72,15 +76,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -109,63 +109,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,11 +220,8 @@ msgid "Answer"
msgstr ""
#: templates/personal.php:8
-msgid "You use"
-msgstr ""
-
-#: templates/personal.php:8
-msgid "of the available"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
msgstr ""
#: templates/personal.php:12
@@ -232,7 +233,7 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
+msgid "Your password was changed"
msgstr ""
#: templates/personal.php:20
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 6e1c9fdcd9c..a76ff353122 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -34,58 +34,62 @@ msgstr "Nenhuma categoria adicionada?"
msgid "This category already exists: "
msgstr "Essa categoria já existe"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Configurações"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Janeiro"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Fevereiro"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Março"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Abril"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Maio"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Junho"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Julho"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Agosto"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Setembro"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Outubro"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Novembro"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Dezembro"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Cancelar"
@@ -106,10 +110,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Nenhuma categoria selecionada para deletar."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Erro"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Senha"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Redefinir senha ownCloud"
@@ -195,10 +299,6 @@ msgstr "Adicionar"
msgid "Create an <strong>admin account</strong>"
msgstr "Criar uma <strong>conta</strong> de <strong>administrador</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Senha"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Avançado"
@@ -240,11 +340,11 @@ msgstr "Banco de dados do host"
msgid "Finish setup"
msgstr "Concluir configuração"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "web services sob seu controle"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Sair"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 6e29f6321bf..7ed5839bfa9 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -56,39 +56,51 @@ msgstr "Falha ao escrever no disco"
msgid "Files"
msgstr "Arquivos"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Excluir"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "já existe"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "substituir"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "cancelar"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "substituido "
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "desfazer"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "com"
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "deletado"
@@ -104,7 +116,7 @@ msgstr "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes."
msgid "Upload Error"
msgstr "Erro de envio"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Pendente"
@@ -112,36 +124,44 @@ msgstr "Pendente"
msgid "Upload cancelled."
msgstr "Envio cancelado."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Nome inválido, '/' não é permitido."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Tamanho"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "pasta"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "pastas"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "arquivo"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "arquivos"
@@ -193,7 +213,7 @@ msgstr "Pasta"
msgid "From url"
msgstr "URL de origem"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Carregar"
@@ -201,36 +221,36 @@ msgstr "Carregar"
msgid "Cancel upload"
msgstr "Cancelar upload"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Nada aqui.Carrege alguma coisa!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Nome"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Compartilhar"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Baixar"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Arquivo muito grande"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Arquivos sendo escaneados, por favor aguarde."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Scanning atual"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 0e7ee143449..992092d54e6 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index 14e3834e40f..8ac0d74f93b 100644
--- a/l10n/pt_BR/files_versions.po
+++ b/l10n/pt_BR/files_versions.po
@@ -8,20 +8,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "Expirar todas as versões"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Habilitar versionamento de arquivos"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 5c7f19c7695..203d049677d 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -40,6 +40,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Email gravado"
@@ -78,15 +82,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr "Erro"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Desabilitado"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Habilitado"
@@ -115,63 +115,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "executar uma tarefa com cada página em aberto"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php esta registrado no serviço de webcron"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Log"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Mais"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -222,12 +226,9 @@ msgid "Answer"
msgstr "Resposta"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Você usa"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "do disponível"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -238,8 +239,8 @@ msgid "Download"
msgstr "Download"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Sua senha foi modificada"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index ef75d8f6bdf..d5ea28b9e3c 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -32,58 +32,62 @@ msgstr "Nenhuma categoria para adicionar?"
msgid "This category already exists: "
msgstr "Esta categoria já existe:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Definições"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Janeiro"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Fevereiro"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Março"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Abril"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Maio"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Junho"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Julho"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Agosto"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Setembro"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Outubro"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Novembro"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Dezembro"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Cancelar"
@@ -104,10 +108,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Nenhuma categoria seleccionar para eliminar"
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Erro"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Palavra chave"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Reposição da password ownCloud"
@@ -193,10 +297,6 @@ msgstr "Adicionar"
msgid "Create an <strong>admin account</strong>"
msgstr "Criar uma <strong>conta administrativa</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Palavra chave"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Avançado"
@@ -238,11 +338,11 @@ msgstr "Host da base de dados"
msgid "Finish setup"
msgstr "Acabar instalação"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "serviços web sob o seu controlo"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Sair"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index c0ba21ecbc6..a32afecd9ae 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -54,39 +54,51 @@ msgstr "Falhou a escrita no disco"
msgid "Files"
msgstr "Ficheiros"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Apagar"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "Já existe"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "substituir"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "cancelar"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "substituido"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "desfazer"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "com"
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "apagado"
@@ -102,7 +114,7 @@ msgstr "Não é possivel fazer o upload do ficheiro devido a ser uma pasta ou te
msgid "Upload Error"
msgstr "Erro no upload"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Pendente"
@@ -110,36 +122,44 @@ msgstr "Pendente"
msgid "Upload cancelled."
msgstr "O upload foi cancelado."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "nome inválido, '/' não permitido."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Tamanho"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "pasta"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "pastas"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "ficheiro"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "ficheiros"
@@ -191,7 +211,7 @@ msgstr "Pasta"
msgid "From url"
msgstr "Do endereço"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Enviar"
@@ -199,36 +219,36 @@ msgstr "Enviar"
msgid "Cancel upload"
msgstr "Cancelar upload"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Vazio. Envia alguma coisa!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Nome"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Partilhar"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Transferir"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Envio muito grande"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Os ficheiro que estás a tentar enviar excedem o tamanho máximo de envio neste servidor."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Análise actual"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 99b0c7c2155..a593fe89b52 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: pt_PT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
index 56a1489aa85..317fd2ed31c 100644
--- a/l10n/pt_PT/files_versions.po
+++ b/l10n/pt_PT/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: pt_PT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 05fcf5b8bd0..f81755fd9c0 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -37,6 +37,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Email guardado"
@@ -75,15 +79,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr "Erro"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Desativar"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Ativar"
@@ -112,63 +112,67 @@ msgstr ""
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "Executar uma tarefa com cada página carregada"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php está registado num serviço webcron"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
-msgstr "usar o serviço cron do sistema"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Log"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Mais"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -219,12 +223,9 @@ msgid "Answer"
msgstr "Resposta"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Está a usar"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "do disponível"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -235,8 +236,8 @@ msgid "Download"
msgstr "Transferir"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "A sua palavra-chave foi alterada"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 42e779595e1..96b962d41cf 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -6,12 +6,13 @@
# Claudiu <claudiu@tanaselia.ro>, 2011, 2012.
# Dimon Pockemon <>, 2012.
# Eugen Mihalache <eugemjj@gmail.com>, 2012.
+# <g.ciprian@osn.ro>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -32,80 +33,184 @@ msgstr "Nici o categorie de adăugat?"
msgid "This category already exists: "
msgstr "Această categorie deja există:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Configurări"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
-msgstr ""
+msgstr "Ianuarie"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
-msgstr ""
+msgstr "Februarie"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
-msgstr ""
+msgstr "Martie"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
-msgstr ""
+msgstr "Aprilie"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
-msgstr ""
+msgstr "Mai"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
-msgstr ""
+msgstr "Iunie"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
-msgstr ""
+msgstr "Iulie"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
-msgstr ""
+msgstr "August"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
-msgstr ""
+msgstr "Septembrie"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
-msgstr ""
+msgstr "Octombrie"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
-msgstr ""
+msgstr "Noiembrie"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
+msgstr "Decembrie"
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
msgstr ""
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
-msgstr ""
+msgstr "Anulare"
#: js/oc-dialogs.js:159
msgid "No"
-msgstr ""
+msgstr "Nu"
#: js/oc-dialogs.js:160
msgid "Yes"
-msgstr ""
+msgstr "Da"
#: js/oc-dialogs.js:177
msgid "Ok"
-msgstr ""
+msgstr "Ok"
#: js/oc-vcategories.js:68
msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Nici o categorie selectată pentru ștergere."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
+msgstr "Eroare"
+
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Parola"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
msgstr ""
#: lostpassword/index.php:26
@@ -193,10 +298,6 @@ msgstr "Adaugă"
msgid "Create an <strong>admin account</strong>"
msgstr "Crează un <strong>cont de administrator</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Parola"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Avansat"
@@ -228,7 +329,7 @@ msgstr "Numele bazei de date"
#: templates/installation.php:109
msgid "Database tablespace"
-msgstr ""
+msgstr "Tabela de spațiu a bazei de date"
#: templates/installation.php:115
msgid "Database host"
@@ -238,11 +339,11 @@ msgstr "Bază date"
msgid "Finish setup"
msgstr "Finalizează instalarea"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "servicii web controlate de tine"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Ieșire"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 84051830b49..0aa7c12e7f8 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -6,12 +6,13 @@
# Claudiu <claudiu@tanaselia.ro>, 2011, 2012.
# Dimon Pockemon <>, 2012.
# Eugen Mihalache <eugemjj@gmail.com>, 2012.
+# <g.ciprian@osn.ro>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -54,94 +55,114 @@ msgstr "Eroare la scriere pe disc"
msgid "Files"
msgstr "Fișiere"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Anulează partajarea"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Șterge"
-#: js/filelist.js:186 js/filelist.js:188
-msgid "already exists"
+#: js/fileactions.js:182
+msgid "Rename"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
+msgid "already exists"
+msgstr "deja există"
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
-msgstr ""
+msgstr "înlocuire"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "sugerează nume"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
-msgstr ""
+msgstr "anulare"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
-msgstr ""
+msgstr "înlocuit"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
-msgstr ""
+msgstr "Anulează ultima acțiune"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
-msgstr ""
+msgstr "cu"
#: js/filelist.js:271
+msgid "unshared"
+msgstr "nepartajat"
+
+#: js/filelist.js:273
msgid "deleted"
-msgstr ""
+msgstr "șters"
#: js/files.js:179
msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "se generază fișierul ZIP, va dura ceva timp."
#: js/files.js:208
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes."
#: js/files.js:208
msgid "Upload Error"
-msgstr ""
+msgstr "Eroare la încărcare"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
-msgstr ""
+msgstr "În așteptare"
#: js/files.js:355
msgid "Upload cancelled."
-msgstr ""
+msgstr "Încărcare anulată."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Nume invalid, '/' nu este permis."
+
+#: js/files.js:667
+msgid "files scanned"
+msgstr "fișiere scanate"
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "eroare la scanarea"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Dimensiune"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
-msgstr ""
+msgstr "director"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
-msgstr ""
+msgstr "directoare"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
-msgstr ""
+msgstr "fișier"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
-msgstr ""
+msgstr "fișiere"
#: templates/admin.php:5
msgid "File handling"
@@ -173,7 +194,7 @@ msgstr "Dimensiunea maximă de intrare pentru fișiere compresate"
#: templates/admin.php:14
msgid "Save"
-msgstr ""
+msgstr "Salvare"
#: templates/index.php:7
msgid "New"
@@ -191,7 +212,7 @@ msgstr "Dosar"
msgid "From url"
msgstr "De la URL"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Încarcă"
@@ -199,36 +220,36 @@ msgstr "Încarcă"
msgid "Cancel upload"
msgstr "Anulează încărcarea"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Nimic aici. Încarcă ceva!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Nume"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Partajează"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Descarcă"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Fișierul încărcat este prea mare"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Fișierele sunt scanate, te rog așteptă."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "În curs de scanare"
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index f042cb49fcf..2c3a3ed30b0 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.po
@@ -3,32 +3,33 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <g.ciprian@osn.ro>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-18 11:31+0000\n"
+"Last-Translator: g.ciprian <g.ciprian@osn.ro>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Încriptare"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Exclude următoarele tipuri de fișiere de la încriptare"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Niciuna"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "Activare încriptare"
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index 6b9e6f09555..17931832c6a 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/files_external.po
@@ -3,80 +3,81 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <g.ciprian@osn.ro>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-18 12:38+0000\n"
+"Last-Translator: g.ciprian <g.ciprian@osn.ro>\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"
"Content-Transfer-Encoding: 8bit\n"
"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Stocare externă"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "Punctul de montare"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "Backend"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "Configurație"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "Opțiuni"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "Aplicabil"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "Adaugă punct de montare"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "Niciunul"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "Toți utilizatorii"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "Grupuri"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "Utilizatori"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "Șterge"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "Certificate SSL root"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importă certificat root"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Permite stocare externă pentru utilizatori"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Permite utilizatorilor să monteze stocare externă proprie"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index 6772dfc57a6..d218ac95863 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -3,36 +3,47 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <g.ciprian@osn.ro>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
#: templates/authenticate.php:4
msgid "Password"
-msgstr ""
+msgstr "Parolă"
#: templates/authenticate.php:6
msgid "Submit"
+msgstr "Trimite"
+
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
-msgid "Download"
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr "Descarcă"
+
+#: templates/public.php:29
msgid "No preview available for"
-msgstr ""
+msgstr "Nici o previzualizare disponibilă pentru "
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
-msgstr ""
+msgstr "servicii web controlate de tine"
diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po
index 936d92da9a1..325123ac1fc 100644
--- a/l10n/ro/files_versions.po
+++ b/l10n/ro/files_versions.po
@@ -3,32 +3,41 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <g.ciprian@osn.ro>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
+msgstr "Expiră toate versiunile"
+
+#: js/versions.js:16
+msgid "History"
msgstr ""
#: templates/settings-personal.php:4
msgid "Versions"
-msgstr ""
+msgstr "Versiuni"
#: templates/settings-personal.php:7
msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Această acțiune va șterge toate versiunile salvate ale fișierelor tale"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr ""
+msgid "Files Versioning"
+msgstr "Versionare fișiere"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Activare"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 1c5698fa220..d9b2796cc91 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -3,123 +3,124 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <g.ciprian@osn.ro>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-18 12:54+0000\n"
+"Last-Translator: g.ciprian <g.ciprian@osn.ro>\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"
"Content-Transfer-Encoding: 8bit\n"
"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: app.php:288
+#: app.php:285
msgid "Help"
-msgstr ""
+msgstr "Ajutor"
-#: app.php:295
+#: app.php:292
msgid "Personal"
-msgstr ""
+msgstr "Personal"
-#: app.php:300
+#: app.php:297
msgid "Settings"
-msgstr ""
+msgstr "Setări"
-#: app.php:305
+#: app.php:302
msgid "Users"
-msgstr ""
+msgstr "Utilizatori"
-#: app.php:312
+#: app.php:309
msgid "Apps"
-msgstr ""
+msgstr "Aplicații"
-#: app.php:314
+#: app.php:311
msgid "Admin"
-msgstr ""
+msgstr "Admin"
#: files.php:280
msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Descărcarea ZIP este dezactivată."
#: files.php:281
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Fișierele trebuie descărcate unul câte unul."
#: files.php:281 files.php:306
msgid "Back to Files"
-msgstr ""
+msgstr "Înapoi la fișiere"
#: files.php:305
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Fișierele selectate sunt prea mari pentru a genera un fișier zip."
#: json.php:28
msgid "Application is not enabled"
-msgstr ""
+msgstr "Aplicația nu este activată"
#: json.php:39 json.php:63 json.php:75
msgid "Authentication error"
-msgstr ""
+msgstr "Eroare la autentificare"
#: json.php:51
msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Token expirat. Te rugăm să reîncarci pagina."
-#: template.php:86
+#: template.php:87
msgid "seconds ago"
-msgstr ""
+msgstr "secunde în urmă"
-#: template.php:87
+#: template.php:88
msgid "1 minute ago"
-msgstr ""
+msgstr "1 minut în urmă"
-#: template.php:88
+#: template.php:89
#, php-format
msgid "%d minutes ago"
-msgstr ""
+msgstr "%d minute în urmă"
-#: template.php:91
+#: template.php:92
msgid "today"
-msgstr ""
+msgstr "astăzi"
-#: template.php:92
+#: template.php:93
msgid "yesterday"
-msgstr ""
+msgstr "ieri"
-#: template.php:93
+#: template.php:94
#, php-format
msgid "%d days ago"
-msgstr ""
+msgstr "%d zile în urmă"
-#: template.php:94
+#: template.php:95
msgid "last month"
-msgstr ""
+msgstr "ultima lună"
-#: template.php:95
+#: template.php:96
msgid "months ago"
-msgstr ""
+msgstr "luni în urmă"
-#: template.php:96
+#: template.php:97
msgid "last year"
-msgstr ""
+msgstr "ultimul an"
-#: template.php:97
+#: template.php:98
msgid "years ago"
-msgstr ""
+msgstr "ani în urmă"
#: updater.php:66
#, php-format
msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s este disponibil. Vezi <a href=\"%s\">mai multe informații</a>"
#: updater.php:68
msgid "up to date"
-msgstr ""
+msgstr "la zi"
#: updater.php:71
msgid "updates check is disabled"
-msgstr ""
+msgstr "verificarea după actualizări este dezactivată"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index a1bc80deb8a..b4a1b3932a6 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -6,15 +6,16 @@
# Claudiu <claudiu@tanaselia.ro>, 2011, 2012.
# Dimon Pockemon <>, 2012.
# Eugen Mihalache <eugemjj@gmail.com>, 2012.
+# <g.ciprian@osn.ro>, 2012.
# <icewind1991@gmail.com>, 2012.
# <iuranemo@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 08:28+0000\n"
+"Last-Translator: g.ciprian <g.ciprian@osn.ro>\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"
@@ -33,11 +34,15 @@ msgstr "Eroare de autentificare"
#: ajax/creategroup.php:19
msgid "Group already exists"
-msgstr ""
+msgstr "Grupul există deja"
#: ajax/creategroup.php:28
msgid "Unable to add group"
-msgstr ""
+msgstr "Nu s-a putut adăuga grupul"
+
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "Nu s-a putut activa aplicația."
#: ajax/lostpassword.php:14
msgid "Email saved"
@@ -57,11 +62,11 @@ msgstr "Cerere eronată"
#: ajax/removegroup.php:16
msgid "Unable to delete group"
-msgstr ""
+msgstr "Nu s-a putut șterge grupul"
#: ajax/removeuser.php:22
msgid "Unable to delete user"
-msgstr ""
+msgstr "Nu s-a putut șterge utilizatorul"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -70,22 +75,18 @@ msgstr "Limba a fost schimbată"
#: ajax/togglegroups.php:25
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Nu s-a putut adăuga utilizatorul la grupul %s"
#: ajax/togglegroups.php:31
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
-
-#: js/apps.js:18
-msgid "Error"
-msgstr "Erroare"
+msgstr "Nu s-a putut elimina utilizatorul din grupul %s"
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Dezactivați"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Activați"
@@ -108,69 +109,73 @@ msgid ""
"strongly suggest that you configure your webserver in a way that the data "
"directory is no longer accessible or you move the data directory outside the"
" webserver document root."
-msgstr ""
+msgstr "Directorul tău de date și fișierele tale probabil sunt accesibile prin internet. Fișierul .htaccess oferit de ownCloud nu funcționează. Îți recomandăm să configurezi server-ul tău web într-un mod în care directorul de date să nu mai fie accesibil sau mută directorul de date în afara directorului root al server-ului web."
#: templates/admin.php:31
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "executâ o sarcină cu fiecare pagină încărcată"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "Execută o sarcină la fiecare pagină încărcată"
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php e înregistrat la un serviciu de webcron"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php este înregistrat în serviciul webcron. Accesează pagina cron.php din root-ul owncloud odată pe minut prin http."
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "utilizează serviciul de cron al sistemului"
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "Folosește serviciul cron al sistemului. Accesează fișierul cron.php din directorul owncloud printr-un cronjob de sistem odată la fiecare minut."
-#: templates/admin.php:41
-msgid "Share API"
-msgstr ""
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Partajare"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
-msgstr ""
+msgstr "Activare API partajare"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Permite aplicațiilor să folosească API-ul de partajare"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
-msgstr ""
+msgstr "Pemite legături"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Permite utilizatorilor să partajeze fișiere în mod public prin legături"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
-msgstr ""
+msgstr "Permite repartajarea"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Permite utilizatorilor să repartajeze fișiere partajate cu ei"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Permite utilizatorilor să partajeze cu oricine"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Permite utilizatorilor să partajeze doar cu utilizatori din același grup"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Jurnal de activitate"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Mai mult"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -178,7 +183,7 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
#: templates/apps.php:10
msgid "Add your App"
@@ -194,7 +199,7 @@ msgstr "Vizualizează pagina applicației pe apps.owncloud.com"
#: templates/apps.php:30
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>"
#: templates/help.php:9
msgid "Documentation"
@@ -221,12 +226,9 @@ msgid "Answer"
msgstr "Răspuns"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Utilizezi"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "din cele diponibile"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "Ai utilizat <strong>%s</strong> din <strong>%s<strong> spațiu disponibil"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -237,8 +239,8 @@ msgid "Download"
msgstr "Descărcări"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Parola ta s-a schimbat"
+msgid "Your password was changed"
+msgstr "Parola a fost modificată"
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index fa6451a38b3..1475085afa4 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -7,12 +7,13 @@
# <jekader@gmail.com>, 2011, 2012.
# <tony.mccourin@gmail.com>, 2011.
# Victor Bravo <>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -33,58 +34,62 @@ msgstr "Нет категорий для добавления?"
msgid "This category already exists: "
msgstr "Эта категория уже существует: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Настройки"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Январь"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Февраль"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Март"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Апрель"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Май"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Июнь"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Июль"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Август"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Сентябрь"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Октябрь"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Ноябрь"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Декабрь"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Отмена"
@@ -105,10 +110,110 @@ msgstr "Ок"
msgid "No categories selected for deletion."
msgstr "Нет категорий для удаления."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Ошибка"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Пароль"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Сброс пароля "
@@ -194,10 +299,6 @@ msgstr "Добавить"
msgid "Create an <strong>admin account</strong>"
msgstr "Создать <strong>учётную запись администратора</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Пароль"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Дополнительно"
@@ -229,7 +330,7 @@ msgstr "Название базы данных"
#: templates/installation.php:109
msgid "Database tablespace"
-msgstr ""
+msgstr "Табличое пространство базы данных"
#: templates/installation.php:115
msgid "Database host"
@@ -239,11 +340,11 @@ msgstr "Хост базы данных"
msgid "Finish setup"
msgstr "Завершить установку"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "Сетевые службы под твоим контролем"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Выйти"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 250d6badf4e..11b7b85a1e3 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -9,12 +9,13 @@
# Nick Remeslennikov <homolibere@gmail.com>, 2012.
# <tony.mccourin@gmail.com>, 2011.
# Victor Bravo <>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -57,39 +58,51 @@ msgstr "Ошибка записи на диск"
msgid "Files"
msgstr "Файлы"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Отменить публикацию"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Удалить"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "уже существует"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "заменить"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "предложить название"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "отмена"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "заменён"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "отмена"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "с"
#: js/filelist.js:271
+msgid "unshared"
+msgstr "публикация отменена"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "удален"
@@ -105,7 +118,7 @@ msgstr "Не удается загрузить файл размером 0 ба
msgid "Upload Error"
msgstr "Ошибка загрузки"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Ожидание"
@@ -113,36 +126,44 @@ msgstr "Ожидание"
msgid "Upload cancelled."
msgstr "Загрузка отменена."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Неверное имя, '/' не допускается."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Размер"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Изменён"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "папка"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "папки"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "файл"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "файлы"
@@ -176,7 +197,7 @@ msgstr "Максимальный исходный размер для ZIP фай
#: templates/admin.php:14
msgid "Save"
-msgstr ""
+msgstr "Сохранить"
#: templates/index.php:7
msgid "New"
@@ -194,7 +215,7 @@ msgstr "Папка"
msgid "From url"
msgstr "С url"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Загрузить"
@@ -202,36 +223,36 @@ msgstr "Загрузить"
msgid "Cancel upload"
msgstr "Отмена загрузки"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Здесь ничего нет. Загрузите что-нибудь!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Название"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Опубликовать"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Скачать"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Файл слишком большой"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Файлы, которые Вы пытаетесь загрузить, превышают лимит для файлов на этом сервере."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Подождите, файлы сканируются."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Текущее сканирование"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 97fc33e4ef0..803a4863c4c 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -5,19 +5,20 @@
# Translators:
# Denis <reg.transifex.net@demitel.ru>, 2012.
# <iuranemo@gmail.com>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -27,14 +28,24 @@ msgstr "Пароль"
msgid "Submit"
msgstr "Отправить"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "Скачать"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
-msgstr ""
+msgstr "Предпросмотр недоступен для"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr "веб-сервисы под вашим управлением"
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
index fc36a2ead44..4ea65271fb3 100644
--- a/l10n/ru/files_versions.po
+++ b/l10n/ru/files_versions.po
@@ -4,32 +4,41 @@
#
# Translators:
# Denis <reg.transifex.net@demitel.ru>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "Просрочить все версии"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
-msgstr ""
+msgstr "Версии"
#: templates/settings-personal.php:7
msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Очистить список версий ваших файлов"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Включить ведение версий файлов"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 9a75b9546ae..da6e4785005 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -5,41 +5,42 @@
# Translators:
# Denis <reg.transifex.net@demitel.ru>, 2012.
# <mpolr21@gmail.com>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-03 02:04+0200\n"
-"PO-Revision-Date: 2012-09-02 14:32+0000\n"
-"Last-Translator: mPolr <mpolr21@gmail.com>\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 11:22+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: app.php:288
+#: app.php:285
msgid "Help"
msgstr "Помощь"
-#: app.php:295
+#: app.php:292
msgid "Personal"
msgstr "Личное"
-#: app.php:300
+#: app.php:297
msgid "Settings"
msgstr "Настройки"
-#: app.php:305
+#: app.php:302
msgid "Users"
msgstr "Пользователи"
-#: app.php:312
+#: app.php:309
msgid "Apps"
msgstr "Приложения"
-#: app.php:314
+#: app.php:311
msgid "Admin"
msgstr "Admin"
@@ -71,56 +72,56 @@ msgstr "Ошибка аутентификации"
msgid "Token expired. Please reload page."
msgstr "Токен просрочен. Перезагрузите страницу."
-#: template.php:86
+#: template.php:87
msgid "seconds ago"
msgstr "менее минуты"
-#: template.php:87
+#: template.php:88
msgid "1 minute ago"
msgstr "1 минуту назад"
-#: template.php:88
+#: template.php:89
#, php-format
msgid "%d minutes ago"
msgstr "%d минут назад"
-#: template.php:91
+#: template.php:92
msgid "today"
msgstr "сегодня"
-#: template.php:92
+#: template.php:93
msgid "yesterday"
msgstr "вчера"
-#: template.php:93
+#: template.php:94
#, php-format
msgid "%d days ago"
msgstr "%d дней назад"
-#: template.php:94
+#: template.php:95
msgid "last month"
msgstr "в прошлом месяце"
-#: template.php:95
+#: template.php:96
msgid "months ago"
msgstr "месяцы назад"
-#: template.php:96
+#: template.php:97
msgid "last year"
msgstr "в прошлом году"
-#: template.php:97
+#: template.php:98
msgid "years ago"
msgstr "годы назад"
#: updater.php:66
#, php-format
msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "Возможно обновление до %s. <a href=\"%s\">Подробнее</a>"
#: updater.php:68
msgid "up to date"
-msgstr ""
+msgstr "актуальная версия"
#: updater.php:71
msgid "updates check is disabled"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index e898279374c..634c9aa217d 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -11,12 +11,13 @@
# <rasperepodvipodvert@gmail.com>, 2012.
# <tony.mccourin@gmail.com>, 2011.
# Victor Bravo <>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -36,10 +37,14 @@ msgstr "Ошибка авторизации"
#: ajax/creategroup.php:19
msgid "Group already exists"
-msgstr ""
+msgstr "Группа уже существует"
#: ajax/creategroup.php:28
msgid "Unable to add group"
+msgstr "Невозможно добавить группу"
+
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
msgstr ""
#: ajax/lostpassword.php:14
@@ -60,11 +65,11 @@ msgstr "Неверный запрос"
#: ajax/removegroup.php:16
msgid "Unable to delete group"
-msgstr ""
+msgstr "Невозможно удалить группу"
#: ajax/removeuser.php:22
msgid "Unable to delete user"
-msgstr ""
+msgstr "Невозможно удалить пользователя"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -73,22 +78,18 @@ msgstr "Язык изменён"
#: ajax/togglegroups.php:25
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Невозможно добавить пользователя в группу %s"
#: ajax/togglegroups.php:31
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
-
-#: js/apps.js:18
-msgid "Error"
-msgstr "Ошибка"
+msgstr "Невозможно удалить пользователя из группы %s"
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
-msgstr "Отключить"
+msgstr "Выключить"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Включить"
@@ -111,69 +112,73 @@ msgid ""
"strongly suggest that you configure your webserver in a way that the data "
"directory is no longer accessible or you move the data directory outside the"
" webserver document root."
-msgstr ""
+msgstr "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или вынести каталог data за пределы корневого каталога веб-сервера."
#: templates/admin.php:31
msgid "Cron"
msgstr "Задание"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "Запускать задание при загрузке каждой страницы"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php зарегистрирован в webcron сервисе"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
-msgstr "использовать системные задания"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
-msgstr ""
+msgstr "Включить API публикации"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Разрешить API публикации для приложений"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
-msgstr ""
+msgstr "Разрешить ссылки"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Разрешить пользователям публикацию при помощи ссылок"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
-msgstr ""
+msgstr "Включить повторную публикацию"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Разрешить пользователям публиковать доступные им элементы других пользователей"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Разрешить публиковать для любых пользователей"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Ограничить публикацию группами пользователя"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Журнал"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Ещё"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -181,7 +186,7 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
#: templates/apps.php:10
msgid "Add your App"
@@ -197,7 +202,7 @@ msgstr "Смотрите дополнения на apps.owncloud.com"
#: templates/apps.php:30
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>"
#: templates/help.php:9
msgid "Documentation"
@@ -224,12 +229,9 @@ msgid "Answer"
msgstr "Ответ"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Вы используете"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "из доступных"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -240,8 +242,8 @@ msgid "Download"
msgstr "Загрузка"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Ваш пароль был изменён"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index 6c4aeee5d54..5c5a1d4a79a 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
@@ -19,250 +20,350 @@ msgstr ""
#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
msgid "Application name not provided."
-msgstr ""
+msgstr "Имя приложения не предоставлено."
#: ajax/vcategories/add.php:29
msgid "No category to add?"
-msgstr ""
+msgstr "Нет категории для добавления?"
#: ajax/vcategories/add.php:36
msgid "This category already exists: "
-msgstr ""
+msgstr "Эта категория уже существует:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
-msgstr ""
+msgstr "Настройки"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
-msgstr ""
+msgstr "Январь"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
-msgstr ""
+msgstr "Февраль"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
-msgstr ""
+msgstr "Март"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
-msgstr ""
+msgstr "Апрель"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
-msgstr ""
+msgstr "Май"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
-msgstr ""
+msgstr "Июнь"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
-msgstr ""
+msgstr "Июль"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
-msgstr ""
+msgstr "Август"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
-msgstr ""
+msgstr "Сентябрь"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
-msgstr ""
+msgstr "Октябрь"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
-msgstr ""
+msgstr "Ноябрь"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
+msgstr "Декабрь"
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
msgstr ""
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
#: js/oc-dialogs.js:159
msgid "No"
-msgstr ""
+msgstr "Нет"
#: js/oc-dialogs.js:160
msgid "Yes"
-msgstr ""
+msgstr "Да"
#: js/oc-dialogs.js:177
msgid "Ok"
-msgstr ""
+msgstr "Да"
#: js/oc-vcategories.js:68
msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Нет категорий, выбранных для удаления."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
+msgstr "Ошибка"
+
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Пароль"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
msgstr ""
#: lostpassword/index.php:26
msgid "ownCloud password reset"
-msgstr ""
+msgstr "Переназначение пароля"
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
-msgstr ""
+msgstr "Воспользуйтесь следующей ссылкой для переназначения пароля: {link}"
#: lostpassword/templates/lostpassword.php:3
msgid "You will receive a link to reset your password via Email."
-msgstr ""
+msgstr "Вы получите ссылку для восстановления пароля по электронной почте."
#: lostpassword/templates/lostpassword.php:5
msgid "Requested"
-msgstr ""
+msgstr "Запрашиваемое"
#: lostpassword/templates/lostpassword.php:8
msgid "Login failed!"
-msgstr ""
+msgstr "Войти не удалось!"
#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
#: templates/login.php:9
msgid "Username"
-msgstr ""
+msgstr "Имя пользователя"
#: lostpassword/templates/lostpassword.php:15
msgid "Request reset"
-msgstr ""
+msgstr "Сброс запроса"
#: lostpassword/templates/resetpassword.php:4
msgid "Your password was reset"
-msgstr ""
+msgstr "Ваш пароль был переустановлен"
#: lostpassword/templates/resetpassword.php:5
msgid "To login page"
-msgstr ""
+msgstr "На страницу входа"
#: lostpassword/templates/resetpassword.php:8
msgid "New password"
-msgstr ""
+msgstr "Новый пароль"
#: lostpassword/templates/resetpassword.php:11
msgid "Reset password"
-msgstr ""
+msgstr "Переназначение пароля"
#: strings.php:5
msgid "Personal"
-msgstr ""
+msgstr "Персональный"
#: strings.php:6
msgid "Users"
-msgstr ""
+msgstr "Пользователи"
#: strings.php:7
msgid "Apps"
-msgstr ""
+msgstr "Приложения"
#: strings.php:8
msgid "Admin"
-msgstr ""
+msgstr "Администратор"
#: strings.php:9
msgid "Help"
-msgstr ""
+msgstr "Помощь"
#: templates/403.php:12
msgid "Access forbidden"
-msgstr ""
+msgstr "Доступ запрещен"
#: templates/404.php:12
msgid "Cloud not found"
-msgstr ""
+msgstr "Облако не найдено"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
-msgstr ""
+msgstr "Редактирование категорий"
#: templates/edit_categories_dialog.php:14
msgid "Add"
-msgstr ""
+msgstr "Добавить"
#: templates/installation.php:24
msgid "Create an <strong>admin account</strong>"
-msgstr ""
-
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr ""
+msgstr "Создать <strong>admin account</strong>"
#: templates/installation.php:36
msgid "Advanced"
-msgstr ""
+msgstr "Расширенный"
#: templates/installation.php:38
msgid "Data folder"
-msgstr ""
+msgstr "Папка данных"
#: templates/installation.php:45
msgid "Configure the database"
-msgstr ""
+msgstr "Настроить базу данных"
#: templates/installation.php:50 templates/installation.php:61
#: templates/installation.php:71 templates/installation.php:81
msgid "will be used"
-msgstr ""
+msgstr "будет использоваться"
#: templates/installation.php:93
msgid "Database user"
-msgstr ""
+msgstr "Пользователь базы данных"
#: templates/installation.php:97
msgid "Database password"
-msgstr ""
+msgstr "Пароль базы данных"
#: templates/installation.php:101
msgid "Database name"
-msgstr ""
+msgstr "Имя базы данных"
#: templates/installation.php:109
msgid "Database tablespace"
-msgstr ""
+msgstr "Табличная область базы данных"
#: templates/installation.php:115
msgid "Database host"
-msgstr ""
+msgstr "Сервер базы данных"
#: templates/installation.php:120
msgid "Finish setup"
-msgstr ""
+msgstr "Завершение настройки"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
-msgstr ""
+msgstr "веб-сервисы под Вашим контролем"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
-msgstr ""
+msgstr "Выйти"
#: templates/login.php:6
msgid "Lost your password?"
-msgstr ""
+msgstr "Забыли пароль?"
#: templates/login.php:17
msgid "remember"
-msgstr ""
+msgstr "запомнить"
#: templates/login.php:18
msgid "Log in"
-msgstr ""
+msgstr "Войти"
#: templates/logout.php:1
msgid "You are logged out."
-msgstr ""
+msgstr "Вы вышли из системы."
#: templates/part.pagenavi.php:3
msgid "prev"
-msgstr ""
+msgstr "предыдущий"
#: templates/part.pagenavi.php:20
msgid "next"
-msgstr ""
+msgstr "следующий"
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 3d22b6c9367..a5588cb5ea4 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
@@ -19,213 +20,233 @@ msgstr ""
#: ajax/upload.php:20
msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Ошибка отсутствует, файл загружен успешно."
#: ajax/upload.php:21
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Размер загруженного файла превышает заданный в директиве upload_max_filesize в php.ini"
#: ajax/upload.php:22
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr ""
+msgstr "Размер загруженного"
#: ajax/upload.php:23
msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Загружаемый файл был загружен частично"
#: ajax/upload.php:24
msgid "No file was uploaded"
-msgstr ""
+msgstr "Файл не был загружен"
#: ajax/upload.php:25
msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Отсутствует временная папка"
#: ajax/upload.php:26
msgid "Failed to write to disk"
-msgstr ""
+msgstr "Не удалось записать на диск"
#: appinfo/app.php:6
msgid "Files"
-msgstr ""
+msgstr "Файлы"
+
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Скрыть"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
+msgstr "Удалить"
+
+#: js/fileactions.js:182
+msgid "Rename"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
-msgstr ""
+msgstr "уже существует"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
-msgstr ""
+msgstr "отмена"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "подобрать название"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
-msgstr ""
+msgstr "отменить"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
-msgstr ""
+msgstr "заменено"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
-msgstr ""
+msgstr "отменить действие"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
-msgstr ""
+msgstr "с"
#: js/filelist.js:271
+msgid "unshared"
+msgstr "скрытый"
+
+#: js/filelist.js:273
msgid "deleted"
-msgstr ""
+msgstr "удалено"
#: js/files.js:179
msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "Создание ZIP-файла, это может занять некоторое время."
#: js/files.js:208
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией"
#: js/files.js:208
msgid "Upload Error"
-msgstr ""
+msgstr "Ошибка загрузки"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
-msgstr ""
+msgstr "Ожидающий решения"
#: js/files.js:355
msgid "Upload cancelled."
-msgstr ""
+msgstr "Загрузка отменена"
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
+msgstr "Неправильное имя, '/' не допускается."
+
+#: js/files.js:667
+msgid "files scanned"
msgstr ""
-#: js/files.js:746 templates/index.php:55
-msgid "Size"
+#: js/files.js:675
+msgid "error while scanning"
msgstr ""
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:749 templates/index.php:56
+msgid "Size"
+msgstr "Размер"
+
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
-msgstr ""
+msgstr "Изменен"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
-msgstr ""
+msgstr "папка"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
-msgstr ""
+msgstr "папки"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
-msgstr ""
+msgstr "файл"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
-msgstr ""
+msgstr "файлы"
#: templates/admin.php:5
msgid "File handling"
-msgstr ""
+msgstr "Работа с файлами"
#: templates/admin.php:7
msgid "Maximum upload size"
-msgstr ""
+msgstr "Максимальный размер загружаемого файла"
#: templates/admin.php:7
msgid "max. possible: "
-msgstr ""
+msgstr "Максимально возможный"
#: templates/admin.php:9
msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Необходимо для множественной загрузки."
#: templates/admin.php:9
msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Включение ZIP-загрузки"
#: templates/admin.php:11
msgid "0 is unlimited"
-msgstr ""
+msgstr "0 без ограничений"
#: templates/admin.php:12
msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Максимальный размер входящих ZIP-файлов "
#: templates/admin.php:14
msgid "Save"
-msgstr ""
+msgstr "Сохранить"
#: templates/index.php:7
msgid "New"
-msgstr ""
+msgstr "Новый"
#: templates/index.php:9
msgid "Text file"
-msgstr ""
+msgstr "Текстовый файл"
#: templates/index.php:10
msgid "Folder"
-msgstr ""
+msgstr "Папка"
#: templates/index.php:11
msgid "From url"
-msgstr ""
+msgstr "Из url"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
-msgstr ""
+msgstr "Загрузить "
#: templates/index.php:27
msgid "Cancel upload"
-msgstr ""
+msgstr "Отмена загрузки"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
-msgstr ""
+msgstr "Здесь ничего нет. Загрузите что-нибудь!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
-msgstr ""
+msgstr "Имя"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
-msgstr ""
+msgstr "Сделать общим"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
-msgstr ""
+msgstr "Загрузить"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
-msgstr ""
+msgstr "Загрузка слишком велика"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
-msgstr ""
+msgstr "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Файлы сканируются, пожалуйста, подождите."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
-msgstr ""
+msgstr "Текущее сканирование"
diff --git a/l10n/ru_RU/files_encryption.po b/l10n/ru_RU/files_encryption.po
index 852ced02fdc..11a61701141 100644
--- a/l10n/ru_RU/files_encryption.po
+++ b/l10n/ru_RU/files_encryption.po
@@ -3,32 +3,33 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-20 02:05+0200\n"
+"PO-Revision-Date: 2012-09-19 12:14+0000\n"
+"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
"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"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Шифрование"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Исключите следующие типы файлов из шифрования"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "Ни один"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "Включить шифрование"
diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po
index 8d869422275..225f0f78ffc 100644
--- a/l10n/ru_RU/files_external.po
+++ b/l10n/ru_RU/files_external.po
@@ -3,80 +3,81 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-20 02:05+0200\n"
+"PO-Revision-Date: 2012-09-19 13:11+0000\n"
+"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\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"
+"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 "External Storage"
-msgstr ""
+msgstr "Внешние системы хранения данных"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "Точка монтирования"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "Бэкэнд"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "Конфигурация"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "Опции"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "Применимый"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "Добавить точку монтирования"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "Не задан"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "Все пользователи"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "Группы"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "Пользователи"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "Удалить"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "Корневые сертификаты SSL"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Импортировать корневые сертификаты"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Включить пользовательскую внешнюю систему хранения данных"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Разрешить пользователям монтировать их собственную внешнюю систему хранения данных"
diff --git a/l10n/ru_RU/files_sharing.po b/l10n/ru_RU/files_sharing.po
index 5a793d15d3d..bb667a04c51 100644
--- a/l10n/ru_RU/files_sharing.po
+++ b/l10n/ru_RU/files_sharing.po
@@ -3,36 +3,47 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
+"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 ""
+msgstr "Пароль"
#: templates/authenticate.php:6
msgid "Submit"
+msgstr "Передать"
+
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
-msgid "Download"
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr "Загрузка"
+
+#: templates/public.php:29
msgid "No preview available for"
-msgstr ""
+msgstr "Предварительный просмотр недоступен"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
-msgstr ""
+msgstr "веб-сервисы под Вашим контролем"
diff --git a/l10n/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po
index f7ff8068c72..e8828a703fa 100644
--- a/l10n/ru_RU/files_versions.po
+++ b/l10n/ru_RU/files_versions.po
@@ -3,32 +3,41 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
-msgstr ""
+msgstr "Версии"
#: templates/settings-personal.php:7
msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Это приведет к удалению всех существующих версий резервной копии ваших файлов"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr ""
+msgid "Files Versioning"
+msgstr "Файлы управления версиями"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Включить"
diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po
index 9b7bced5422..006bcb62b0f 100644
--- a/l10n/ru_RU/lib.po
+++ b/l10n/ru_RU/lib.po
@@ -3,43 +3,44 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-20 02:05+0200\n"
+"PO-Revision-Date: 2012-09-19 12:09+0000\n"
+"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\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"
+"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:288
+#: app.php:285
msgid "Help"
-msgstr ""
+msgstr "Помощь"
-#: app.php:295
+#: app.php:292
msgid "Personal"
-msgstr ""
+msgstr "Персональный"
-#: app.php:300
+#: app.php:297
msgid "Settings"
-msgstr ""
+msgstr "Настройки"
-#: app.php:305
+#: app.php:302
msgid "Users"
-msgstr ""
+msgstr "Пользователи"
-#: app.php:312
+#: app.php:309
msgid "Apps"
-msgstr ""
+msgstr "Приложения"
-#: app.php:314
+#: app.php:311
msgid "Admin"
-msgstr ""
+msgstr "Админ"
#: files.php:280
msgid "ZIP download is turned off."
@@ -47,79 +48,79 @@ msgstr ""
#: files.php:281
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Файлы должны быть загружены один за другим."
#: files.php:281 files.php:306
msgid "Back to Files"
-msgstr ""
+msgstr "Обратно к файлам"
#: files.php:305
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Выбранные файлы слишком велики для генерации zip-архива."
#: json.php:28
msgid "Application is not enabled"
-msgstr ""
+msgstr "Приложение не запущено"
#: json.php:39 json.php:63 json.php:75
msgid "Authentication error"
-msgstr ""
+msgstr "Ошибка аутентификации"
#: json.php:51
msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Маркер истек. Пожалуйста, перезагрузите страницу."
-#: template.php:86
+#: template.php:87
msgid "seconds ago"
-msgstr ""
+msgstr "секунд назад"
-#: template.php:87
+#: template.php:88
msgid "1 minute ago"
-msgstr ""
+msgstr "1 минуту назад"
-#: template.php:88
+#: template.php:89
#, php-format
msgid "%d minutes ago"
-msgstr ""
+msgstr "%d минут назад"
-#: template.php:91
+#: template.php:92
msgid "today"
-msgstr ""
+msgstr "сегодня"
-#: template.php:92
+#: template.php:93
msgid "yesterday"
-msgstr ""
+msgstr "вчера"
-#: template.php:93
+#: template.php:94
#, php-format
msgid "%d days ago"
-msgstr ""
+msgstr "%d дней назад"
-#: template.php:94
+#: template.php:95
msgid "last month"
-msgstr ""
+msgstr "в прошлом месяце"
-#: template.php:95
+#: template.php:96
msgid "months ago"
-msgstr ""
+msgstr "месяц назад"
-#: template.php:96
+#: template.php:97
msgid "last year"
-msgstr ""
+msgstr "в прошлом году"
-#: template.php:97
+#: template.php:98
msgid "years ago"
-msgstr ""
+msgstr "год назад"
#: updater.php:66
#, php-format
msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s доступно. Получите <a href=\"%s\">more information</a>"
#: updater.php:68
msgid "up to date"
-msgstr ""
+msgstr "до настоящего времени"
#: updater.php:71
msgid "updates check is disabled"
-msgstr ""
+msgstr "Проверка обновлений отключена"
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index 210a41b0491..4a264d59aa4 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
@@ -19,82 +20,82 @@ msgstr ""
#: ajax/apps/ocs.php:23
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Невозможно загрузить список из App Store"
#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
#: ajax/togglegroups.php:15
msgid "Authentication error"
-msgstr ""
+msgstr "Ошибка авторизации"
#: ajax/creategroup.php:19
msgid "Group already exists"
-msgstr ""
+msgstr "Группа уже существует"
#: ajax/creategroup.php:28
msgid "Unable to add group"
-msgstr ""
+msgstr "Невозможно добавить группу"
+
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "Не удалось запустить приложение"
#: ajax/lostpassword.php:14
msgid "Email saved"
-msgstr ""
+msgstr "Email сохранен"
#: ajax/lostpassword.php:16
msgid "Invalid email"
-msgstr ""
+msgstr "Неверный email"
#: ajax/openid.php:16
msgid "OpenID Changed"
-msgstr ""
+msgstr "OpenID изменен"
#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
msgid "Invalid request"
-msgstr ""
+msgstr "Неверный запрос"
#: ajax/removegroup.php:16
msgid "Unable to delete group"
-msgstr ""
+msgstr "Невозможно удалить группу"
#: ajax/removeuser.php:22
msgid "Unable to delete user"
-msgstr ""
+msgstr "Невозможно удалить пользователя"
#: ajax/setlanguage.php:18
msgid "Language changed"
-msgstr ""
+msgstr "Язык изменен"
#: ajax/togglegroups.php:25
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Невозможно добавить пользователя в группу %s"
#: ajax/togglegroups.php:31
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
-
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
+msgstr "Невозможно удалить пользователя из группы %s"
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
-msgstr ""
+msgstr "Отключить"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
-msgstr ""
+msgstr "Включить"
#: js/personal.js:69
msgid "Saving..."
-msgstr ""
+msgstr "Сохранение"
#: personal.php:46 personal.php:47
msgid "__language_name__"
-msgstr ""
+msgstr "__язык_имя__"
#: templates/admin.php:14
msgid "Security Warning"
-msgstr ""
+msgstr "Предупреждение системы безопасности"
#: templates/admin.php:17
msgid ""
@@ -103,69 +104,73 @@ msgid ""
"strongly suggest that you configure your webserver in a way that the data "
"directory is no longer accessible or you move the data directory outside the"
" webserver document root."
-msgstr ""
+msgstr "Ваш каталог данных и файлы возможно доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить сервер таким образом, чтобы каталог данных был бы больше не доступен, или переместить каталог данных за пределы корневой папки веб-сервера."
#: templates/admin.php:31
msgid "Cron"
-msgstr ""
+msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr ""
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "Выполняйте одну задачу на каждой загружаемой странице"
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr ""
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php зарегистрирован в службе webcron. Обращайтесь к странице cron.php в корне owncloud раз в минуту по http."
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr ""
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "Используйте системный сервис cron. Исполняйте файл cron.php в папке owncloud с помощью системы cronjob раз в минуту."
-#: templates/admin.php:41
-msgid "Share API"
-msgstr ""
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Совместное использование"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
-msgstr ""
+msgstr "Включить разделяемые API"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Разрешить приложениям использовать Share API"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
-msgstr ""
+msgstr "Предоставить ссылки"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
-msgstr ""
+msgstr "Разрешить повторное совместное использование"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Разрешить пользователям разделение с кем-либо"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Разрешить пользователям разделение только с пользователями в их группах"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
-msgstr ""
+msgstr "Вход"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
-msgstr ""
+msgstr "Подробнее"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -173,144 +178,141 @@ 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 "Разработанный <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>."
#: templates/apps.php:10
msgid "Add your App"
-msgstr ""
+msgstr "Добавить Ваше приложение"
#: templates/apps.php:26
msgid "Select an App"
-msgstr ""
+msgstr "Выбрать приложение"
#: templates/apps.php:29
msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Обратитесь к странице приложений на apps.owncloud.com"
#: templates/apps.php:30
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
#: templates/help.php:9
msgid "Documentation"
-msgstr ""
+msgstr "Документация"
#: templates/help.php:10
msgid "Managing Big Files"
-msgstr ""
+msgstr "Управление большими файлами"
#: templates/help.php:11
msgid "Ask a question"
-msgstr ""
+msgstr "Задать вопрос"
#: templates/help.php:23
msgid "Problems connecting to help database."
-msgstr ""
+msgstr "Проблемы, связанные с разделом Помощь базы данных"
#: templates/help.php:24
msgid "Go there manually."
-msgstr ""
+msgstr "Сделать вручную."
#: templates/help.php:32
msgid "Answer"
-msgstr ""
-
-#: templates/personal.php:8
-msgid "You use"
-msgstr ""
+msgstr "Ответ"
#: templates/personal.php:8
-msgid "of the available"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
+msgstr "Клиенты синхронизации настольной и мобильной систем"
#: templates/personal.php:13
msgid "Download"
-msgstr ""
+msgstr "Загрузка"
#: templates/personal.php:19
-msgid "Your password got changed"
+msgid "Your password was changed"
msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
-msgstr ""
+msgstr "Невозможно изменить Ваш пароль"
#: templates/personal.php:21
msgid "Current password"
-msgstr ""
+msgstr "Текущий пароль"
#: templates/personal.php:22
msgid "New password"
-msgstr ""
+msgstr "Новый пароль"
#: templates/personal.php:23
msgid "show"
-msgstr ""
+msgstr "показать"
#: templates/personal.php:24
msgid "Change password"
-msgstr ""
+msgstr "Изменить пароль"
#: templates/personal.php:30
msgid "Email"
-msgstr ""
+msgstr "Электронная почта"
#: templates/personal.php:31
msgid "Your email address"
-msgstr ""
+msgstr "Адрес Вашей электронной почты"
#: templates/personal.php:32
msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Введите адрес электронной почты для возможности восстановления пароля"
#: templates/personal.php:38 templates/personal.php:39
msgid "Language"
-msgstr ""
+msgstr "Язык"
#: templates/personal.php:44
msgid "Help translate"
-msgstr ""
+msgstr "Помогите перевести"
#: templates/personal.php:51
msgid "use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "Используйте этот адрес для соединения с Вашим ownCloud в файловом менеджере"
#: templates/users.php:21 templates/users.php:76
msgid "Name"
-msgstr ""
+msgstr "Имя"
#: templates/users.php:23 templates/users.php:77
msgid "Password"
-msgstr ""
+msgstr "Пароль"
#: templates/users.php:26 templates/users.php:78 templates/users.php:98
msgid "Groups"
-msgstr ""
+msgstr "Группы"
#: templates/users.php:32
msgid "Create"
-msgstr ""
+msgstr "Создать"
#: templates/users.php:35
msgid "Default Quota"
-msgstr ""
+msgstr "Квота по умолчанию"
#: templates/users.php:55 templates/users.php:138
msgid "Other"
-msgstr ""
+msgstr "Другой"
#: templates/users.php:80 templates/users.php:112
msgid "Group Admin"
-msgstr ""
+msgstr "Группа Admin"
#: templates/users.php:82
msgid "Quota"
-msgstr ""
+msgstr "квота"
#: templates/users.php:146
msgid "Delete"
-msgstr ""
+msgstr "Удалить"
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index 13c174b7807..72760a3543d 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.po
@@ -3,32 +3,33 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <cdewqazxsqwe@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 12:37+0000\n"
+"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\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"
+"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:8
msgid "Host"
-msgstr ""
+msgstr "Хост"
#: templates/settings.php:8
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://"
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "База DN"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
@@ -36,7 +37,7 @@ msgstr ""
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "DN пользователя"
#: templates/settings.php:10
msgid ""
@@ -47,11 +48,11 @@ msgstr ""
#: templates/settings.php:11
msgid "Password"
-msgstr ""
+msgstr "Пароль"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Для анонимного доступа оставьте поля DN и пароль пустыми."
#: templates/settings.php:12
msgid "User Login Filter"
@@ -67,7 +68,7 @@ msgstr ""
#: templates/settings.php:12
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "используйте %%uid заполнитель, например, \"uid=%%uid\""
#: templates/settings.php:13
msgid "User List Filter"
@@ -79,11 +80,11 @@ msgstr ""
#: templates/settings.php:13
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "без каких-либо заполнителей, например, \"objectClass=person\"."
#: templates/settings.php:14
msgid "Group Filter"
-msgstr ""
+msgstr "Групповой фильтр"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
@@ -91,11 +92,11 @@ msgstr ""
#: templates/settings.php:14
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "без каких-либо заполнителей, например, \"objectClass=posixGroup\"."
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "Порт"
#: templates/settings.php:18
msgid "Base User Tree"
@@ -111,11 +112,11 @@ msgstr ""
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "Использовать TLS"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Не используйте это SSL-соединений, это не будет выполнено."
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
@@ -123,7 +124,7 @@ msgstr ""
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Выключить проверку сертификата SSL."
#: templates/settings.php:23
msgid ""
@@ -133,7 +134,7 @@ msgstr ""
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Не рекомендовано, используйте только для тестирования."
#: templates/settings.php:24
msgid "User Display Name Field"
@@ -141,7 +142,7 @@ msgstr ""
#: templates/settings.php:24
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "Атрибут LDAP, используемый для создания имени пользователя в ownCloud."
#: templates/settings.php:25
msgid "Group Display Name Field"
@@ -149,11 +150,11 @@ msgstr ""
#: templates/settings.php:25
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "Атрибут LDAP, используемый для создания группового имени в ownCloud."
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "в байтах"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
@@ -163,8 +164,8 @@ msgstr ""
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
-msgstr ""
+msgstr "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут."
#: templates/settings.php:32
msgid "Help"
-msgstr ""
+msgstr "Помощь"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index bcdf41a7d2e..df6f75057f6 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -4,13 +4,14 @@
#
# Translators:
# <intense.feel@gmail.com>, 2011, 2012.
+# <martin.babik@gmail.com>, 2012.
# Roman Priesol <roman@priesol.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -31,58 +32,62 @@ msgstr "Žiadna kategória pre pridanie?"
msgid "This category already exists: "
msgstr "Táto kategória už existuje:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Nastavenia"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Január"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Február"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Marec"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Apríl"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Máj"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Jún"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Júl"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "August"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "September"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Október"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "November"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "December"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Zrušiť"
@@ -103,10 +108,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Neboli vybrané žiadne kategórie pre odstránenie."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Chyba"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Heslo"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Obnovenie hesla pre ownCloud"
@@ -178,7 +283,7 @@ msgstr "Prístup odmietnutý"
#: templates/404.php:12
msgid "Cloud not found"
-msgstr "Nedokážem nájsť"
+msgstr "Nenájdené"
#: templates/edit_categories_dialog.php:4
msgid "Edit categories"
@@ -192,10 +297,6 @@ msgstr "Pridať"
msgid "Create an <strong>admin account</strong>"
msgstr "Vytvoriť <strong>administrátorský účet</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Heslo"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Pokročilé"
@@ -237,11 +338,11 @@ msgstr "Server databázy"
msgid "Finish setup"
msgstr "Dokončiť inštaláciu"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "webové služby pod vašou kontrolou"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Odhlásiť"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index e47f0b00883..437b7614a3f 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -4,13 +4,14 @@
#
# Translators:
# <intense.feel@gmail.com>, 2012.
+# <martin.babik@gmail.com>, 2012.
# Roman Priesol <roman@priesol.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -53,41 +54,53 @@ msgstr "Zápis na disk sa nepodaril"
msgid "Files"
msgstr "Súbory"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Nezdielať"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Odstrániť"
-#: js/filelist.js:186 js/filelist.js:188
-msgid "already exists"
+#: js/fileactions.js:182
+msgid "Rename"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
+msgid "already exists"
+msgstr "už existuje"
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
-msgstr ""
+msgstr "nahradiť"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "pomôcť s menom"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
-msgstr ""
+msgstr "zrušiť"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
-msgstr ""
+msgstr "zmenené"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
-msgstr ""
+msgstr "vrátiť"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
-msgstr ""
+msgstr "s"
#: js/filelist.js:271
+msgid "unshared"
+msgstr "zdielané"
+
+#: js/filelist.js:273
msgid "deleted"
-msgstr ""
+msgstr "zmazané"
#: js/files.js:179
msgid "generating ZIP-file, it may take some time."
@@ -101,7 +114,7 @@ msgstr "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov."
msgid "Upload Error"
msgstr "Chyba nahrávania"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Čaká sa"
@@ -109,36 +122,44 @@ msgstr "Čaká sa"
msgid "Upload cancelled."
msgstr "Nahrávanie zrušené"
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Chybný názov, \"/\" nie je povolené"
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr "skontrolovaných súborov"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "chyba počas kontroly"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Veľkosť"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Upravené"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "priečinok"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "priečinky"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "súbor"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "súbory"
@@ -148,7 +169,7 @@ msgstr "Nastavenie správanie k súborom"
#: templates/admin.php:7
msgid "Maximum upload size"
-msgstr "Maximálna veľkosť nahratia"
+msgstr "Maximálna veľkosť odosielaného súboru"
#: templates/admin.php:7
msgid "max. possible: "
@@ -172,7 +193,7 @@ msgstr "Najväčšia veľkosť ZIP súborov"
#: templates/admin.php:14
msgid "Save"
-msgstr ""
+msgstr "Uložiť"
#: templates/index.php:7
msgid "New"
@@ -190,7 +211,7 @@ msgstr "Priečinok"
msgid "From url"
msgstr "Z url"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Nahrať"
@@ -198,36 +219,36 @@ msgstr "Nahrať"
msgid "Cancel upload"
msgstr "Zrušiť odosielanie"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
-msgstr "Nič tu nie je. Nahrajte niečo!"
+msgstr "Žiadny súbor. Nahrajte niečo!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Meno"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Zdielať"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Stiahnuť"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
-msgstr "Nahrávanie príliš veľké"
+msgstr "Odosielaný súbor je príliš veľký"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Súbory ktoré sa snažíte nahrať presahujú maximálnu veľkosť pre nahratie súborov na tento server."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Súbory sa práve prehľadávajú, prosím čakajte."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Práve prehliadané"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index d28ae49cf74..86f025ad218 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/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: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 17:47+0000\n"
-"Last-Translator: intense <intense.feel@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
@@ -26,14 +26,24 @@ msgstr "Heslo"
msgid "Submit"
msgstr "Odoslať"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "Stiahnuť"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "Žiaden náhľad k dispozícii pre"
-#: templates/public.php:25
+#: templates/public.php:37
msgid "web services under your control"
msgstr "webové služby pod Vašou kontrolou"
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
index 0f50826d2b2..437e9d5d35c 100644
--- a/l10n/sk_SK/files_versions.po
+++ b/l10n/sk_SK/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: sk_SK\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index b4ffed65379..1a98bd0de2a 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -3,113 +3,114 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <martin.babik@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 11:28+0000\n"
+"Last-Translator: martinb <martin.babik@gmail.com>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sk_SK\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: app.php:288
+#: app.php:285
msgid "Help"
-msgstr ""
+msgstr "Pomoc"
-#: app.php:295
+#: app.php:292
msgid "Personal"
-msgstr ""
+msgstr "Osobné"
-#: app.php:300
+#: app.php:297
msgid "Settings"
-msgstr ""
+msgstr "Nastavenia"
-#: app.php:305
+#: app.php:302
msgid "Users"
-msgstr ""
+msgstr "Užívatelia"
-#: app.php:312
+#: app.php:309
msgid "Apps"
-msgstr ""
+msgstr "Aplikácie"
-#: app.php:314
+#: app.php:311
msgid "Admin"
-msgstr ""
+msgstr "Správca"
-#: files.php:280
+#: files.php:309
msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Sťahovanie súborov ZIP je vypnuté."
-#: files.php:281
+#: files.php:310
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Súbory musia byť nahrávané jeden za druhým."
-#: files.php:281 files.php:306
+#: files.php:310 files.php:335
msgid "Back to Files"
-msgstr ""
+msgstr "Späť na súbory"
-#: files.php:305
+#: files.php:334
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Zvolené súbory sú príliž veľké na vygenerovanie zip súboru."
#: json.php:28
msgid "Application is not enabled"
-msgstr ""
+msgstr "Aplikácia nie je zapnutá"
#: json.php:39 json.php:63 json.php:75
msgid "Authentication error"
-msgstr ""
+msgstr "Chyba autentifikácie"
#: json.php:51
msgid "Token expired. Please reload page."
msgstr ""
-#: template.php:86
+#: template.php:87
msgid "seconds ago"
msgstr ""
-#: template.php:87
+#: template.php:88
msgid "1 minute ago"
-msgstr ""
+msgstr "pred 1 minútou"
-#: template.php:88
+#: template.php:89
#, php-format
msgid "%d minutes ago"
-msgstr ""
+msgstr "pred %d minútami"
-#: template.php:91
+#: template.php:92
msgid "today"
-msgstr ""
+msgstr "dnes"
-#: template.php:92
+#: template.php:93
msgid "yesterday"
-msgstr ""
+msgstr "včera"
-#: template.php:93
+#: template.php:94
#, php-format
msgid "%d days ago"
-msgstr ""
+msgstr "pred %d dňami"
-#: template.php:94
+#: template.php:95
msgid "last month"
-msgstr ""
+msgstr "minulý mesiac"
-#: template.php:95
+#: template.php:96
msgid "months ago"
-msgstr ""
+msgstr "pred mesiacmi"
-#: template.php:96
+#: template.php:97
msgid "last year"
-msgstr ""
+msgstr "minulý rok"
-#: template.php:97
+#: template.php:98
msgid "years ago"
-msgstr ""
+msgstr "pred rokmi"
#: updater.php:66
#, php-format
@@ -118,8 +119,8 @@ msgstr ""
#: updater.php:68
msgid "up to date"
-msgstr ""
+msgstr "aktuálny"
#: updater.php:71
msgid "updates check is disabled"
-msgstr ""
+msgstr "sledovanie aktualizácií je vypnuté"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 952da745483..2089e7b7c5d 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -4,15 +4,16 @@
#
# Translators:
# <intense.feel@gmail.com>, 2011, 2012.
+# <martin.babik@gmail.com>, 2012.
# Roman Priesol <roman@priesol.net>, 2012.
# <typhoon@zoznam.sk>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 10:33+0000\n"
+"Last-Translator: martinb <martin.babik@gmail.com>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,20 +23,24 @@ msgstr ""
#: ajax/apps/ocs.php:23
msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Nie je možné nahrať zoznam z App Store"
#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
#: ajax/togglegroups.php:15
msgid "Authentication error"
-msgstr ""
+msgstr "Chyba pri autentifikácii"
#: ajax/creategroup.php:19
msgid "Group already exists"
-msgstr ""
+msgstr "Skupina už existuje"
#: ajax/creategroup.php:28
msgid "Unable to add group"
-msgstr ""
+msgstr "Nie je možné pridať skupinu"
+
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "Nie je možné zapnúť aplikáciu."
#: ajax/lostpassword.php:14
msgid "Email saved"
@@ -55,11 +60,11 @@ msgstr "Neplatná požiadavka"
#: ajax/removegroup.php:16
msgid "Unable to delete group"
-msgstr ""
+msgstr "Nie je možné zmazať skupinu"
#: ajax/removeuser.php:22
msgid "Unable to delete user"
-msgstr ""
+msgstr "Nie je možné zmazať užívateľa"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -68,22 +73,18 @@ msgstr "Jazyk zmenený"
#: ajax/togglegroups.php:25
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Nie je možné pridať užívateľa do skupiny %s"
#: ajax/togglegroups.php:31
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Nie je možné zmazať užívateľa zo skupiny %s"
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Zakázať"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Povoliť"
@@ -97,7 +98,7 @@ msgstr "Slovensky"
#: templates/admin.php:14
msgid "Security Warning"
-msgstr ""
+msgstr "Bezpečnostné varovanie"
#: templates/admin.php:17
msgid ""
@@ -112,63 +113,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
-msgstr ""
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Zdieľanie"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
-msgstr ""
+msgstr "Zapnúť API zdieľania"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Povoliť aplikáciam používať API pre zdieľanie"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
-msgstr ""
+msgstr "Povoliť odkazy"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Povoliť užívateľom zdieľať obsah pomocou verejných odkazov"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
-msgstr ""
+msgstr "Povoliť opakované zdieľanie"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Povoliť užívateľom zdieľať s každým"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Povoliť užívateľom zdieľanie iba s užívateľmi ich vlastnej skupiny"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Záznam"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Viac"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -192,7 +197,7 @@ msgstr "Pozrite si stránku aplikácie na apps.owncloud.com"
#: templates/apps.php:30
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>"
#: templates/help.php:9
msgid "Documentation"
@@ -219,12 +224,9 @@ msgid "Answer"
msgstr "Odpoveď"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Používate"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "z dostupných"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "Použili ste <strong>%s</strong> dostupného <strong>%s<strong>"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -235,8 +237,8 @@ msgid "Download"
msgstr "Stiahnúť"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Vaše heslo sa zmenilo"
+msgid "Your password was changed"
+msgstr "Heslo bolo zmenené"
#: templates/personal.php:20
msgid "Unable to change your password"
@@ -308,7 +310,7 @@ msgstr "Iné"
#: templates/users.php:80 templates/users.php:112
msgid "Group Admin"
-msgstr ""
+msgstr "Správca skupiny"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 66b5310397f..933feb62071 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -32,58 +32,62 @@ msgstr "Ni kategorije za dodajanje?"
msgid "This category already exists: "
msgstr "Ta kategorija že obstaja:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Nastavitve"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "januar"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "februar"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "marec"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "april"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "maj"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "junij"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "julij"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "avgust"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "september"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "oktober"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "november"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "december"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Prekliči"
@@ -104,10 +108,110 @@ msgstr "V redu"
msgid "No categories selected for deletion."
msgstr "Za izbris ni bila izbrana nobena kategorija."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Napaka"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Geslo"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Ponastavitev gesla ownCloud"
@@ -193,10 +297,6 @@ msgstr "Dodaj"
msgid "Create an <strong>admin account</strong>"
msgstr "Ustvari <strong>skrbniški račun</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Geslo"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Napredne možnosti"
@@ -238,11 +338,11 @@ msgstr "Gostitelj podatkovne zbirke"
msgid "Finish setup"
msgstr "Dokončaj namestitev"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "spletne storitve pod vašim nadzorom"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Odjava"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index af1cffc01a8..e20cbd0fdcd 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 05:16+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"Last-Translator: I Robot <thomas.mueller@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"
@@ -54,39 +54,51 @@ msgstr "Pisanje na disk je spodletelo"
msgid "Files"
msgstr "Datoteke"
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Odstrani iz souporabe"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Izbriši"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "že obstaja"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "nadomesti"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr "predlagaj ime"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "ekliči"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "nadomeščen"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "razveljavi"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "z"
-#: js/filelist.js:266
+#: js/filelist.js:271
+msgid "unshared"
+msgstr "odstranjeno iz souporabe"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "izbrisano"
@@ -102,7 +114,7 @@ msgstr "Nalaganje ni mogoče, saj gre za mapo, ali pa ima datoteka velikost 0 ba
msgid "Upload Error"
msgstr "Napaka pri nalaganju"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Na čakanju"
@@ -110,36 +122,44 @@ msgstr "Na čakanju"
msgid "Upload cancelled."
msgstr "Nalaganje je bilo preklicano."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Nalaganje datoteke je v teku. Če zapustite to stran zdaj, boste nalaganje preklicali."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Neveljavno ime. Znak '/' ni dovoljen."
-#: js/files.js:746 templates/index.php:56
+#: js/files.js:667
+msgid "files scanned"
+msgstr "pregledanih datotek"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "napaka med pregledovanjem datotek"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Velikost"
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Spremenjeno"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "mapa"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "mape"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "datoteka"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "datoteke"
@@ -191,7 +211,7 @@ msgstr "Mapa"
msgid "From url"
msgstr "Iz url naslova"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Naloži"
@@ -215,20 +235,20 @@ msgstr "Souporaba"
msgid "Download"
msgstr "Prenesi"
-#: templates/index.php:65
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Nalaganje ni mogoče, ker je preveliko"
-#: templates/index.php:67
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Datoteke, ki jih želite naložiti, presegajo največjo dovoljeno velikost na tem strežniku."
-#: templates/index.php:72
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Preiskujem datoteke, prosimo počakajte."
-#: templates/index.php:75
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Trenutno preiskujem"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 54b84f8ba13..3003e48ccd2 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 14:15+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -26,14 +26,24 @@ msgstr "Geslo"
msgid "Submit"
msgstr "Pošlji"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "Prenesi"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "Predogled ni na voljo za"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr "spletne storitve pod vašim nadzorom"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index d37dc15d09e..ec3807cf82b 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.po
@@ -8,20 +8,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-03 02:04+0200\n"
-"PO-Revision-Date: 2012-09-02 02:04+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "Zastaraj vse različice"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "Različice"
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "To bo izbrisalo vse obstoječe različice varnostnih kopij vaših datotek"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Omogoči sledenje različicam datotek"
+msgid "Files Versioning"
+msgstr "Sledenje različicam"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Omogoči"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index c94a108ee3d..cc9b69f3a92 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -8,37 +8,37 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 09:04+0000\n"
+"POT-Creation-Date: 2012-09-15 02:02+0200\n"
+"PO-Revision-Date: 2012-09-14 08:53+0000\n"
"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\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"
"Content-Transfer-Encoding: 8bit\n"
"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: app.php:288
+#: app.php:285
msgid "Help"
msgstr "Pomoč"
-#: app.php:295
+#: app.php:292
msgid "Personal"
msgstr "Osebno"
-#: app.php:300
+#: app.php:297
msgid "Settings"
msgstr "Nastavitve"
-#: app.php:305
+#: app.php:302
msgid "Users"
msgstr "Uporabniki"
-#: app.php:312
+#: app.php:309
msgid "Apps"
msgstr "Aplikacije"
-#: app.php:314
+#: app.php:311
msgid "Admin"
msgstr "Skrbnik"
@@ -70,47 +70,47 @@ msgstr "Napaka overitve"
msgid "Token expired. Please reload page."
msgstr "Žeton je potekel. Prosimo, če spletno stran znova naložite."
-#: template.php:86
+#: template.php:87
msgid "seconds ago"
-msgstr "sekund nazaj"
+msgstr "pred nekaj sekundami"
-#: template.php:87
+#: template.php:88
msgid "1 minute ago"
msgstr "pred minuto"
-#: template.php:88
+#: template.php:89
#, php-format
msgid "%d minutes ago"
msgstr "pred %d minutami"
-#: template.php:91
+#: template.php:92
msgid "today"
msgstr "danes"
-#: template.php:92
+#: template.php:93
msgid "yesterday"
msgstr "včeraj"
-#: template.php:93
+#: template.php:94
#, php-format
msgid "%d days ago"
msgstr "pred %d dnevi"
-#: template.php:94
+#: template.php:95
msgid "last month"
msgstr "prejšnji mesec"
-#: template.php:95
+#: template.php:96
msgid "months ago"
-msgstr "mesecev nazaj"
+msgstr "pred nekaj meseci"
-#: template.php:96
+#: template.php:97
msgid "last year"
msgstr "lani"
-#: template.php:97
+#: template.php:98
msgid "years ago"
-msgstr "let nazaj"
+msgstr "pred nekaj leti"
#: updater.php:66
#, php-format
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index bd1e022b7d6..6ac9bae10fd 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 06:02+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@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"
@@ -37,6 +37,10 @@ msgstr "Skupina že obstaja"
msgid "Unable to add group"
msgstr "Ni mogoče dodati skupine"
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "Aplikacije ni bilo mogoče omogočiti."
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "E-poštni naslov je bil shranjen"
@@ -75,15 +79,11 @@ msgstr "Uporabnika ni mogoče dodati k skupini %s"
msgid "Unable to remove user from group %s"
msgstr "Uporabnika ni mogoče odstraniti iz skupine %s"
-#: js/apps.js:18
-msgid "Error"
-msgstr "Napaka"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Onemogoči"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Omogoči"
@@ -112,63 +112,67 @@ msgstr "Vaša mapa data in vaše datoteke so verjetno vsem dostopne preko intern
msgid "Cron"
msgstr "Periodično opravilo"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "izvedi eno nalogo z vsako naloženo stranjo"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "Izvede eno opravilo z vsako naloženo stranjo."
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php je vpisan na storitev webcron"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "Datoteka cron.php je prijavljena pri enem od spletnih servisov za periodična opravila. Preko protokola http pokličite datoteko cron.php, ki se nahaja v ownCloud korenski mapi, enkrat na minuto."
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "uporabi sistemski servis za periodična opravila"
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "Uporabi sistemski servis za periodična opravila. Preko sistemskega servisa pokličite datoteko cron.php, ki se nahaja v ownCloud korenski mapi, enkrat na minuto."
-#: templates/admin.php:41
-msgid "Share API"
-msgstr "API souporabe"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Souporaba"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Omogoči API souporabe"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
-msgstr "Dovoli aplikacijam uporabo API-ja souporabe"
+msgstr "Aplikacijam dovoli uporabo API-ja souporabe"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "Dovoli povezave"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr "Uporabnikom dovoli souporabo z javnimi povezavami"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "Dovoli nadaljnjo souporabo"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr "Uporabnikom dovoli nadaljnjo souporabo"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "Uporabnikom dovoli souporabo s komerkoli"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr "Uporabnikom dovoli souporabo le znotraj njihove skupine"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Dnevnik"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Več"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -176,7 +180,7 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr "Razvit s strani <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnosti ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je izdana pod licenco <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
+msgstr "Razvija ga <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud skupnost</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je izdana pod licenco <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
#: templates/apps.php:10
msgid "Add your App"
@@ -219,12 +223,9 @@ msgid "Answer"
msgstr "Odgovor"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Uporabljate"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "od razpoložljivih"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -235,8 +236,8 @@ msgid "Download"
msgstr "Prenesi"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Vaše geslo je bilo spremenjeno"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/so/core.po b/l10n/so/core.po
index f34edceab57..83743d07164 100644
--- a/l10n/so/core.po
+++ b/l10n/so/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
"MIME-Version: 1.0\n"
@@ -29,58 +29,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -101,10 +105,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -190,10 +294,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr ""
-
#: templates/installation.php:36
msgid "Advanced"
msgstr ""
@@ -235,11 +335,11 @@ msgstr ""
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr ""
diff --git a/l10n/so/files.po b/l10n/so/files.po
index a00a9a156cb..56d0c680464 100644
--- a/l10n/so/files.po
+++ b/l10n/so/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
"MIME-Version: 1.0\n"
@@ -51,39 +51,51 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -99,7 +111,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -107,36 +119,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr ""
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr ""
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -188,7 +208,7 @@ msgstr ""
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr ""
@@ -196,36 +216,36 @@ msgstr ""
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr ""
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr ""
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr ""
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/so/files_sharing.po b/l10n/so/files_sharing.po
index dbbd4da2842..ff0fc169de1 100644
--- a/l10n/so/files_sharing.po
+++ b/l10n/so/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: so\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/so/files_versions.po b/l10n/so/files_versions.po
index ce768ee5ce5..6be7c168847 100644
--- a/l10n/so/files_versions.po
+++ b/l10n/so/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: so\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index 8ed5f9eb221..d8823a9d17b 100644
--- a/l10n/so/settings.po
+++ b/l10n/so/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
"MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -72,15 +76,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -109,63 +109,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -216,11 +220,8 @@ msgid "Answer"
msgstr ""
#: templates/personal.php:8
-msgid "You use"
-msgstr ""
-
-#: templates/personal.php:8
-msgid "of the available"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
msgstr ""
#: templates/personal.php:12
@@ -232,7 +233,7 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
+msgid "Your password was changed"
msgstr ""
#: templates/personal.php:20
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 2e4f99fe345..b7bf53c473e 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -30,58 +30,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Подешавања"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -102,10 +106,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Лозинка"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -191,10 +295,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Направи <strong>административни налог</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Лозинка"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Напредно"
@@ -236,11 +336,11 @@ msgstr "Домаћин базе"
msgid "Finish setup"
msgstr "Заврши подешавање"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "веб сервиси под контролом"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Одјава"
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 8dac0a42647..9448d408c2f 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -52,39 +52,51 @@ msgstr ""
msgid "Files"
msgstr "Фајлови"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Обриши"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -100,7 +112,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -108,36 +120,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Величина"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Задња измена"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -189,7 +209,7 @@ msgstr "фасцикла"
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Пошаљи"
@@ -197,36 +217,36 @@ msgstr "Пошаљи"
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Овде нема ничег. Пошаљите нешто!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Име"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Преузми"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Пошиљка је превелика"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Фајлови које желите да пошаљете превазилазе ограничење максималне величине пошиљке на овом серверу."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index c1bbe16e939..36c9d0ac467 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"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"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/sr/files_versions.po b/l10n/sr/files_versions.po
index b252793ef85..592163313fc 100644
--- a/l10n/sr/files_versions.po
+++ b/l10n/sr/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index bccf5024d34..3117b26d3d5 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -35,6 +35,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -73,15 +77,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -110,63 +110,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,12 +221,9 @@ msgid "Answer"
msgstr "Одговор"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Користите"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "од доступних"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -233,8 +234,8 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Ваша лозинка је измењена"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index c3541b058aa..9af762b5fef 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -30,58 +30,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Podešavanja"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -102,10 +106,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Lozinka"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -191,10 +295,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr "Napravi <strong>administrativni nalog</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Lozinka"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Napredno"
@@ -236,11 +336,11 @@ msgstr "Domaćin baze"
msgid "Finish setup"
msgstr "Završi podešavanje"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Odjava"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index e52820431ed..8de8f62c456 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -52,39 +52,51 @@ msgstr ""
msgid "Files"
msgstr "Fajlovi"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Obriši"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -100,7 +112,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -108,36 +120,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Veličina"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Zadnja izmena"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -189,7 +209,7 @@ msgstr ""
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Pošalji"
@@ -197,36 +217,36 @@ msgstr "Pošalji"
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Ovde nema ničeg. Pošaljite nešto!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Ime"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Preuzmi"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Pošiljka je prevelika"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 7536a9cba88..cd27899cfcb 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/sr@latin/files_versions.po b/l10n/sr@latin/files_versions.po
index 23dcd430988..1f2db94b8ad 100644
--- a/l10n/sr@latin/files_versions.po
+++ b/l10n/sr@latin/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 4e8ca925401..bff5fcab498 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -35,6 +35,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -73,15 +77,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -110,63 +110,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,12 +221,9 @@ msgid "Answer"
msgstr "Odgovor"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Koristite"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "od dostupnih"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -233,8 +234,8 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Vaša lozinka je izmenjena"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 57ad5c15e41..78730893557 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -35,58 +35,62 @@ msgstr "Ingen kategori att lägga till?"
msgid "This category already exists: "
msgstr "Denna kategori finns redan:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Inställningar"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Januari"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Februari"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Mars"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "April"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Maj"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Juni"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Juli"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Augusti"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "September"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Oktober"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "November"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "December"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Avbryt"
@@ -107,10 +111,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Inga kategorier valda för radering."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Fel"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Lösenord"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ownCloud lösenordsåterställning"
@@ -196,10 +300,6 @@ msgstr "Lägg till"
msgid "Create an <strong>admin account</strong>"
msgstr "Skapa ett <strong>administratörskonto</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Lösenord"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Avancerat"
@@ -241,11 +341,11 @@ msgstr "Databasserver"
msgid "Finish setup"
msgstr "Avsluta installation"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "webbtjänster under din kontroll"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Logga ut"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 81ea65ce488..5a27a5de8bb 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 13:34+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"Last-Translator: I Robot <thomas.mueller@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"
@@ -57,39 +57,51 @@ msgstr "Misslyckades spara till disk"
msgid "Files"
msgstr "Filer"
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Sluta dela"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Radera"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "finns redan"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "ersätt"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr "föreslå namn"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "avbryt"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "ersatt"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "ångra"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "med"
-#: js/filelist.js:266
+#: js/filelist.js:271
+msgid "unshared"
+msgstr "Ej delad"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "raderad"
@@ -105,7 +117,7 @@ msgstr "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller
msgid "Upload Error"
msgstr "Uppladdningsfel"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Väntar"
@@ -113,36 +125,44 @@ msgstr "Väntar"
msgid "Upload cancelled."
msgstr "Uppladdning avbruten."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Ogiltigt namn, '/' är inte tillåten."
-#: js/files.js:746 templates/index.php:56
+#: js/files.js:667
+msgid "files scanned"
+msgstr "filer skannade"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "fel vid skanning"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Storlek"
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Ändrad"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "mapp"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "mappar"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "fil"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "filer"
@@ -194,7 +214,7 @@ msgstr "Mapp"
msgid "From url"
msgstr "Från webbadress"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Ladda upp"
@@ -218,20 +238,20 @@ msgstr "Dela"
msgid "Download"
msgstr "Ladda ner"
-#: templates/index.php:65
+#: templates/index.php:75
msgid "Upload too large"
msgstr "För stor uppladdning"
-#: templates/index.php:67
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern."
-#: templates/index.php:72
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Filer skannas, var god vänta"
-#: templates/index.php:75
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Aktuell skanning"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 1888512788b..14ceb3bf5d5 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 08:24+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -26,14 +26,24 @@ msgstr "Lösenord"
msgid "Submit"
msgstr "Skicka"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "Ladda ner"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "Ingen förhandsgranskning tillgänglig för"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr "webbtjänster under din kontroll"
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
index 29af9f4e970..34745cd24fe 100644
--- a/l10n/sv/files_versions.po
+++ b/l10n/sv/files_versions.po
@@ -8,20 +8,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-03 02:04+0200\n"
-"PO-Revision-Date: 2012-09-02 09:50+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "Upphör alla versioner"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "Versioner"
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "Detta kommer att radera alla befintliga säkerhetskopior av dina filer"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "Aktivera versionshantering"
+msgid "Files Versioning"
+msgstr "Versionshantering av filer"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "Aktivera"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index f93b1f0f3c7..5cdb2f9b2eb 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 06:05+0000\n"
+"POT-Creation-Date: 2012-09-20 02:05+0200\n"
+"PO-Revision-Date: 2012-09-19 05:59+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"
@@ -41,6 +41,10 @@ msgstr "Gruppen finns redan"
msgid "Unable to add group"
msgstr "Kan inte lägga till grupp"
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "Kunde inte aktivera appen."
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "E-post sparad"
@@ -79,15 +83,11 @@ msgstr "Kan inte lägga till användare i gruppen %s"
msgid "Unable to remove user from group %s"
msgstr "Kan inte radera användare från gruppen %s"
-#: js/apps.js:18
-msgid "Error"
-msgstr "Fel"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Deaktivera"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Aktivera"
@@ -116,63 +116,67 @@ msgstr "Din datamapp och dina filer kan möjligen vara nåbara från internet. F
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "utför en uppgift vid varje sidladdning"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "Exekvera en uppgift vid varje sidladdning"
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php är registrerad på en webcron-tjänst"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php är registrerad som en webcron-tjänst. Anropa cron.php sidan i ownCloud en gång i minuten över HTTP."
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "använd systemets cron-tjänst"
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "Använd system-tjänsten cron. Anropa filen cron.php i ownCloud-mappen via ett cronjobb varje minut."
-#: templates/admin.php:41
-msgid "Share API"
-msgstr "Delat API"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "Dela"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "Aktivera delat API"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "Tillåt applikationer att använda delat API"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "Tillåt länkar"
-#: templates/admin.php:52
+#: templates/admin.php:68
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:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "Tillåt dela vidare"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr "Tillåt användare att dela vidare filer som delats med dom"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "Tillåt delning med alla"
-#: templates/admin.php:62
+#: templates/admin.php:81
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:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Logg"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Mera"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -223,12 +227,9 @@ msgid "Answer"
msgstr "Svar"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Du använder"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "av tillgängliga"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "Du har använt <strong>%s</strong> av tillgängliga <strong>%s<strong>"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -239,7 +240,7 @@ msgid "Download"
msgstr "Ladda ner"
#: templates/personal.php:19
-msgid "Your password got changed"
+msgid "Your password was changed"
msgstr "Ditt lösenord har ändrats"
#: templates/personal.php:20
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index b702651ccd7..2304aa8f880 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-22 02:00+0200\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"
@@ -29,58 +29,62 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr ""
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr ""
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr ""
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr ""
@@ -101,10 +105,110 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr ""
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr ""
@@ -190,10 +294,6 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr ""
-
#: templates/installation.php:36
msgid "Advanced"
msgstr ""
@@ -235,11 +335,11 @@ msgstr ""
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 08fbebab797..494ef40b5c9 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-22 02:00+0200\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"
@@ -51,39 +51,51 @@ msgstr ""
msgid "Files"
msgstr ""
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
-#: js/filelist.js:266
+#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -99,7 +111,7 @@ msgstr ""
msgid "Upload Error"
msgstr ""
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -107,36 +119,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr ""
-#: js/files.js:746 templates/index.php:56
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr ""
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr ""
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -188,7 +208,7 @@ msgstr ""
msgid "From url"
msgstr ""
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr ""
@@ -212,20 +232,20 @@ msgstr ""
msgid "Download"
msgstr ""
-#: templates/index.php:65
+#: templates/index.php:75
msgid "Upload too large"
msgstr ""
-#: templates/index.php:67
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:72
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:85
msgid "Current scanning"
msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 372d9301ed7..902adebfc20 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-22 02:00+0200\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_external.pot b/l10n/templates/files_external.pot
index d09f7055354..9f3d7dcf810 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-22 02:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index e9f6afc98d2..f1f3a3c1652 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-22 02:00+0200\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"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:25
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 9750a4acc5d..376c699f8c3 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-22 02:00+0200\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"
@@ -21,6 +21,10 @@ msgstr ""
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index d9c9f8aaded..c4b3b645ad5 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-22 02:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,43 +17,43 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: app.php:288
+#: app.php:285
msgid "Help"
msgstr ""
-#: app.php:295
+#: app.php:292
msgid "Personal"
msgstr ""
-#: app.php:300
+#: app.php:297
msgid "Settings"
msgstr ""
-#: app.php:305
+#: app.php:302
msgid "Users"
msgstr ""
-#: app.php:312
+#: app.php:309
msgid "Apps"
msgstr ""
-#: app.php:314
+#: app.php:311
msgid "Admin"
msgstr ""
-#: files.php:280
+#: files.php:309
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:281
+#: files.php:310
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:281 files.php:306
+#: files.php:310 files.php:335
msgid "Back to Files"
msgstr ""
-#: files.php:305
+#: files.php:334
msgid "Selected files too large to generate zip file."
msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 8bd0ab8fda5..335090f42ee 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-22 02:00+0200\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"
@@ -34,6 +34,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -72,15 +76,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -109,63 +109,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
"\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -216,11 +220,8 @@ msgid "Answer"
msgstr ""
#: templates/personal.php:8
-msgid "You use"
-msgstr ""
-
-#: templates/personal.php:8
-msgid "of the available"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
msgstr ""
#: templates/personal.php:12
@@ -232,7 +233,7 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
+msgid "Your password was changed"
msgstr ""
#: templates/personal.php:20
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 45eb19bf9fa..5340103866c 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-22 02:00+0200\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 57ee6a0d229..ea908570fe1 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -31,58 +31,62 @@ msgstr "ไม่มีหมวดหมู่ที่ต้องการเ
msgid "This category already exists: "
msgstr "หมวดหมู่นี้มีอยู่แล้ว: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "ตั้งค่า"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "มกราคม"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "กุมภาพันธ์"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "มีนาคม"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "เมษายน"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "พฤษภาคม"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "มิถุนายน"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "กรกฏาคม"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "สิงหาคม"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "กันยายน"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "ตุลาคม"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "พฤศจิกายน"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "ธันวาคม"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "ยกเลิก"
@@ -103,10 +107,110 @@ msgstr "ตกลง"
msgid "No categories selected for deletion."
msgstr "ยังไม่ได้เลือกหมวดหมู่ที่ต้องการลบ"
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "พบข้อผิดพลาด"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "รหัสผ่าน"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "รีเซ็ตรหัสผ่าน ownCloud"
@@ -192,10 +296,6 @@ msgstr "เพิ่ม"
msgid "Create an <strong>admin account</strong>"
msgstr "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "รหัสผ่าน"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "ขั้นสูง"
@@ -237,11 +337,11 @@ msgstr "Database host"
msgid "Finish setup"
msgstr "ติดตั้งเรียบร้อยแล้ว"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "web services under your control"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "ออกจากระบบ"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 7c732071313..8d92e087935 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/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: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 04:45+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -53,39 +53,51 @@ msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้
msgid "Files"
msgstr "ไฟล์"
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "ยกเลิกการแชร์ข้อมูล"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "ลบ"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "มีอยู่แล้ว"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "แทนที่"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr "แนะนำชื่อ"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "ยกเลิก"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "แทนที่แล้ว"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "เลิกทำ"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "กับ"
-#: js/filelist.js:266
+#: js/filelist.js:271
+msgid "unshared"
+msgstr "ยกเลิกการแชร์ข้อมูลแล้ว"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "ลบแล้ว"
@@ -101,7 +113,7 @@ msgstr "ไม่สามารถอัพโหลดไฟล์ของค
msgid "Upload Error"
msgstr "เกิดข้อผิดพลาดในการอัพโหลด"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "อยู่ระหว่างดำเนินการ"
@@ -109,36 +121,44 @@ msgstr "อยู่ระหว่างดำเนินการ"
msgid "Upload cancelled."
msgstr "การอัพโหลดถูกยกเลิก"
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน"
-#: js/files.js:746 templates/index.php:56
+#: js/files.js:667
+msgid "files scanned"
+msgstr "ไฟล์ต่างๆได้รับการสแกนแล้ว"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "พบข้อผิดพลาดในระหว่างการสแกนไฟล์"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "ขนาด"
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "ปรับปรุงล่าสุด"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "โฟลเดอร์"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "โฟลเดอร์"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "ไฟล์"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "ไฟล์"
@@ -190,7 +210,7 @@ msgstr "แฟ้มเอกสาร"
msgid "From url"
msgstr "จาก url"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "อัพโหลด"
@@ -214,20 +234,20 @@ msgstr "แชร์"
msgid "Download"
msgstr "ดาวน์โหลด"
-#: templates/index.php:65
+#: templates/index.php:75
msgid "Upload too large"
msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป"
-#: templates/index.php:67
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
-#: templates/index.php:72
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่."
-#: templates/index.php:75
+#: templates/index.php:85
msgid "Current scanning"
msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 27aa8b2872a..7aa1219fadd 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -8,15 +8,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 17:05+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: th_TH\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -26,14 +26,24 @@ msgstr "รหัสผ่าน"
msgid "Submit"
msgstr "ส่ง"
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr "ดาวน์โหลด"
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr "ไม่สามารถดูตัวอย่างได้สำหรับ"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
diff --git a/l10n/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
index 28f3effc2a2..0a8bbe5c259 100644
--- a/l10n/th_TH/files_versions.po
+++ b/l10n/th_TH/files_versions.po
@@ -8,20 +8,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-03 02:04+0200\n"
-"PO-Revision-Date: 2012-09-02 22:45+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: th_TH\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr "หมดอายุทุกรุ่น"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "รุ่น"
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "นี่จะเป็นลบทิ้งไฟล์รุ่นที่ทำการสำรองข้อมูลทั้งหมดที่มีอยู่ของคุณทิ้งไป"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "เปิดใช้งานคุณสมบัติการแยกสถานะรุ่นหรือเวอร์ชั่นของไฟล์"
+msgid "Files Versioning"
+msgstr "การกำหนดเวอร์ชั่นของไฟล์"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "เปิดใช้งาน"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 1919a13b9ef..f892ef3aebc 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:31+0000\n"
+"POT-Creation-Date: 2012-09-20 02:05+0200\n"
+"PO-Revision-Date: 2012-09-19 17:08+0000\n"
"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -37,6 +37,10 @@ msgstr "มีกลุ่มดังกล่าวอยู่ในระบ
msgid "Unable to add group"
msgstr "ไม่สามารถเพิ่มกลุ่มได้"
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "ไม่สามารถเปิดใช้งานแอปได้"
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "อีเมลถูกบันทึกแล้ว"
@@ -75,15 +79,11 @@ msgstr "ไม่สามารถเพิ่มผู้ใช้งานเ
msgid "Unable to remove user from group %s"
msgstr "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้"
-#: js/apps.js:18
-msgid "Error"
-msgstr "ข้อผิดพลาด"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "ปิดใช้งาน"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "เปิดใช้งาน"
@@ -112,63 +112,67 @@ msgstr "ไดเร็กทอรี่ข้อมูลและไฟล์
msgid "Cron"
msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ"
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php ได้ถูกลงทะเบียนที่บริการ webcron"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php ได้รับการลงทะเบียนแล้วกับเว็บผู้ให้บริการ webcron เรียกหน้าเว็บ cron.php ที่ตำแหน่ง root ของ owncloud หลังจากนี้สักครู่ผ่านทาง http"
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "ใช้บริการ cron จากระบบ"
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "ใช้บริการ cron จากระบบ เรียกไฟล์ cron.php ในโฟลเดอร์ owncloud ผ่านทาง cronjob ของระบบหลังจากนี้สักครู่"
-#: templates/admin.php:41
-msgid "Share API"
-msgstr "API สำหรับคุณสมบัติแชร์ข้อมูล"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "การแชร์ข้อมูล"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "เปิดใช้งาน API สำหรับคุณสมบัติแชร์ข้อมูล"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "อนุญาตให้ใช้งานลิงก์ได้"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ข้อมูลรายการต่างๆไปให้สาธารณะชนเป็นลิงก์ได้"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "บันทึกการเปลี่ยนแปลง"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "เพิ่มเติม"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -219,12 +223,9 @@ msgid "Answer"
msgstr "คำตอบ"
#: templates/personal.php:8
-msgid "You use"
-msgstr "คุณใช้พื้นที่ไป"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "จากจำนวนที่ใช้ได้"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "คุณได้ใช้ <strong>%s</strong> จากที่สามารถใช้ได้ <strong>%s<strong>"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -235,8 +236,8 @@ msgid "Download"
msgstr "ดาวน์โหลด"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "เปลี่ยนรหัสผ่านเรียบร้อยแล้ว"
+msgid "Your password was changed"
+msgstr "รหัสผ่านของคุณถูกเปลี่ยนแล้ว"
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index a715d982b63..81dc1feacf5 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -32,58 +32,62 @@ msgstr "Eklenecek kategori yok?"
msgid "This category already exists: "
msgstr "Bu kategori zaten mevcut: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Ayarlar"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Ocak"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Şubat"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Mart"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Nisan"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Mayıs"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Haziran"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Temmuz"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Ağustos"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Eylül"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Ekim"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Kasım"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Aralık"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "İptal"
@@ -104,10 +108,110 @@ msgstr "Tamam"
msgid "No categories selected for deletion."
msgstr "Silmek için bir kategori seçilmedi"
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Hata"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Parola"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ownCloud parola sıfırlama"
@@ -193,10 +297,6 @@ msgstr "Ekle"
msgid "Create an <strong>admin account</strong>"
msgstr "Bir <strong>yönetici hesabı</strong> oluşturun"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Parola"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Gelişmiş"
@@ -238,11 +338,11 @@ msgstr "Veritabanı sunucusu"
msgid "Finish setup"
msgstr "Kurulumu tamamla"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "kontrolünüzdeki web servisleri"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Çıkış yap"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 01675ca064c..2ab1e1108d0 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -55,39 +55,51 @@ msgstr "Diske yazılamadı"
msgid "Files"
msgstr "Dosyalar"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Sil"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "zaten mevcut"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "değiştir"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "iptal"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "değiştirildi"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "geri al"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "ile"
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "silindi"
@@ -103,7 +115,7 @@ msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yükle
msgid "Upload Error"
msgstr "Yükleme hatası"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Bekliyor"
@@ -111,36 +123,44 @@ msgstr "Bekliyor"
msgid "Upload cancelled."
msgstr "Yükleme iptal edildi."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Geçersiz isim, '/' işaretine izin verilmiyor."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Boyut"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Değiştirilme"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "dizin"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "dizinler"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "dosya"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "dosyalar"
@@ -192,7 +212,7 @@ msgstr "Klasör"
msgid "From url"
msgstr "Url'den"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Yükle"
@@ -200,36 +220,36 @@ msgstr "Yükle"
msgid "Cancel upload"
msgstr "Yüklemeyi iptal et"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Ad"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Paylaş"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "İndir"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Yüklemeniz çok büyük"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Dosyalar taranıyor, lütfen bekleyin."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Güncel tarama"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 7f224328937..fbf76ec640f 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index be45079a55c..d9aaae9d168 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 927817d5436..180910c3b38 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -37,6 +37,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "Eposta kaydedildi"
@@ -75,15 +79,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Etkin değil"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Etkin"
@@ -112,63 +112,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Günlük"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "Devamı"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -219,12 +223,9 @@ msgid "Answer"
msgstr "Cevap"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Kullanıyorsunuz"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "mevcut olandan"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -235,8 +236,8 @@ msgid "Download"
msgstr "İndir"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Parolanız değiştirildi"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 532bd0a5474..c7dfc830d86 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -5,12 +5,13 @@
# Translators:
# <dzubchikd@gmail.com>, 2012.
# Soul Kim <warlock.rf@gmail.com>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -31,69 +32,73 @@ msgstr ""
msgid "This category already exists: "
msgstr ""
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Налаштування"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
-msgstr ""
+msgstr "Січень"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
-msgstr ""
+msgstr "Лютий"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
-msgstr ""
+msgstr "Березень"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
-msgstr ""
+msgstr "Квітень"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
-msgstr ""
+msgstr "Травень"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
-msgstr ""
+msgstr "Червень"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
-msgstr ""
+msgstr "Липень"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
-msgstr ""
+msgstr "Серпень"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
-msgstr ""
+msgstr "Вересень"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
-msgstr ""
+msgstr "Жовтень"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
-msgstr ""
+msgstr "Листопад"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
+msgstr "Грудень"
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
msgstr ""
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
-msgstr ""
+msgstr "Відмінити"
#: js/oc-dialogs.js:159
msgid "No"
-msgstr ""
+msgstr "Ні"
#: js/oc-dialogs.js:160
msgid "Yes"
-msgstr ""
+msgstr "Так"
#: js/oc-dialogs.js:177
msgid "Ok"
@@ -103,8 +108,108 @@ msgstr ""
msgid "No categories selected for deletion."
msgstr ""
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
+msgstr "Помилка"
+
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Пароль"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
msgstr ""
#: lostpassword/index.php:26
@@ -186,16 +291,12 @@ msgstr ""
#: templates/edit_categories_dialog.php:14
msgid "Add"
-msgstr ""
+msgstr "Додати"
#: templates/installation.php:24
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Пароль"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr ""
@@ -237,11 +338,11 @@ msgstr ""
msgid "Finish setup"
msgstr "Завершити налаштування"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "веб-сервіс під вашим контролем"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Вихід"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 558899c1a20..3f9b0eed1dd 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -53,39 +53,51 @@ msgstr ""
msgid "Files"
msgstr "Файли"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Видалити"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr ""
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "відмінити"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "видалені"
@@ -101,7 +113,7 @@ msgstr "Неможливо завантажити ваш файл тому, що
msgid "Upload Error"
msgstr "Помилка завантаження"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Очікування"
@@ -109,36 +121,44 @@ msgstr "Очікування"
msgid "Upload cancelled."
msgstr "Завантаження перервано."
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Некоректне ім'я, '/' не дозволено."
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Розмір"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Змінено"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "тека"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "теки"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "файл"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "файли"
@@ -190,7 +210,7 @@ msgstr "Папка"
msgid "From url"
msgstr "З URL"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Відвантажити"
@@ -198,36 +218,36 @@ msgstr "Відвантажити"
msgid "Cancel upload"
msgstr "Перервати завантаження"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Тут нічого немає. Відвантажте що-небудь!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Ім'я"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Поділитися"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Завантажити"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "Файл занадто великий"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Файли скануються, зачекайте, будь-ласка."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "Поточне сканування"
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index 4d2de48c58f..c40b94e138c 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -3,19 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <victor.dubiniuk@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-11 02:02+0200\n"
+"PO-Revision-Date: 2012-09-10 10:46+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"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 "External Storage"
@@ -55,15 +56,15 @@ msgstr ""
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "Групи"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "Користувачі"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "Видалити"
#: templates/settings.php:88
msgid "SSL root certificates"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index cfebfcf491e..bb4445339e0 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -3,36 +3,47 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <victor.dubiniuk@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"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 ""
+msgstr "Пароль"
#: templates/authenticate.php:6
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
-msgid "Download"
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr "Завантажити"
+
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po
index f2a35bd6749..45b78595d4d 100644
--- a/l10n/uk/files_versions.po
+++ b/l10n/uk/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index d2a2e0eac4a..4458c03b3f2 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -4,41 +4,42 @@
#
# Translators:
# <dzubchikd@gmail.com>, 2012.
+# <victor.dubiniuk@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-11 02:02+0200\n"
+"PO-Revision-Date: 2012-09-10 11:28+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"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:288
+#: app.php:285
msgid "Help"
msgstr "Допомога"
-#: app.php:295
+#: app.php:292
msgid "Personal"
msgstr "Особисте"
-#: app.php:300
+#: app.php:297
msgid "Settings"
msgstr "Налаштування"
-#: app.php:305
+#: app.php:302
msgid "Users"
msgstr "Користувачі"
-#: app.php:312
+#: app.php:309
msgid "Apps"
msgstr "Додатки"
-#: app.php:314
+#: app.php:311
msgid "Admin"
msgstr "Адмін"
@@ -70,45 +71,45 @@ msgstr "Помилка автентифікації"
msgid "Token expired. Please reload page."
msgstr ""
-#: template.php:86
+#: template.php:87
msgid "seconds ago"
msgstr "секунди тому"
-#: template.php:87
+#: template.php:88
msgid "1 minute ago"
msgstr "1 хвилину тому"
-#: template.php:88
+#: template.php:89
#, php-format
msgid "%d minutes ago"
msgstr "%d хвилин тому"
-#: template.php:91
+#: template.php:92
msgid "today"
msgstr "сьогодні"
-#: template.php:92
+#: template.php:93
msgid "yesterday"
msgstr "вчора"
-#: template.php:93
+#: template.php:94
#, php-format
msgid "%d days ago"
msgstr "%d днів тому"
-#: template.php:94
+#: template.php:95
msgid "last month"
msgstr "минулого місяця"
-#: template.php:95
+#: template.php:96
msgid "months ago"
msgstr "місяці тому"
-#: template.php:96
+#: template.php:97
msgid "last year"
msgstr "минулого року"
-#: template.php:97
+#: template.php:98
msgid "years ago"
msgstr "роки тому"
@@ -123,4 +124,4 @@ msgstr ""
#: updater.php:71
msgid "updates check is disabled"
-msgstr ""
+msgstr "перевірка оновлень відключена"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 7a1ef6e3a0a..e0511804571 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/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: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -35,6 +35,10 @@ msgstr ""
msgid "Unable to add group"
msgstr ""
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr ""
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr ""
@@ -73,15 +77,11 @@ msgstr ""
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:18
-msgid "Error"
-msgstr ""
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr ""
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr ""
@@ -110,63 +110,67 @@ msgstr ""
msgid "Cron"
msgstr ""
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr ""
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr ""
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr ""
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -217,12 +221,9 @@ msgid "Answer"
msgstr ""
#: templates/personal.php:8
-msgid "You use"
-msgstr "Ви використовуєте"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "з доступної"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -233,8 +234,8 @@ msgid "Download"
msgstr ""
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Ваш пароль змінено"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index d9481263168..d82593c3dfe 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -3,19 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <victor.dubiniuk@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-11 02:02+0200\n"
+"PO-Revision-Date: 2012-09-10 11:08+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"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:8
msgid "Host"
@@ -47,7 +48,7 @@ msgstr ""
#: templates/settings.php:11
msgid "Password"
-msgstr ""
+msgstr "Пароль"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
@@ -167,4 +168,4 @@ msgstr ""
#: templates/settings.php:32
msgid "Help"
-msgstr ""
+msgstr "Допомога"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 4030732e1e4..4a5eed0411d 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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -30,58 +30,62 @@ msgstr "Không có danh mục được thêm?"
msgid "This category already exists: "
msgstr "Danh mục này đã được tạo :"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "Cài đặt"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "Tháng 1"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "Tháng 2"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "Tháng 3"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "Tháng 4"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "Tháng 5"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "Tháng 6"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "Tháng 7"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "Tháng 8"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "Tháng 9"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "Tháng 10"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "Tháng 11"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "Tháng 12"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "Hủy"
@@ -102,10 +106,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "Không có thể loại nào được chọn để xóa."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "Lỗi"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "Mật khẩu"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "Khôi phục mật khẩu Owncloud "
@@ -191,10 +295,6 @@ msgstr "Thêm"
msgid "Create an <strong>admin account</strong>"
msgstr "Tạo một <strong>tài khoản quản trị</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "Mật khẩu"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "Nâng cao"
@@ -236,11 +336,11 @@ msgstr "Database host"
msgid "Finish setup"
msgstr "Cài đặt hoàn tất"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "các dịch vụ web dưới sự kiểm soát của bạn"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "Đăng xuất"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index fb95389e333..2599fbabd82 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mattheu_9x@yahoo.com>, 2012.
# Sơn Nguyễn <sonnghit@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -20,87 +21,99 @@ msgstr ""
#: ajax/upload.php:20
msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Không có lỗi, các tập tin đã được tải lên thành công"
#: ajax/upload.php:21
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Những tập tin được tải lên vượt quá upload_max_filesize được chỉ định trong php.ini"
#: ajax/upload.php:22
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
-msgstr ""
+msgstr "Kích thước những tập tin tải lên vượt quá MAX_FILE_SIZE đã được quy định"
#: ajax/upload.php:23
msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Tập tin tải lên mới chỉ tải lên được một phần"
#: ajax/upload.php:24
msgid "No file was uploaded"
-msgstr ""
+msgstr "Không có tập tin nào được tải lên"
#: ajax/upload.php:25
msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Không tìm thấy thư mục tạm"
#: ajax/upload.php:26
msgid "Failed to write to disk"
-msgstr ""
+msgstr "Không thể ghi vào đĩa cứng"
#: appinfo/app.php:6
msgid "Files"
msgstr "Tập tin"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "Không chia sẽ"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "Xóa"
-#: js/filelist.js:186 js/filelist.js:188
-msgid "already exists"
+#: js/fileactions.js:182
+msgid "Rename"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
+msgid "already exists"
+msgstr "đã tồn tại"
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
-msgstr ""
+msgstr "thay thế"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "tên gợi ý"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
-msgstr ""
+msgstr "hủy"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
-msgstr ""
+msgstr "đã được thay thế"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
-msgstr ""
+msgstr "lùi lại"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
-msgstr ""
+msgstr "với"
#: js/filelist.js:271
-msgid "deleted"
+msgid "unshared"
msgstr ""
+#: js/filelist.js:273
+msgid "deleted"
+msgstr "đã xóa"
+
#: js/files.js:179
msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "Tạo tập tinh ZIP, điều này có thể mất một ít thời gian"
#: js/files.js:208
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte"
#: js/files.js:208
msgid "Upload Error"
msgstr "Tải lên lỗi"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Chờ"
@@ -108,36 +121,44 @@ msgstr "Chờ"
msgid "Upload cancelled."
msgstr "Hủy tải lên"
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "Tên không hợp lệ ,không được phép dùng '/'"
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "Kích cỡ"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "Thay đổi"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "folder"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "folders"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "file"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "files"
@@ -155,7 +176,7 @@ msgstr ""
#: templates/admin.php:9
msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Cần thiết cho tải nhiều tập tin và thư mục."
#: templates/admin.php:9
msgid "Enable ZIP-download"
@@ -171,7 +192,7 @@ msgstr "Kích thước tối đa cho các tập tin ZIP"
#: templates/admin.php:14
msgid "Save"
-msgstr ""
+msgstr "Lưu"
#: templates/index.php:7
msgid "New"
@@ -189,7 +210,7 @@ msgstr "Folder"
msgid "From url"
msgstr "Từ url"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "Tải lên"
@@ -197,36 +218,36 @@ msgstr "Tải lên"
msgid "Cancel upload"
msgstr "Hủy upload"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "Không có gì ở đây .Hãy tải lên một cái gì đó !"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "Tên"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "Chia sẻ"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "Tải xuống"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "File tải lên quá lớn"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
-msgstr ""
+msgstr "Các tập tin bạn đang cố gắng tải lên vượt quá kích thước tối đa cho phép trên máy chủ này."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "Tập tin đang được quét ,vui lòng chờ."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
-msgstr ""
+msgstr "Hiện tại đang quét"
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index d76c619333d..9c55fc8c75f 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -3,32 +3,33 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Sơn Nguyễn <sonnghit@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-07 14:56+0000\n"
+"Last-Translator: Sơn Nguyễn <sonnghit@gmail.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: vi\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "Mã hóa"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Loại trừ các loại tập tin sau đây từ mã hóa"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "none"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "BẬT mã hóa"
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index 8633bedfa5c..d91134daff1 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -3,80 +3,81 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Sơn Nguyễn <sonnghit@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 15:39+0000\n"
+"Last-Translator: Sơn Nguyễn <sonnghit@gmail.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: vi\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "Lưu trữ ngoài"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "Điểm gắn"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "phụ trợ"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "Cấu hình"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "Tùy chọn"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "Áp dụng"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "Thêm điểm lắp"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "không"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "Tất cả người dùng"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "Nhóm"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "Người dùng"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "Xóa"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "Chứng chỉ SSL root"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Nhập Root Certificate"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Kích hoạt tính năng lưu trữ ngoài"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Cho phép người dùng kết nối với lưu trữ riêng bên ngoài của họ"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index a3aaf62a3eb..c30ea0ef9b0 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -3,36 +3,47 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Sơn Nguyễn <sonnghit@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: vi\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/authenticate.php:4
msgid "Password"
-msgstr ""
+msgstr "Mật khẩu"
#: templates/authenticate.php:6
msgid "Submit"
+msgstr "Xác nhận"
+
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
-msgid "Download"
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr "Tải về"
+
+#: templates/public.php:29
msgid "No preview available for"
-msgstr ""
+msgstr "Không có xem trước cho"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
-msgstr ""
+msgstr "dịch vụ web dưới sự kiểm soát của bạn"
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
index 54f38f28122..d6a9e9ee7aa 100644
--- a/l10n/vi/files_versions.po
+++ b/l10n/vi/files_versions.po
@@ -3,32 +3,41 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Sơn Nguyễn <sonnghit@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: vi\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
+msgstr "Hết hạn tất cả các phiên bản"
+
+#: js/versions.js:16
+msgid "History"
msgstr ""
#: templates/settings-personal.php:4
msgid "Versions"
-msgstr ""
+msgstr "Phiên bản"
#: templates/settings-personal.php:7
msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Điều này sẽ xóa tất cả các phiên bản sao lưu hiện có "
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 966ae227063..23d24277711 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -3,123 +3,124 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Sơn Nguyễn <sonnghit@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 14:09+0000\n"
+"Last-Translator: Sơn Nguyễn <sonnghit@gmail.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: vi\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:288
+#: app.php:285
msgid "Help"
-msgstr ""
+msgstr "Giúp đỡ"
-#: app.php:295
+#: app.php:292
msgid "Personal"
-msgstr ""
+msgstr "Cá nhân"
-#: app.php:300
+#: app.php:297
msgid "Settings"
-msgstr ""
+msgstr "Cài đặt"
-#: app.php:305
+#: app.php:302
msgid "Users"
-msgstr ""
+msgstr "Người dùng"
-#: app.php:312
+#: app.php:309
msgid "Apps"
-msgstr ""
+msgstr "Ứng dụng"
-#: app.php:314
+#: app.php:311
msgid "Admin"
-msgstr ""
+msgstr "Quản trị"
#: files.php:280
msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Tải về ZIP đã bị tắt."
#: files.php:281
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Tập tin cần phải được tải về từng người một."
#: files.php:281 files.php:306
msgid "Back to Files"
-msgstr ""
+msgstr "Trở lại tập tin"
#: files.php:305
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Tập tin được chọn quá lớn để tạo tập tin ZIP."
#: json.php:28
msgid "Application is not enabled"
-msgstr ""
+msgstr "Ứng dụng không được BẬT"
#: json.php:39 json.php:63 json.php:75
msgid "Authentication error"
-msgstr ""
+msgstr "Lỗi xác thực"
#: json.php:51
msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Mã Token đã hết hạn. Hãy tải lại trang."
-#: template.php:86
+#: template.php:87
msgid "seconds ago"
-msgstr ""
+msgstr "1 giây trước"
-#: template.php:87
+#: template.php:88
msgid "1 minute ago"
-msgstr ""
+msgstr "1 phút trước"
-#: template.php:88
+#: template.php:89
#, php-format
msgid "%d minutes ago"
-msgstr ""
+msgstr "%d phút trước"
-#: template.php:91
+#: template.php:92
msgid "today"
-msgstr ""
+msgstr "hôm nay"
-#: template.php:92
+#: template.php:93
msgid "yesterday"
-msgstr ""
+msgstr "hôm qua"
-#: template.php:93
+#: template.php:94
#, php-format
msgid "%d days ago"
-msgstr ""
+msgstr "%d ngày trước"
-#: template.php:94
+#: template.php:95
msgid "last month"
-msgstr ""
+msgstr "tháng trước"
-#: template.php:95
+#: template.php:96
msgid "months ago"
-msgstr ""
+msgstr "tháng trước"
-#: template.php:96
+#: template.php:97
msgid "last year"
-msgstr ""
+msgstr "năm trước"
-#: template.php:97
+#: template.php:98
msgid "years ago"
-msgstr ""
+msgstr "năm trước"
#: updater.php:66
#, php-format
msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s có sẵn. <a href=\"%s\">xem thêm ở đây</a>"
#: updater.php:68
msgid "up to date"
-msgstr ""
+msgstr "đến ngày"
#: updater.php:71
msgid "updates check is disabled"
-msgstr ""
+msgstr "đã TĂT chức năng cập nhật "
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index b8c57b37234..1f77b616b1a 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mattheu_9x@yahoo.com>, 2012.
# Son Nguyen <sonnghit@gmail.com>, 2012.
# Sơn Nguyễn <sonnghit@gmail.com>, 2012.
# <vlinhd11@gmail.com>, 2012.
@@ -10,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -31,10 +32,14 @@ msgstr "Lỗi xác thực"
#: ajax/creategroup.php:19
msgid "Group already exists"
-msgstr ""
+msgstr "Nhóm đã tồn tại"
#: ajax/creategroup.php:28
msgid "Unable to add group"
+msgstr "Không thể thêm nhóm"
+
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
msgstr ""
#: ajax/lostpassword.php:14
@@ -55,11 +60,11 @@ msgstr "Yêu cầu không hợp lệ"
#: ajax/removegroup.php:16
msgid "Unable to delete group"
-msgstr ""
+msgstr "Không thể xóa nhóm"
#: ajax/removeuser.php:22
msgid "Unable to delete user"
-msgstr ""
+msgstr "Không thể xóa người dùng"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -68,22 +73,18 @@ msgstr "Ngôn ngữ đã được thay đổi"
#: ajax/togglegroups.php:25
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Không thể thêm người dùng vào nhóm %s"
#: ajax/togglegroups.php:31
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
-
-#: js/apps.js:18
-msgid "Error"
-msgstr "Lỗi"
+msgstr "Không thể xóa người dùng từ nhóm %s"
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "Vô hiệu"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "Cho phép"
@@ -106,69 +107,73 @@ msgid ""
"strongly suggest that you configure your webserver in a way that the data "
"directory is no longer accessible or you move the data directory outside the"
" webserver document root."
-msgstr ""
+msgstr "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ internet. Tập tin .htaccess của ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ webserver của bạn để thư mục dữ liệu không còn bị truy cập hoặc bạn di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ."
#: templates/admin.php:31
msgid "Cron"
-msgstr ""
+msgstr "Cron"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
-msgstr ""
+msgstr "Bật chia sẻ API"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Cho phép các ứng dụng sử dụng chia sẻ API"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
-msgstr ""
+msgstr "Cho phép liên kết"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
-msgstr ""
+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:56
+#: templates/admin.php:73
msgid "Allow resharing"
-msgstr ""
+msgstr "Cho phép chia sẻ lại"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Cho phép người dùng chia sẻ với bất cứ ai"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
-msgstr ""
+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:69
+#: templates/admin.php:88
msgid "Log"
msgstr "Log"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "nhiều hơn"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -176,7 +181,7 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
#: templates/apps.php:10
msgid "Add your App"
@@ -192,7 +197,7 @@ msgstr "Xem ứng dụng tại apps.owncloud.com"
#: templates/apps.php:30
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-Giấy phép được cấp bởi <span class=\"author\"></span>"
#: templates/help.php:9
msgid "Documentation"
@@ -219,12 +224,9 @@ msgid "Answer"
msgstr "trả lời"
#: templates/personal.php:8
-msgid "You use"
-msgstr "Bạn sử dụng"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "có sẵn"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -235,8 +237,8 @@ msgid "Download"
msgstr "Tải về"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Mật khẩu đã được thay đổi"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
@@ -308,7 +310,7 @@ msgstr "Khác"
#: templates/users.php:80 templates/users.php:112
msgid "Group Admin"
-msgstr ""
+msgstr "Nhóm quản trị"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 6fd933c5b5c..111219c7206 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -3,23 +3,24 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <mattheu_9x@yahoo.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-11 02:02+0200\n"
+"PO-Revision-Date: 2012-09-10 08:50+0000\n"
+"Last-Translator: mattheu_9x <mattheu_9x@yahoo.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: vi\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "Máy chủ"
#: templates/settings.php:8
msgid ""
@@ -47,7 +48,7 @@ msgstr ""
#: templates/settings.php:11
msgid "Password"
-msgstr ""
+msgstr "Mật khẩu"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
@@ -95,7 +96,7 @@ msgstr ""
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "Cổng"
#: templates/settings.php:18
msgid "Base User Tree"
@@ -111,7 +112,7 @@ msgstr ""
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "Sử dụng TLS"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
@@ -123,7 +124,7 @@ msgstr ""
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Tắt xác thực chứng nhận SSL"
#: templates/settings.php:23
msgid ""
@@ -133,11 +134,11 @@ msgstr ""
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Không khuyến khích, Chỉ sử dụng để thử nghiệm."
#: templates/settings.php:24
msgid "User Display Name Field"
-msgstr ""
+msgstr "Hiển thị tên người sử dụng"
#: templates/settings.php:24
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
@@ -145,7 +146,7 @@ msgstr ""
#: templates/settings.php:25
msgid "Group Display Name Field"
-msgstr ""
+msgstr "Hiển thị tên nhóm"
#: templates/settings.php:25
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
@@ -153,7 +154,7 @@ msgstr ""
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "Theo Byte"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
@@ -163,8 +164,8 @@ msgstr ""
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
-msgstr ""
+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:32
msgid "Help"
-msgstr ""
+msgstr "Giúp đỡ"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 1993d8aed9a..19aa6d0c44f 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -4,12 +4,13 @@
#
# Translators:
# <bluehattree@126.com>, 2012.
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@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"
@@ -30,58 +31,62 @@ msgstr "没有分类添加了?"
msgid "This category already exists: "
msgstr "这个分类已经存在了:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "设置"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "一月"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "二月"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "三月"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "四月"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "五月"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "六月"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "七月"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "八月"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "九月"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "十月"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "十一月"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "十二月"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "取消"
@@ -102,10 +107,110 @@ msgstr "好的"
msgid "No categories selected for deletion."
msgstr "没有选者要删除的分类."
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "错误"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "密码"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "私有云密码重置"
@@ -191,10 +296,6 @@ msgstr "添加"
msgid "Create an <strong>admin account</strong>"
msgstr "建立一个 <strong>管理帐户</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "密码"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "进阶"
@@ -226,7 +327,7 @@ msgstr "数据库用户名"
#: templates/installation.php:109
msgid "Database tablespace"
-msgstr ""
+msgstr "数据库表格空间"
#: templates/installation.php:115
msgid "Database host"
@@ -236,11 +337,11 @@ msgstr "数据库主机"
msgid "Finish setup"
msgstr "完成安装"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "你控制下的网络服务"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "注销"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 3224b4b01df..237eb0741fc 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -4,12 +4,13 @@
#
# Translators:
# <bluehattree@126.com>, 2012.
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@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"
@@ -52,39 +53,51 @@ msgstr "写磁盘失败"
msgid "Files"
msgstr "文件"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "取消共享"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "删除"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "已经存在了"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "替换"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
-msgstr ""
+msgstr "推荐名称"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "取消"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "替换过了"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "撤销"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "随着"
#: js/filelist.js:271
+msgid "unshared"
+msgstr "已取消共享"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "删除"
@@ -100,7 +113,7 @@ msgstr "不能上传你指定的文件,可能因为它是个文件夹或者大
msgid "Upload Error"
msgstr "上传错误"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "Pending"
@@ -108,36 +121,44 @@ msgstr "Pending"
msgid "Upload cancelled."
msgstr "上传取消了"
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "文件正在上传。关闭页面会取消上传。"
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "非法文件名,\"/\"是不被许可的"
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr "文件已扫描"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "扫描出错"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "大小"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "修改日期"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "文件夹"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "文件夹"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "文件"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "文件"
@@ -171,7 +192,7 @@ msgstr "最大的ZIP文件输入大小"
#: templates/admin.php:14
msgid "Save"
-msgstr ""
+msgstr "保存"
#: templates/index.php:7
msgid "New"
@@ -189,7 +210,7 @@ msgstr "文件夹"
msgid "From url"
msgstr "从URL:"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "上传"
@@ -197,36 +218,36 @@ msgstr "上传"
msgid "Cancel upload"
msgstr "取消上传"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "这里没有东西.上传点什么!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "名字"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "分享"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "下载"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "上传的文件太大了"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "你正在试图上传的文件超过了此服务器支持的最大的文件大小."
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "正在扫描文件,请稍候."
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "正在扫描"
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index 2073826c24d..eb4ddd9c548 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/zh_CN.GB2312/files_encryption.po
@@ -3,32 +3,33 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 10:51+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:3
msgid "Encryption"
-msgstr ""
+msgstr "加密"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "从加密中排除如下文件类型"
#: templates/settings.php:5
msgid "None"
-msgstr ""
+msgstr "无"
#: templates/settings.php:10
msgid "Enable Encryption"
-msgstr ""
+msgstr "启用加密"
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index 27dfa58801b..4573b7bbddf 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -3,80 +3,81 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 12:25+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\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"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:3
msgid "External Storage"
-msgstr ""
+msgstr "外部存储"
#: templates/settings.php:7 templates/settings.php:19
msgid "Mount point"
-msgstr ""
+msgstr "挂载点"
#: templates/settings.php:8
msgid "Backend"
-msgstr ""
+msgstr "后端"
#: templates/settings.php:9
msgid "Configuration"
-msgstr ""
+msgstr "配置"
#: templates/settings.php:10
msgid "Options"
-msgstr ""
+msgstr "选项"
#: templates/settings.php:11
msgid "Applicable"
-msgstr ""
+msgstr "可应用"
#: templates/settings.php:23
msgid "Add mount point"
-msgstr ""
+msgstr "添加挂载点"
#: templates/settings.php:54 templates/settings.php:62
msgid "None set"
-msgstr ""
+msgstr "未设置"
#: templates/settings.php:63
msgid "All Users"
-msgstr ""
+msgstr "所有用户"
#: templates/settings.php:64
msgid "Groups"
-msgstr ""
+msgstr "群组"
#: templates/settings.php:69
msgid "Users"
-msgstr ""
+msgstr "用户"
#: templates/settings.php:77 templates/settings.php:96
msgid "Delete"
-msgstr ""
+msgstr "删除"
#: templates/settings.php:88
msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL 根证书"
#: templates/settings.php:102
msgid "Import Root Certificate"
-msgstr ""
+msgstr "导入根证书"
#: templates/settings.php:108
msgid "Enable User External Storage"
-msgstr ""
+msgstr "启用用户外部存储"
#: templates/settings.php:109
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "允许用户挂载他们的外部存储"
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index 4fdcb4f36f6..1509a1ab9e7 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -3,36 +3,47 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/authenticate.php:4
msgid "Password"
-msgstr ""
+msgstr "密码"
#: templates/authenticate.php:6
msgid "Submit"
+msgstr "提交"
+
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
-msgid "Download"
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr "下载"
+
+#: templates/public.php:29
msgid "No preview available for"
-msgstr ""
+msgstr "没有预览可用于"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
-msgstr ""
+msgstr "您控制的网络服务"
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index 89fa8dd1ef2..f66d4f68bee 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/files_versions.po
@@ -3,32 +3,41 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
+msgstr "作废所有版本"
+
+#: js/versions.js:16
+msgid "History"
msgstr ""
#: templates/settings-personal.php:4
msgid "Versions"
-msgstr ""
+msgstr "版本"
#: templates/settings-personal.php:7
msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "这将删除所有您现有文件的备份版本"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr ""
+msgid "Files Versioning"
+msgstr "文件版本"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "启用"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index 541a462fb8a..4eac71c656e 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/lib.po
@@ -3,123 +3,124 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 12:19+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\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"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:288
+#: app.php:285
msgid "Help"
-msgstr ""
+msgstr "帮助"
-#: app.php:295
+#: app.php:292
msgid "Personal"
-msgstr ""
+msgstr "私人"
-#: app.php:300
+#: app.php:297
msgid "Settings"
-msgstr ""
+msgstr "设置"
-#: app.php:305
+#: app.php:302
msgid "Users"
-msgstr ""
+msgstr "用户"
-#: app.php:312
+#: app.php:309
msgid "Apps"
-msgstr ""
+msgstr "程序"
-#: app.php:314
+#: app.php:311
msgid "Admin"
-msgstr ""
+msgstr "管理员"
#: files.php:280
msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP 下载已关闭"
#: files.php:281
msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "需要逐个下载文件。"
#: files.php:281 files.php:306
msgid "Back to Files"
-msgstr ""
+msgstr "返回到文件"
#: files.php:305
msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "选择的文件太大而不能生成 zip 文件。"
#: json.php:28
msgid "Application is not enabled"
-msgstr ""
+msgstr "应用未启用"
#: json.php:39 json.php:63 json.php:75
msgid "Authentication error"
-msgstr ""
+msgstr "验证错误"
#: json.php:51
msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "会话过期。请刷新页面。"
-#: template.php:86
+#: template.php:87
msgid "seconds ago"
-msgstr ""
+msgstr "秒前"
-#: template.php:87
+#: template.php:88
msgid "1 minute ago"
-msgstr ""
+msgstr "1 分钟前"
-#: template.php:88
+#: template.php:89
#, php-format
msgid "%d minutes ago"
-msgstr ""
+msgstr "%d 分钟前"
-#: template.php:91
+#: template.php:92
msgid "today"
-msgstr ""
+msgstr "今天"
-#: template.php:92
+#: template.php:93
msgid "yesterday"
-msgstr ""
+msgstr "昨天"
-#: template.php:93
+#: template.php:94
#, php-format
msgid "%d days ago"
-msgstr ""
+msgstr "%d 天前"
-#: template.php:94
+#: template.php:95
msgid "last month"
-msgstr ""
+msgstr "上个月"
-#: template.php:95
+#: template.php:96
msgid "months ago"
-msgstr ""
+msgstr "月前"
-#: template.php:96
+#: template.php:97
msgid "last year"
-msgstr ""
+msgstr "去年"
-#: template.php:97
+#: template.php:98
msgid "years ago"
-msgstr ""
+msgstr "年前"
#: updater.php:66
#, php-format
msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s 不可用。获知 <a href=\"%s\">详情</a>"
#: updater.php:68
msgid "up to date"
-msgstr ""
+msgstr "最新"
#: updater.php:71
msgid "updates check is disabled"
-msgstr ""
+msgstr "更新检测已禁用"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 5e3311e0216..97dbf49a932 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -4,13 +4,14 @@
#
# Translators:
# <bluehattree@126.com>, 2012.
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 19:03+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\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"
@@ -29,11 +30,15 @@ msgstr "认证错误"
#: ajax/creategroup.php:19
msgid "Group already exists"
-msgstr ""
+msgstr "群组已存在"
#: ajax/creategroup.php:28
msgid "Unable to add group"
-msgstr ""
+msgstr "未能添加群组"
+
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "未能启用应用"
#: ajax/lostpassword.php:14
msgid "Email saved"
@@ -53,11 +58,11 @@ msgstr "非法请求"
#: ajax/removegroup.php:16
msgid "Unable to delete group"
-msgstr ""
+msgstr "未能删除群组"
#: ajax/removeuser.php:22
msgid "Unable to delete user"
-msgstr ""
+msgstr "未能删除用户"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -66,22 +71,18 @@ msgstr "语言改变了"
#: ajax/togglegroups.php:25
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "未能添加用户到群组 %s"
#: ajax/togglegroups.php:31
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "未能将用户从群组 %s 移除"
-#: js/apps.js:18
-msgid "Error"
-msgstr "错误"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "禁用"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "启用"
@@ -104,69 +105,73 @@ msgid ""
"strongly suggest that you configure your webserver in a way that the data "
"directory is no longer accessible or you move the data directory outside the"
" webserver document root."
-msgstr ""
+msgstr "您的数据文件夹和您的文件可能可以从互联网访问。ownCloud 提供的 .htaccess 文件未工作。我们强烈建议您配置您的网络服务器,让数据文件夹不能访问,或将数据文件夹移出网络服务器文档根目录。"
#: templates/admin.php:31
msgid "Cron"
msgstr "定时"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr ""
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "在每个页面载入时执行一项任务"
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr ""
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php 已作为 webcron 服务注册。owncloud 根用户将通过 http 协议每分钟调用一次 cron.php。"
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr ""
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "使用系统 cron 服务。通过系统 cronjob 每分钟调用一次 owncloud 文件夹下的 cron.php"
-#: templates/admin.php:41
-msgid "Share API"
-msgstr ""
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "分享"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
-msgstr ""
+msgstr "启用分享 API"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "允许应用使用分享 API"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
-msgstr ""
+msgstr "允许链接"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "允许用户使用链接与公众分享条目"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
-msgstr ""
+msgstr "允许重复分享"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "允许用户再次分享已经分享过的条目"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "允许用户与任何人分享"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "只允许用户与群组内用户分享"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "日志"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "更多"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -174,7 +179,7 @@ msgid ""
"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
"target=\"_blank\"><abbr title=\"Affero General Public "
"License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社区</a>开发,<a href=\"https://github.com/owncloud\" target=\"_blank\">s源代码</a> 以 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 许可协议发布。"
#: templates/apps.php:10
msgid "Add your App"
@@ -190,7 +195,7 @@ msgstr "在owncloud.com上查看应用程序"
#: templates/apps.php:30
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>授权协议 <span class=\"author\"></span>"
#: templates/help.php:9
msgid "Documentation"
@@ -217,12 +222,9 @@ msgid "Answer"
msgstr "回答"
#: templates/personal.php:8
-msgid "You use"
-msgstr "你使用"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "可用的"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "您已使用了 <strong>%s</strong>,总可用 <strong>%s<strong>"
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -233,8 +235,8 @@ msgid "Download"
msgstr "下载"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "你的密码已经改变"
+msgid "Your password was changed"
+msgstr "您的密码以变更"
#: templates/personal.php:20
msgid "Unable to change your password"
@@ -306,7 +308,7 @@ msgstr "其他的"
#: templates/users.php:80 templates/users.php:112
msgid "Group Admin"
-msgstr ""
+msgstr "群组管理员"
#: templates/users.php:82
msgid "Quota"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 67a667a8eea..119c7188675 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -3,168 +3,169 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# marguerite su <i@marguerite.su>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 12:39+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\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"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "主机"
#: templates/settings.php:8
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "您可以忽略协议,除非您需要 SSL。然后用 ldaps:// 开头"
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "基本判别名"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "您可以在高级选项卡中为用户和群组指定基本判别名"
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "用户判别名"
#: templates/settings.php:10
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 "客户机用户的判别名,将用于绑定,例如 uid=agent, dc=example, dc=com。匿名访问请留空判别名和密码。"
#: templates/settings.php:11
msgid "Password"
-msgstr ""
+msgstr "密码"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "匿名访问请留空判别名和密码。"
#: templates/settings.php:12
msgid "User Login Filter"
-msgstr ""
+msgstr "用户登录过滤器"
#: templates/settings.php:12
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
-msgstr ""
+msgstr "定义尝试登录时要应用的过滤器。用 %%uid 替换登录操作中使用的用户名。"
#: templates/settings.php:12
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "使用 %%uid 占位符,例如 \"uid=%%uid\""
#: templates/settings.php:13
msgid "User List Filter"
-msgstr ""
+msgstr "用户列表过滤器"
#: templates/settings.php:13
msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "定义撷取用户时要应用的过滤器。"
#: templates/settings.php:13
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "不能使用占位符,例如 \"objectClass=person\"。"
#: templates/settings.php:14
msgid "Group Filter"
-msgstr ""
+msgstr "群组过滤器"
#: templates/settings.php:14
msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "定义撷取群组时要应用的过滤器"
#: templates/settings.php:14
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "不能使用占位符,例如 \"objectClass=posixGroup\"。"
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "端口"
#: templates/settings.php:18
msgid "Base User Tree"
-msgstr ""
+msgstr "基本用户树"
#: templates/settings.php:19
msgid "Base Group Tree"
-msgstr ""
+msgstr "基本群组树"
#: templates/settings.php:20
msgid "Group-Member association"
-msgstr ""
+msgstr "群组-成员组合"
#: templates/settings.php:21
msgid "Use TLS"
-msgstr ""
+msgstr "使用 TLS"
#: templates/settings.php:21
msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "不要使用它进行 SSL 连接,会失败的。"
#: templates/settings.php:22
msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "大小写不敏感的 LDAP 服务器 (Windows)"
#: templates/settings.php:23
msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "关闭 SSL 证书校验。"
#: templates/settings.php:23
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
-msgstr ""
+msgstr "如果只有使用此选项才能连接,请导入 LDAP 服务器的 SSL 证书到您的 ownCloud 服务器。"
#: templates/settings.php:23
msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "不推荐,仅供测试"
#: templates/settings.php:24
msgid "User Display Name Field"
-msgstr ""
+msgstr "用户显示名称字段"
#: templates/settings.php:24
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "用于生成用户的 ownCloud 名称的 LDAP 属性。"
#: templates/settings.php:25
msgid "Group Display Name Field"
-msgstr ""
+msgstr "群组显示名称字段"
#: templates/settings.php:25
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "用于生成群组的 ownCloud 名称的 LDAP 属性。"
#: templates/settings.php:27
msgid "in bytes"
-msgstr ""
+msgstr "以字节计"
#: templates/settings.php:29
msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "以秒计。修改会清空缓存。"
#: templates/settings.php:30
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
-msgstr ""
+msgstr "用户名请留空 (默认)。否则,请指定一个 LDAP/AD 属性。"
#: templates/settings.php:32
msgid "Help"
-msgstr ""
+msgstr "帮助"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 5ecd449a620..1cdc8ebf738 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/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: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 07:30+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -32,58 +32,62 @@ msgstr "没有可添加分类?"
msgid "This category already exists: "
msgstr "此分类已存在: "
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "设置"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "一月"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "二月"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "三月"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "四月"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "五月"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "六月"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "七月"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "八月"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "九月"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "十月"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "十一月"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "十二月"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "取消"
@@ -104,10 +108,110 @@ msgstr "好"
msgid "No categories selected for deletion."
msgstr "没有选择要删除的类别"
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "错误"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "密码"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "重置 ownCloud 密码"
@@ -193,10 +297,6 @@ msgstr "添加"
msgid "Create an <strong>admin account</strong>"
msgstr "创建<strong>管理员账号</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "密码"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "高级"
@@ -238,11 +338,11 @@ msgstr "数据库主机"
msgid "Finish setup"
msgstr "安装完成"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "由您掌控的网络服务"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "注销"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 585310a4089..36473aea1c9 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 07:31+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -54,39 +54,51 @@ msgstr "写入磁盘失败"
msgid "Files"
msgstr "文件"
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "取消分享"
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "删除"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "已经存在"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "替换"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr "建议名称"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "取消"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr "已经替换"
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr "撤销"
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr "随着"
-#: js/filelist.js:266
+#: js/filelist.js:271
+msgid "unshared"
+msgstr "已取消分享"
+
+#: js/filelist.js:273
msgid "deleted"
msgstr "已经删除"
@@ -102,7 +114,7 @@ msgstr "无法上传文件,因为它是一个目录或者大小为 0 字节"
msgid "Upload Error"
msgstr "上传错误"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr "操作等待中"
@@ -110,36 +122,44 @@ msgstr "操作等待中"
msgid "Upload cancelled."
msgstr "上传已取消"
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "非法的名称,不允许使用‘/’。"
-#: js/files.js:746 templates/index.php:56
+#: js/files.js:667
+msgid "files scanned"
+msgstr "已扫描文件"
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr "扫描时出错"
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "大小"
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "修改日期"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr "文件夹"
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr "文件夹"
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr "文件"
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr "文件"
@@ -191,7 +211,7 @@ msgstr "文件夹"
msgid "From url"
msgstr "来自地址"
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "上传"
@@ -215,20 +235,20 @@ msgstr "共享"
msgid "Download"
msgstr "下载"
-#: templates/index.php:65
+#: templates/index.php:75
msgid "Upload too large"
msgstr "上传文件过大"
-#: templates/index.php:67
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "您正尝试上传的文件超过了此服务器可以上传的最大大小"
-#: templates/index.php:72
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "文件正在被扫描,请稍候。"
-#: templates/index.php:75
+#: templates/index.php:85
msgid "Current scanning"
msgstr "当前扫描"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 7e030749cf6..502f4e08a6f 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/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: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 15:39+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-07 09:38+0000\n"
"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr "加密"
#: templates/settings.php:4
msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "从加密中排除列出的文件类型"
#: templates/settings.php:5
msgid "None"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index e6e603fc5ac..0cf69de8ed6 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"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"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/authenticate.php:4
msgid "Password"
@@ -25,14 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
msgid "Download"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:29
msgid "No preview available for"
msgstr ""
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index 8fc46b74985..eb613ae45cf 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 13:03+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,10 @@ msgstr ""
msgid "Expire all versions"
msgstr "过期所有版本"
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr "版本"
@@ -31,5 +35,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr "将会删除您的文件的所有备份版本"
#: templates/settings.php:3
-msgid "Enable Files Versioning"
-msgstr "开启文件版本"
+msgid "Files Versioning"
+msgstr "文件版本"
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr "开启"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index c72ea361e02..defda5f688f 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/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: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 08:01+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -38,6 +38,10 @@ msgstr "已存在组"
msgid "Unable to add group"
msgstr "不能添加组"
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "无法开启App"
+
#: ajax/lostpassword.php:14
msgid "Email saved"
msgstr "电子邮件已保存"
@@ -76,15 +80,11 @@ msgstr "不能把用户添加到组 %s"
msgid "Unable to remove user from group %s"
msgstr "不能从组%s中移除用户"
-#: js/apps.js:18
-msgid "Error"
-msgstr "错误"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "禁用"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "启用"
@@ -113,63 +113,67 @@ msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.
msgid "Cron"
msgstr "计划任务"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
-msgstr "为每个装入的页面执行任务"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "每次页面加载完成后执行任务"
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "crop.php 已"
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php已被注册到网络定时任务服务。通过http每分钟调用owncloud根目录的cron.php网页。"
-#: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "实现系统 cron 服务"
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr "使用系统定时任务服务。每分钟通过系统定时任务调用owncloud文件夹中的cron.php文件"
-#: templates/admin.php:41
-msgid "Share API"
-msgstr "共享API"
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "分享"
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr "开启共享API"
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr "允许 应用 使用共享API"
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
msgstr "允许连接"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
msgstr "允许用户使用连接向公众共享"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
msgstr "允许再次共享"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
msgstr "允许用户将共享给他们的项目再次共享"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
msgstr "允许用户向任何人共享"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
msgstr "允许用户只向同组用户共享"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "日志"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "更多"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -220,12 +224,9 @@ msgid "Answer"
msgstr "回答"
#: templates/personal.php:8
-msgid "You use"
-msgstr "您使用了"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "的空间,总容量为"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -236,8 +237,8 @@ msgid "Download"
msgstr "下载"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "密码已修改"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index a34796c9c3d..e59cc26498e 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -3,23 +3,24 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <appweb.cn@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-20 02:05+0200\n"
+"PO-Revision-Date: 2012-09-19 12:44+0000\n"
+"Last-Translator: hanfeng <appweb.cn@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"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
msgid "Host"
-msgstr ""
+msgstr "主机"
#: templates/settings.php:8
msgid ""
@@ -28,15 +29,15 @@ msgstr ""
#: templates/settings.php:9
msgid "Base DN"
-msgstr ""
+msgstr "Base DN"
#: templates/settings.php:9
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "您可以在高级选项卡里为用户和组指定Base DN"
#: templates/settings.php:10
msgid "User DN"
-msgstr ""
+msgstr "User DN"
#: templates/settings.php:10
msgid ""
@@ -47,7 +48,7 @@ msgstr ""
#: templates/settings.php:11
msgid "Password"
-msgstr ""
+msgstr "密码"
#: templates/settings.php:11
msgid "For anonymous access, leave DN and Password empty."
@@ -95,7 +96,7 @@ msgstr ""
#: templates/settings.php:17
msgid "Port"
-msgstr ""
+msgstr "端口"
#: templates/settings.php:18
msgid "Base User Tree"
@@ -167,4 +168,4 @@ msgstr ""
#: templates/settings.php:32
msgid "Help"
-msgstr ""
+msgstr "帮助"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 72df7a953cc..b5cc4be3a01 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/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: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -31,58 +31,62 @@ msgstr "無分類添加?"
msgid "This category already exists: "
msgstr "此分類已經存在:"
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
msgid "Settings"
msgstr "設定"
-#: js/js.js:593
+#: js/js.js:642
msgid "January"
msgstr "一月"
-#: js/js.js:593
+#: js/js.js:642
msgid "February"
msgstr "二月"
-#: js/js.js:593
+#: js/js.js:642
msgid "March"
msgstr "三月"
-#: js/js.js:593
+#: js/js.js:642
msgid "April"
msgstr "四月"
-#: js/js.js:593
+#: js/js.js:642
msgid "May"
msgstr "五月"
-#: js/js.js:593
+#: js/js.js:642
msgid "June"
msgstr "六月"
-#: js/js.js:594
+#: js/js.js:643
msgid "July"
msgstr "七月"
-#: js/js.js:594
+#: js/js.js:643
msgid "August"
msgstr "八月"
-#: js/js.js:594
+#: js/js.js:643
msgid "September"
msgstr "九月"
-#: js/js.js:594
+#: js/js.js:643
msgid "October"
msgstr "十月"
-#: js/js.js:594
+#: js/js.js:643
msgid "November"
msgstr "十一月"
-#: js/js.js:594
+#: js/js.js:643
msgid "December"
msgstr "十二月"
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
msgid "Cancel"
msgstr "取消"
@@ -103,10 +107,110 @@ msgstr "Ok"
msgid "No categories selected for deletion."
msgstr "沒選擇要刪除的分類"
-#: js/oc-vcategories.js:68
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
msgid "Error"
msgstr "錯誤"
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:130
+#, perl-format
+msgid "Shared with you and the group %s by %s"
+msgstr ""
+
+#: js/share.js:132
+#, perl-format
+msgid "Shared with you by %s"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:147 templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "密碼"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:182
+#, perl-format
+msgid "Share via email: %s"
+msgstr ""
+
+#: js/share.js:184
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:210
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:246
+#, perl-format
+msgid "Shared in %s with %s"
+msgstr ""
+
+#: js/share.js:267
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:275
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:277
+msgid "access control"
+msgstr ""
+
+#: js/share.js:280
+msgid "create"
+msgstr ""
+
+#: js/share.js:283
+msgid "update"
+msgstr ""
+
+#: js/share.js:286
+msgid "delete"
+msgstr ""
+
+#: js/share.js:289
+msgid "share"
+msgstr ""
+
+#: js/share.js:313 js/share.js:463
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:485
+msgid "Error setting expiration date"
+msgstr ""
+
#: lostpassword/index.php:26
msgid "ownCloud password reset"
msgstr "ownCloud 密碼重設"
@@ -192,10 +296,6 @@ msgstr "添加"
msgid "Create an <strong>admin account</strong>"
msgstr "建立一個<strong>管理者帳號</strong>"
-#: templates/installation.php:30 templates/login.php:13
-msgid "Password"
-msgstr "密碼"
-
#: templates/installation.php:36
msgid "Advanced"
msgstr "進階"
@@ -237,11 +337,11 @@ msgstr "資料庫主機"
msgid "Finish setup"
msgstr "完成設定"
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
msgid "web services under your control"
msgstr "網路服務已在你控制"
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
msgid "Log out"
msgstr "登出"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index ac4a772abdb..04eb07ba0d4 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/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: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:13+0200\n"
+"PO-Revision-Date: 2012-09-21 23:14+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -54,39 +54,51 @@ msgstr "寫入硬碟失敗"
msgid "Files"
msgstr "檔案"
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
msgid "Delete"
msgstr "刪除"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:188 js/filelist.js:190
msgid "already exists"
msgstr "已經存在"
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "replace"
msgstr "取代"
-#: js/filelist.js:186
+#: js/filelist.js:188
msgid "suggest name"
msgstr ""
-#: js/filelist.js:186 js/filelist.js:188
+#: js/filelist.js:188 js/filelist.js:190
msgid "cancel"
msgstr "取消"
-#: js/filelist.js:235 js/filelist.js:237
+#: js/filelist.js:237 js/filelist.js:239
msgid "replaced"
msgstr ""
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
msgid "undo"
msgstr ""
-#: js/filelist.js:237
+#: js/filelist.js:239
msgid "with"
msgstr ""
#: js/filelist.js:271
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:273
msgid "deleted"
msgstr ""
@@ -102,7 +114,7 @@ msgstr "無法上傳您的檔案因為它可能是一個目錄或檔案大小為
msgid "Upload Error"
msgstr "上傳發生錯誤"
-#: js/files.js:236 js/files.js:341 js/files.js:370
+#: js/files.js:236 js/files.js:341 js/files.js:371
msgid "Pending"
msgstr ""
@@ -110,36 +122,44 @@ msgstr ""
msgid "Upload cancelled."
msgstr "上傳取消"
-#: js/files.js:423
+#: js/files.js:424
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "檔案上傳中. 離開此頁面將會取消上傳."
-#: js/files.js:493
+#: js/files.js:494
msgid "Invalid name, '/' is not allowed."
msgstr "無效的名稱, '/'是不被允許的"
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:667
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:675
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:749 templates/index.php:56
msgid "Size"
msgstr "大小"
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:750 templates/index.php:58
msgid "Modified"
msgstr "修改"
-#: js/files.js:774
+#: js/files.js:777
msgid "folder"
msgstr ""
-#: js/files.js:776
+#: js/files.js:779
msgid "folders"
msgstr ""
-#: js/files.js:784
+#: js/files.js:787
msgid "file"
msgstr ""
-#: js/files.js:786
+#: js/files.js:789
msgid "files"
msgstr ""
@@ -191,7 +211,7 @@ msgstr "資料夾"
msgid "From url"
msgstr "由 url "
-#: templates/index.php:21
+#: templates/index.php:20
msgid "Upload"
msgstr "上傳"
@@ -199,36 +219,36 @@ msgstr "上傳"
msgid "Cancel upload"
msgstr "取消上傳"
-#: templates/index.php:39
+#: templates/index.php:40
msgid "Nothing in here. Upload something!"
msgstr "沒有任何東西。請上傳內容!"
-#: templates/index.php:47
+#: templates/index.php:48
msgid "Name"
msgstr "名稱"
-#: templates/index.php:49
+#: templates/index.php:50
msgid "Share"
msgstr "分享"
-#: templates/index.php:51
+#: templates/index.php:52
msgid "Download"
msgstr "下載"
-#: templates/index.php:64
+#: templates/index.php:75
msgid "Upload too large"
msgstr "上傳過大"
-#: templates/index.php:66
+#: templates/index.php:77
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "你試圖上傳的檔案已超過伺服器的最大容量限制。 "
-#: templates/index.php:71
+#: templates/index.php:82
msgid "Files are being scanned, please wait."
msgstr "正在掃描檔案,請稍等。"
-#: templates/index.php:74
+#: templates/index.php:85
msgid "Current scanning"
msgstr "目前掃描"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 3699385698e..8db01e4d108 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -3,36 +3,47 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <wu0809@msn.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_TW\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/authenticate.php:4
msgid "Password"
-msgstr ""
+msgstr "密碼"
#: templates/authenticate.php:6
msgid "Submit"
+msgstr "送出"
+
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
msgstr ""
-#: templates/public.php:9 templates/public.php:19
-msgid "Download"
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:18
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr "下載"
+
+#: templates/public.php:29
msgid "No preview available for"
-msgstr ""
+msgstr "無法預覽"
-#: templates/public.php:23
+#: templates/public.php:37
msgid "web services under your control"
msgstr ""
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
index 731c9d14f5f..ed8a5565676 100644
--- a/l10n/zh_TW/files_versions.po
+++ b/l10n/zh_TW/files_versions.po
@@ -7,20 +7,24 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-22 01:14+0200\n"
+"PO-Revision-Date: 2012-09-21 23:15+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_TW\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: js/settings-personal.js:31 templates/settings-personal.php:10
msgid "Expire all versions"
msgstr ""
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
#: templates/settings-personal.php:4
msgid "Versions"
msgstr ""
@@ -30,5 +34,9 @@ msgid "This will delete all existing backup versions of your files"
msgstr ""
#: templates/settings.php:3
-msgid "Enable Files Versioning"
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index ed6dc81bc13..a4adf334758 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -5,13 +5,14 @@
# Translators:
# Donahue Chuang <soshinwu@gmail.com>, 2012.
# <weiyu871@ms14.url.com.tw>, 2012.
+# <wu0809@msn.com>, 2012.
# ywang <ywang1007@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-19 02:02+0200\n"
+"PO-Revision-Date: 2012-09-19 00:03+0000\n"
"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -31,10 +32,14 @@ msgstr "認證錯誤"
#: ajax/creategroup.php:19
msgid "Group already exists"
-msgstr ""
+msgstr "群組已存在"
#: ajax/creategroup.php:28
msgid "Unable to add group"
+msgstr "群組增加失敗"
+
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
msgstr ""
#: ajax/lostpassword.php:14
@@ -55,11 +60,11 @@ msgstr "無效請求"
#: ajax/removegroup.php:16
msgid "Unable to delete group"
-msgstr ""
+msgstr "群組刪除錯誤"
#: ajax/removeuser.php:22
msgid "Unable to delete user"
-msgstr ""
+msgstr "使用者刪除錯誤"
#: ajax/setlanguage.php:18
msgid "Language changed"
@@ -68,22 +73,18 @@ msgstr "語言已變更"
#: ajax/togglegroups.php:25
#, php-format
msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "使用者加入群組%s錯誤"
#: ajax/togglegroups.php:31
#, php-format
msgid "Unable to remove user from group %s"
-msgstr ""
-
-#: js/apps.js:18
-msgid "Error"
-msgstr "錯誤"
+msgstr "使用者移出群組%s錯誤"
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
msgid "Disable"
msgstr "停用"
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
msgid "Enable"
msgstr "啟用"
@@ -110,65 +111,69 @@ msgstr ""
#: templates/admin.php:31
msgid "Cron"
-msgstr ""
+msgstr "定期執行"
-#: templates/admin.php:33
-msgid "execute one task with each page loaded"
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+#: templates/admin.php:43
+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:37
-msgid "use systems cron service"
+#: templates/admin.php:49
+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:41
-msgid "Share API"
+#: templates/admin.php:56
+msgid "Sharing"
msgstr ""
-#: templates/admin.php:46
+#: templates/admin.php:61
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:47
+#: templates/admin.php:62
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:51
+#: templates/admin.php:67
msgid "Allow links"
-msgstr ""
+msgstr "允許連結"
-#: templates/admin.php:52
+#: templates/admin.php:68
msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "允許使用者以結連公開分享檔案"
-#: templates/admin.php:56
+#: templates/admin.php:73
msgid "Allow resharing"
-msgstr ""
+msgstr "允許轉貼分享"
-#: templates/admin.php:57
+#: templates/admin.php:74
msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "允許使用者轉貼共享檔案"
-#: templates/admin.php:60
+#: templates/admin.php:79
msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "允許使用者公開分享"
-#: templates/admin.php:62
+#: templates/admin.php:81
msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "僅允許使用者在群組內分享"
-#: templates/admin.php:69
+#: templates/admin.php:88
msgid "Log"
msgstr "紀錄"
-#: templates/admin.php:97
+#: templates/admin.php:116
msgid "More"
msgstr "更多"
-#: templates/admin.php:105
+#: templates/admin.php:124
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -219,12 +224,9 @@ msgid "Answer"
msgstr "答案"
#: templates/personal.php:8
-msgid "You use"
-msgstr "你使用"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "可用"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr ""
#: templates/personal.php:12
msgid "Desktop and Mobile Syncing Clients"
@@ -235,8 +237,8 @@ msgid "Download"
msgstr "下載"
#: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "你的密碼已變更"
+msgid "Your password was changed"
+msgstr ""
#: templates/personal.php:20
msgid "Unable to change your password"
@@ -308,7 +310,7 @@ msgstr "其他"
#: templates/users.php:80 templates/users.php:112
msgid "Group Admin"
-msgstr ""
+msgstr "群組 管理員"
#: templates/users.php:82
msgid "Quota"
diff --git a/lib/app.php b/lib/app.php
index 28f1f16ebaf..288f82d054b 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -397,10 +397,11 @@ class OC_App{
}
/**
- * @brief Read app metadata from the info.xml file
+ * @brief Read all app metadata from the info.xml file
* @param string $appid id of the app or the path of the info.xml file
* @param boolean path (optional)
* @returns array
+ * @note all data is read from info.xml, not just pre-defined fields
*/
public static function getAppInfo($appid,$path=false) {
if($path) {
@@ -442,6 +443,7 @@ class OC_App{
}
}
self::$appInfo[$appid]=$data;
+
return $data;
}
@@ -521,20 +523,90 @@ class OC_App{
}
/**
- * get a list of all apps in the apps folder
+ * @brief: get a list of all apps in the apps folder
+ * @return array or app names (string IDs)
+ * @todo: change the name of this method to getInstalledApps, which is more accurate
*/
public static function getAllApps() {
+
$apps=array();
- foreach(OC::$APPSROOTS as $apps_dir) {
- $dh=opendir($apps_dir['path']);
- while($file=readdir($dh)) {
- if($file[0]!='.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) {
- $apps[]=$file;
+
+ foreach ( OC::$APPSROOTS as $apps_dir ) {
+ if(! is_readable($apps_dir['path'])) {
+ OC_Log::write('core', 'unable to read app folder : ' .$apps_dir['path'] , OC_Log::WARN);
+ continue;
+ }
+ $dh = opendir( $apps_dir['path'] );
+
+ while( $file = readdir( $dh ) ) {
+
+ if (
+ $file[0] != '.'
+ and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php' )
+ ) {
+
+ $apps[] = $file;
+
}
+
}
+
}
+
return $apps;
}
+
+ /**
+ * @brief: get a list of all apps on apps.owncloud.com
+ * @return multi-dimensional array of apps. Keys: id, name, type, typename, personid, license, detailpage, preview, changed, description
+ */
+ public static function getAppstoreApps( $filter = 'approved' ) {
+
+ $catagoryNames = OC_OCSClient::getCategories();
+
+ if ( is_array( $catagoryNames ) ) {
+
+ // Check that categories of apps were retrieved correctly
+ if ( ! $categories = array_keys( $catagoryNames ) ) {
+
+ return false;
+
+ }
+
+ $page = 0;
+
+ $remoteApps = OC_OCSClient::getApplications( $categories, $page, $filter );
+
+ $app1 = array();
+
+ $i = 0;
+
+ foreach ( $remoteApps as $app ) {
+
+ $app1[$i] = $app;
+
+ $app1[$i]['author'] = $app['personid'];
+
+ $app1[$i]['ocs_id'] = $app['id'];
+
+ $app1[$i]['internal'] = $app1[$i]['active'] = 0;
+
+ $i++;
+
+ }
+
+ }
+
+ if ( empty( $app1 ) ) {
+
+ return false;
+
+ } else {
+
+ return $app1;
+
+ }
+ }
/**
* check if the app need updating and update when needed
@@ -550,7 +622,13 @@ class OC_App{
$installedVersion = $versions[$app];
if (version_compare($currentVersion, $installedVersion, '>')) {
OC_Log::write($app, 'starting app upgrade from '.$installedVersion.' to '.$currentVersion, OC_Log::DEBUG);
- OC_App::updateApp($app);
+ try {
+ OC_App::updateApp($app);
+ }
+ catch (Exception $e) {
+ echo 'Failed to upgrade "'.$app.'". Exception="'.$e->getMessage().'"';
+ die;
+ }
OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app));
}
}
@@ -640,7 +718,7 @@ class OC_App{
}
}else{
OC_Log::write('core', 'Can\'t get app storage, app '.$appid.' not enabled', OC_Log::ERROR);
- false;
+ return false;
}
}
}
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index ebd581fc162..639d2392b63 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-require_once '3rdparty/Archive/Tar.php';
+require_once 'Archive/Tar.php';
class OC_Archive_TAR extends OC_Archive{
const PLAIN=0;
@@ -24,7 +24,7 @@ class OC_Archive_TAR extends OC_Archive{
function __construct($source) {
$types=array(null,'gz','bz');
$this->path=$source;
- $this->tar=new Archive_Tar($source,$types[self::getTarType($source)]);
+ $this->tar=new Archive_Tar($source, $types[self::getTarType($source)]);
}
/**
@@ -33,8 +33,8 @@ class OC_Archive_TAR extends OC_Archive{
* @return str
*/
static public function getTarType($file) {
- if(strpos($file,'.')) {
- $extension=substr($file,strrpos($file,'.'));
+ if(strpos($file, '.')) {
+ $extension=substr($file, strrpos($file, '.'));
switch($extension) {
case 'gz':
case 'tgz':
@@ -57,13 +57,13 @@ class OC_Archive_TAR extends OC_Archive{
*/
function addFolder($path) {
$tmpBase=OC_Helper::tmpFolder();
- if(substr($path,-1,1)!='/') {
+ if(substr($path, -1, 1)!='/') {
$path.='/';
}
if($this->fileExists($path)) {
return false;
}
- $parts=explode('/',$path);
+ $parts=explode('/', $path);
$folder=$tmpBase;
foreach($parts as $part) {
$folder.='/'.$part;
@@ -71,7 +71,7 @@ class OC_Archive_TAR extends OC_Archive{
mkdir($folder);
}
}
- $result=$this->tar->addModify(array($tmpBase.$path),'',$tmpBase);
+ $result=$this->tar->addModify(array($tmpBase.$path), '', $tmpBase);
rmdir($tmpBase.$path);
$this->fileList=false;
return $result;
@@ -90,9 +90,9 @@ class OC_Archive_TAR extends OC_Archive{
$header=array();
$dummy='';
$this->tar->_openAppend();
- $result=$this->tar->_addfile($source,$header,$dummy,$dummy,$path);
+ $result=$this->tar->_addfile($source, $header, $dummy, $dummy, $path);
}else{
- $result=$this->tar->addString($path,$source);
+ $result=$this->tar->addString($path, $source);
}
$this->fileList=false;
return $result;
@@ -108,12 +108,12 @@ class OC_Archive_TAR extends OC_Archive{
//no proper way to delete, rename entire archive, rename file and remake archive
$tmp=OCP\Files::tmpFolder();
$this->tar->extract($tmp);
- rename($tmp.$source,$tmp.$dest);
+ rename($tmp.$source, $tmp.$dest);
$this->tar=null;
unlink($this->path);
- $types=array(null,'gz','bz');
- $this->tar=new Archive_Tar($this->path,$types[self::getTarType($this->path)]);
- $this->tar->createModify(array($tmp),'',$tmp.'/');
+ $types=array(null, 'gz', 'bz');
+ $this->tar=new Archive_Tar($this->path, $types[self::getTarType($this->path)]);
+ $this->tar->createModify(array($tmp), '', $tmp.'/');
$this->fileList=false;
return true;
}
@@ -158,14 +158,14 @@ class OC_Archive_TAR extends OC_Archive{
$pathLength=strlen($path);
foreach($files as $file) {
if($file[0]=='/') {
- $file=substr($file,1);
+ $file=substr($file, 1);
}
- if(substr($file,0,$pathLength)==$path and $file!=$path) {
- $result=substr($file,$pathLength);
- if($pos=strpos($result,'/')) {
- $result=substr($result,0,$pos+1);
+ if(substr($file, 0, $pathLength)==$path and $file!=$path) {
+ $result=substr($file, $pathLength);
+ if($pos=strpos($result, '/')) {
+ $result=substr($result, 0, $pos+1);
}
- if(array_search($result,$folderContent)===false) {
+ if(array_search($result, $folderContent)===false) {
$folderContent[]=$result;
}
}
@@ -208,12 +208,12 @@ class OC_Archive_TAR extends OC_Archive{
return false;
}
if($this->fileExists('/'.$path)) {
- $success=$this->tar->extractList(array('/'.$path),$tmp);
+ $success=$this->tar->extractList(array('/'.$path), $tmp);
}else{
- $success=$this->tar->extractList(array($path),$tmp);
+ $success=$this->tar->extractList(array($path), $tmp);
}
if($success) {
- rename($tmp.$path,$dest);
+ rename($tmp.$path, $dest);
}
OCP\Files::rmdirr($tmp);
return $success;
@@ -234,16 +234,16 @@ class OC_Archive_TAR extends OC_Archive{
*/
function fileExists($path) {
$files=$this->getFiles();
- if((array_search($path,$files)!==false) or (array_search($path.'/',$files)!==false)) {
+ if((array_search($path, $files)!==false) or (array_search($path.'/', $files)!==false)) {
return true;
}else{
$folderPath=$path;
- if(substr($folderPath,-1,1)!='/') {
+ if(substr($folderPath, -1, 1)!='/') {
$folderPath.='/';
}
$pathLength=strlen($folderPath);
foreach($files as $file) {
- if(strlen($file)>$pathLength and substr($file,0,$pathLength)==$folderPath) {
+ if(strlen($file)>$pathLength and substr($file, 0, $pathLength)==$folderPath) {
return true;
}
}
@@ -272,7 +272,7 @@ class OC_Archive_TAR extends OC_Archive{
$this->tar=null;
unlink($this->path);
$this->reopen();
- $this->tar->createModify(array($tmp),'',$tmp);
+ $this->tar->createModify(array($tmp), '', $tmp);
return true;
}
/**
@@ -282,23 +282,23 @@ class OC_Archive_TAR extends OC_Archive{
* @return resource
*/
function getStream($path,$mode) {
- if(strrpos($path,'.')!==false) {
- $ext=substr($path,strrpos($path,'.'));
+ if(strrpos($path, '.')!==false) {
+ $ext=substr($path, strrpos($path, '.'));
}else{
$ext='';
}
$tmpFile=OCP\Files::tmpFile($ext);
if($this->fileExists($path)) {
- $this->extractFile($path,$tmpFile);
+ $this->extractFile($path, $tmpFile);
}elseif($mode=='r' or $mode=='rb') {
return false;
}
if($mode=='r' or $mode=='rb') {
- return fopen($tmpFile,$mode);
+ return fopen($tmpFile, $mode);
}else{
OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
self::$tempFiles[$tmpFile]=$path;
- return fopen('close://'.$tmpFile,$mode);
+ return fopen('close://'.$tmpFile, $mode);
}
}
@@ -308,7 +308,7 @@ class OC_Archive_TAR extends OC_Archive{
*/
function writeBack($tmpFile) {
if(isset(self::$tempFiles[$tmpFile])) {
- $this->addFile(self::$tempFiles[$tmpFile],$tmpFile);
+ $this->addFile(self::$tempFiles[$tmpFile], $tmpFile);
unlink($tmpFile);
}
}
@@ -322,6 +322,6 @@ class OC_Archive_TAR extends OC_Archive{
$this->tar=null;
}
$types=array(null,'gz','bz');
- $this->tar=new Archive_Tar($this->path,$types[self::getTarType($this->path)]);
+ $this->tar=new Archive_Tar($this->path, $types[self::getTarType($this->path)]);
}
}
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index 45992ee3d89..a2b07f1a35d 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -16,9 +16,9 @@ class OC_Archive_ZIP extends OC_Archive{
function __construct($source) {
$this->path=$source;
$this->zip=new ZipArchive();
- if($this->zip->open($source,ZipArchive::CREATE)) {
+ if($this->zip->open($source, ZipArchive::CREATE)) {
}else{
- OCP\Util::writeLog('files_archive','Error while opening archive '.$source,OCP\Util::WARN);
+ OCP\Util::writeLog('files_archive', 'Error while opening archive '.$source, OCP\Util::WARN);
}
}
/**
@@ -37,9 +37,9 @@ class OC_Archive_ZIP extends OC_Archive{
*/
function addFile($path,$source='') {
if($source and $source[0]=='/' and file_exists($source)) {
- $result=$this->zip->addFile($source,$path);
+ $result=$this->zip->addFile($source, $path);
}else{
- $result=$this->zip->addFromString($path,$source);
+ $result=$this->zip->addFromString($path, $source);
}
if($result) {
$this->zip->close();//close and reopen to save the zip
@@ -56,7 +56,7 @@ class OC_Archive_ZIP extends OC_Archive{
function rename($source,$dest) {
$source=$this->stripPath($source);
$dest=$this->stripPath($dest);
- $this->zip->renameName($source,$dest);
+ $this->zip->renameName($source, $dest);
}
/**
* get the uncompressed size of a file in the archive
@@ -85,9 +85,9 @@ class OC_Archive_ZIP extends OC_Archive{
$folderContent=array();
$pathLength=strlen($path);
foreach($files as $file) {
- if(substr($file,0,$pathLength)==$path and $file!=$path) {
- if(strrpos(substr($file,0,-1),'/')<=$pathLength) {
- $folderContent[]=substr($file,$pathLength);
+ if(substr($file, 0, $pathLength)==$path and $file!=$path) {
+ if(strrpos(substr($file, 0, -1),'/')<=$pathLength) {
+ $folderContent[]=substr($file, $pathLength);
}
}
}
@@ -121,7 +121,7 @@ class OC_Archive_ZIP extends OC_Archive{
*/
function extractFile($path,$dest) {
$fp = $this->zip->getStream($path);
- file_put_contents($dest,$fp);
+ file_put_contents($dest, $fp);
}
/**
* extract the archive
@@ -162,18 +162,18 @@ class OC_Archive_ZIP extends OC_Archive{
if($mode=='r' or $mode=='rb') {
return $this->zip->getStream($path);
}else{//since we cant directly get a writable stream, make a temp copy of the file and put it back in the archive when the stream is closed
- if(strrpos($path,'.')!==false) {
- $ext=substr($path,strrpos($path,'.'));
+ if(strrpos($path, '.')!==false) {
+ $ext=substr($path, strrpos($path, '.'));
}else{
$ext='';
}
$tmpFile=OCP\Files::tmpFile($ext);
OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
if($this->fileExists($path)) {
- $this->extractFile($path,$tmpFile);
+ $this->extractFile($path, $tmpFile);
}
self::$tempFiles[$tmpFile]=$path;
- return fopen('close://'.$tmpFile,$mode);
+ return fopen('close://'.$tmpFile, $mode);
}
}
@@ -183,14 +183,14 @@ class OC_Archive_ZIP extends OC_Archive{
*/
function writeBack($tmpFile) {
if(isset(self::$tempFiles[$tmpFile])) {
- $this->addFile(self::$tempFiles[$tmpFile],$tmpFile);
+ $this->addFile(self::$tempFiles[$tmpFile], $tmpFile);
unlink($tmpFile);
}
}
private function stripPath($path) {
if(!$path || $path[0]=='/') {
- return substr($path,1);
+ return substr($path, 1);
}else{
return $path;
}
diff --git a/lib/base.php b/lib/base.php
index 3b2ab8d5ebe..7a09946b9db 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -75,7 +75,7 @@ class OC{
/** @TODO: Remove this when necessary
Remove "apps/" from inclusion path for smooth migration to mutli app dir
*/
- $path = preg_replace('/apps\//', '', OC::$CLASSPATH[$className]);
+ $path = str_replace('apps/', '', OC::$CLASSPATH[$className]);
require_once $path;
}
elseif(strpos($className, 'OC_')===0) {
@@ -222,8 +222,10 @@ class OC{
$tmpl->printPage();
exit;
}
- OC_Minimizer::clearCache();
-
+ $minimizerCSS = new OC_Minimizer_CSS();
+ $minimizerCSS->clearCache();
+ $minimizerJS = new OC_Minimizer_JS();
+ $minimizerJS->clearCache();
OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
OC_App::checkAppsRequirements();
// load all apps to also upgrade enabled apps
diff --git a/lib/cache/file.php b/lib/cache/file.php
index a4f83f76c94..27d8b19f36e 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -22,7 +22,7 @@ class OC_Cache_File{
$this->storage = new OC_FilesystemView('/'.OC_User::getUser().'/'.$subdir);
return $this->storage;
}else{
- OC_Log::write('core','Can\'t get cache storage, user not logged in', OC_Log::ERROR);
+ OC_Log::write('core', 'Can\'t get cache storage, user not logged in', OC_Log::ERROR);
return false;
}
}
diff --git a/lib/cache/xcache.php b/lib/cache/xcache.php
index 0739e4a2fa2..cecdf46351c 100644
--- a/lib/cache/xcache.php
+++ b/lib/cache/xcache.php
@@ -29,9 +29,9 @@ class OC_Cache_XCache {
public function set($key, $value, $ttl=0) {
if($ttl>0) {
- return xcache_set($this->getNamespace().$key,$value,$ttl);
+ return xcache_set($this->getNamespace().$key, $value, $ttl);
}else{
- return xcache_set($this->getNamespace().$key,$value);
+ return xcache_set($this->getNamespace().$key, $value);
}
}
diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php
index 34fc5fee50c..0c34c7ea29f 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -36,7 +36,7 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
return true;
} else {
OC_Util::setUpFS();//login hooks may need early access to the filesystem
- if(OC_User::login($username,$password)) {
+ if(OC_User::login($username, $password)) {
OC_Util::setUpFS($username);
return true;
}
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 8fff77ac749..413efef73b7 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -50,17 +50,19 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
public function createFile($name, $data = null) {
if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
$info = OC_FileChunking::decodeName($name);
+ if (empty($info)) {
+ throw new Sabre_DAV_Exception_NotImplemented();
+ }
$chunk_handler = new OC_FileChunking($info);
$chunk_handler->store($info['index'], $data);
if ($chunk_handler->isComplete()) {
$newPath = $this->path . '/' . $info['name'];
- $f = OC_Filesystem::fopen($newPath, 'w');
- $chunk_handler->assemble($f);
+ $chunk_handler->file_assemble($newPath);
return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
}
} else {
$newPath = $this->path . '/' . $name;
- OC_Filesystem::file_put_contents($newPath,$data);
+ OC_Filesystem::file_put_contents($newPath, $data);
return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
}
@@ -91,10 +93,12 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
$path = $this->path . '/' . $name;
if (is_null($info)) {
- $info = OC_FileCache::get($path);
+ $info = OC_Files::getFileInfo($path);
}
- if (!$info) throw new Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located');
+ if (!$info) {
+ throw new Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located');
+ }
if ($info['mimetype'] == 'httpd/unix-directory') {
$node = new OC_Connector_Sabre_Directory($path);
@@ -113,7 +117,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
*/
public function getChildren() {
- $folder_content = OC_FileCache::getFolderContent($this->path);
+ $folder_content = OC_Files::getDirectoryContent($this->path);
$paths = array();
foreach($folder_content as $info) {
$paths[] = $this->path.'/'.$info['name'];
@@ -195,10 +199,9 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
*/
public function getProperties($properties) {
$props = parent::getProperties($properties);
- if (in_array(self::GETETAG_PROPERTYNAME, $properties)
- && !isset($props[self::GETETAG_PROPERTYNAME])) {
- $props[self::GETETAG_PROPERTYNAME] =
- OC_Connector_Sabre_Node::getETagPropertyForPath($this->path);
+ if (in_array(self::GETETAG_PROPERTYNAME, $properties) && !isset($props[self::GETETAG_PROPERTYNAME])) {
+ $props[self::GETETAG_PROPERTYNAME]
+ = OC_Connector_Sabre_Node::getETagPropertyForPath($this->path);
}
return $props;
}
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 2916575e2d5..ecbbef81292 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -235,7 +235,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
static public function removeETagPropertyForPath($path) {
// remove tags from this and parent paths
$paths = array();
- while ($path != '/' && $path != '') {
+ while ($path != '/' && $path != '.' && $path != '') {
$paths[] = $path;
$path = dirname($path);
}
diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php
index cfc72eda9f9..ee95ae63306 100644
--- a/lib/connector/sabre/principal.php
+++ b/lib/connector/sabre/principal.php
@@ -66,7 +66,7 @@ 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);
+ list($prefix, $name) = Sabre_DAV_URLUtil::splitPath($principal);
$principal = $this->getPrincipalByPath($prefix);
if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
@@ -115,6 +115,12 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
public function setGroupMemberSet($principal, array $members) {
throw new Sabre_DAV_Exception('Setting members of the group is not supported yet');
}
- function updatePrincipal($path, $mutations) {return 0;}
- function searchPrincipals($prefixPath, array $searchProperties) {return 0;}
+
+ function updatePrincipal($path, $mutations) {
+ return 0;
+ }
+
+ function searchPrincipals($prefixPath, array $searchProperties) {
+ return 0;
+ }
}
diff --git a/lib/db.php b/lib/db.php
index ee69e5f8299..42bd04e9880 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -187,7 +187,7 @@ class OC_DB {
// Prepare options array
$options = array(
- 'portability' => MDB2_PORTABILITY_ALL & (!MDB2_PORTABILITY_FIX_CASE),
+ 'portability' => MDB2_PORTABILITY_ALL - MDB2_PORTABILITY_FIX_CASE,
'log_line_break' => '<br>',
'idxname_format' => '%s',
'debug' => true,
@@ -226,12 +226,14 @@ class OC_DB {
'phptype' => 'oci8',
'username' => $user,
'password' => $pass,
+ 'charset' => 'AL32UTF8',
);
if ($host != '') {
$dsn['hostspec'] = $host;
$dsn['database'] = $name;
} else { // use dbname for hostspec
$dsn['hostspec'] = $name;
+ $dsn['database'] = $user;
}
break;
}
@@ -297,7 +299,7 @@ class OC_DB {
// Die if we have an error (error means: bad query, not 0 results!)
if( PEAR::isError($result)) {
$entry = 'DB Error: "'.$result->getMessage().'"<br />';
- $entry .= 'Offending command was: '.$query.'<br />';
+ $entry .= 'Offending command was: '.htmlentities($query).'<br />';
OC_Log::write('core', $entry,OC_Log::FATAL);
error_log('DB error: '.$entry);
die( $entry );
@@ -307,7 +309,7 @@ class OC_DB {
$result=self::$connection->prepare($query);
}catch(PDOException $e) {
$entry = 'DB Error: "'.$e->getMessage().'"<br />';
- $entry .= 'Offending command was: '.$query.'<br />';
+ $entry .= 'Offending command was: '.htmlentities($query).'<br />';
OC_Log::write('core', $entry,OC_Log::FATAL);
error_log('DB error: '.$entry);
die( $entry );
@@ -457,7 +459,8 @@ class OC_DB {
$previousSchema = self::$schema->getDefinitionFromDatabase();
if (PEAR::isError($previousSchema)) {
$error = $previousSchema->getMessage();
- OC_Log::write('core', 'Failed to get existing database structure for upgrading ('.$error.')', OC_Log::FATAL);
+ $detail = $previousSchema->getDebugInfo();
+ OC_Log::write('core', 'Failed to get existing database structure for upgrading ('.$error.', '.$detail.')', OC_Log::FATAL);
return false;
}
@@ -649,6 +652,30 @@ class OC_DB {
return false;
}
}
+
+ /**
+ * returns the error code and message as a string for logging
+ * works with MDB2 and PDOException
+ * @param mixed $error
+ * @return string
+ */
+ public static function getErrorMessage($error) {
+ if ( self::$backend==self::BACKEND_MDB2 and PEAR::isError($error) ) {
+ $msg = $error->getCode() . ': ' . $error->getMessage();
+ if (defined('DEBUG') && DEBUG) {
+ $msg .= '(' . $error->getDebugInfo() . ')';
+ }
+ } elseif (self::$backend==self::BACKEND_PDO and self::$PDO) {
+ $msg = self::$PDO->errorCode() . ': ';
+ $errorInfo = self::$PDO->errorInfo();
+ if (is_array($errorInfo)) {
+ $msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
+ $msg .= 'Driver Code = '.$errorInfo[1] . ', ';
+ $msg .= 'Driver Message = '.$errorInfo[2];
+ }
+ }
+ return $msg;
+ }
}
/**
diff --git a/lib/filecache.php b/lib/filecache.php
index adcf97753ed..07099bcccd5 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -481,7 +481,7 @@ class OC_FileCache{
*/
public static function clear($user='') {
if($user) {
- $query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE user=?');
+ $query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE `user`=?');
$query->execute(array($user));
}else{
$query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache`');
diff --git a/lib/filecache/cached.php b/lib/filecache/cached.php
index 261bd2f572b..9b1eb4f7803 100644
--- a/lib/filecache/cached.php
+++ b/lib/filecache/cached.php
@@ -18,11 +18,22 @@ class OC_FileCache_Cached{
$root=OC_Filesystem::getRoot();
}
$path=$root.$path;
- $query=OC_DB::prepare('SELECT `path`,`ctime`,`mtime`,`mimetype`,`size`,`encrypted`,`versioned`,`writable` FROM `*PREFIX*fscache` WHERE `path_hash`=?');
- $result=$query->execute(array(md5($path)))->fetchRow();
+ $stmt=OC_DB::prepare('SELECT `path`,`ctime`,`mtime`,`mimetype`,`size`,`encrypted`,`versioned`,`writable` FROM `*PREFIX*fscache` WHERE `path_hash`=?');
+ if ( ! OC_DB::isError($stmt) ) {
+ $result=$stmt->execute(array(md5($path)));
+ if ( ! OC_DB::isError($result) ) {
+ $result = $result->fetchRow();
+ } else {
+ OC:Log::write('OC_FileCache_Cached', 'could not execute get: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
+ $result = false;
+ }
+ } else {
+ OC_Log::write('OC_FileCache_Cached', 'could not prepare get: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+ $result = false;
+ }
if(is_array($result)) {
if(isset(self::$savedData[$path])) {
- $result=array_merge($result,self::$savedData[$path]);
+ $result=array_merge($result, self::$savedData[$path]);
}
return $result;
}else{
@@ -54,7 +65,7 @@ class OC_FileCache_Cached{
if($root===false) {
$root=OC_Filesystem::getRoot();
}
- $parent=OC_FileCache::getId($path,$root);
+ $parent=OC_FileCache::getId($path, $root);
if($parent==-1) {
return array();
}
@@ -63,7 +74,7 @@ class OC_FileCache_Cached{
if(is_array($result)) {
return $result;
}else{
- OC_Log::write('files','getFolderContent(): file not found in cache ('.$path.')',OC_Log::DEBUG);
+ OC_Log::write('files', 'getFolderContent(): file not found in cache ('.$path.')', OC_Log::DEBUG);
return false;
}
}
diff --git a/lib/filecache/update.php b/lib/filecache/update.php
index 3d10f5ea7b6..2b64a2a90ff 100644
--- a/lib/filecache/update.php
+++ b/lib/filecache/update.php
@@ -27,13 +27,13 @@ class OC_FileCache_Update{
if(!$view->file_exists($path)) {
return false;
}
- $cachedData=OC_FileCache_Cached::get($path,$root);
+ $cachedData=OC_FileCache_Cached::get($path, $root);
if(isset($cachedData['mtime'])) {
$cachedMTime=$cachedData['mtime'];
if($folder) {
- return $view->hasUpdated($path.'/',$cachedMTime);
+ return $view->hasUpdated($path.'/', $cachedMTime);
}else{
- return $view->hasUpdated($path,$cachedMTime);
+ return $view->hasUpdated($path, $cachedMTime);
}
}else{//file not in cache, so it has to be updated
if(($path=='/' or $path=='') and $root===false) {//dont auto update the home folder, it will be scanned
@@ -59,9 +59,9 @@ class OC_FileCache_Update{
$file=$view->getRelativePath($path);
if(!$view->file_exists($file)) {
if($root===false) {//filesystem hooks are only valid for the default root
- OC_Hook::emit('OC_Filesystem','post_delete',array('path'=>$file));
+ OC_Hook::emit('OC_Filesystem', 'post_delete', array('path'=>$file));
}else{
- self::delete($file,$root);
+ self::delete($file, $root);
}
}
}
@@ -83,24 +83,24 @@ class OC_FileCache_Update{
while (($filename = readdir($dh)) !== false) {
if($filename != '.' and $filename != '..') {
$file=$path.'/'.$filename;
- if(self::hasUpdated($file,$root)) {
+ if(self::hasUpdated($file, $root)) {
if($root===false) {//filesystem hooks are only valid for the default root
- OC_Hook::emit('OC_Filesystem','post_write',array('path'=>$file));
+ OC_Hook::emit('OC_Filesystem', 'post_write', array('path'=>$file));
}else{
- self::update($file,$root);
+ self::update($file, $root);
}
}
}
}
}
- self::cleanFolder($path,$root);
+ self::cleanFolder($path, $root);
//update the folder last, so we can calculate the size correctly
if($root===false) {//filesystem hooks are only valid for the default root
- OC_Hook::emit('OC_Filesystem','post_write',array('path'=>$path));
+ OC_Hook::emit('OC_Filesystem', 'post_write', array('path'=>$path));
}else{
- self::update($path,$root);
+ self::update($path, $root);
}
}
@@ -132,7 +132,7 @@ class OC_FileCache_Update{
public static function fileSystemWatcherRename($params) {
$oldPath=$params['oldpath'];
$newPath=$params['newpath'];
- self::rename($oldPath,$newPath);
+ self::rename($oldPath, $newPath);
}
/**
@@ -154,24 +154,24 @@ class OC_FileCache_Update{
$cachedSize=isset($cached['size'])?$cached['size']:0;
if($view->is_dir($path.'/')) {
- if(OC_FileCache::inCache($path,$root)) {
- $cachedContent=OC_FileCache_Cached::getFolderContent($path,$root);
+ if(OC_FileCache::inCache($path, $root)) {
+ $cachedContent=OC_FileCache_Cached::getFolderContent($path, $root);
foreach($cachedContent as $file) {
$size+=$file['size'];
}
$mtime=$view->filemtime($path.'/');
$ctime=$view->filectime($path.'/');
$writable=$view->is_writable($path.'/');
- OC_FileCache::put($path,array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype,'writable'=>$writable));
+ OC_FileCache::put($path, array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype,'writable'=>$writable));
}else{
$count=0;
- OC_FileCache::scan($path,null,$count,$root);
+ OC_FileCache::scan($path, null, $count, $root);
return; //increaseSize is already called inside scan
}
}else{
- $size=OC_FileCache::scanFile($path,$root);
+ $size=OC_FileCache::scanFile($path, $root);
}
- OC_FileCache::increaseSize(dirname($path),$size-$cachedSize,$root);
+ OC_FileCache::increaseSize(dirname($path), $size-$cachedSize, $root);
}
/**
@@ -180,13 +180,13 @@ class OC_FileCache_Update{
* @param string root (optional)
*/
public static function delete($path,$root=false) {
- $cached=OC_FileCache_Cached::get($path,$root);
+ $cached=OC_FileCache_Cached::get($path, $root);
if(!isset($cached['size'])) {
return;
}
$size=$cached['size'];
- OC_FileCache::increaseSize(dirname($path),-$size,$root);
- OC_FileCache::delete($path,$root);
+ OC_FileCache::increaseSize(dirname($path), -$size, $root);
+ OC_FileCache::delete($path, $root);
}
/**
@@ -196,7 +196,7 @@ class OC_FileCache_Update{
* @param string root (optional)
*/
public static function rename($oldPath,$newPath,$root=false) {
- if(!OC_FileCache::inCache($oldPath,$root)) {
+ if(!OC_FileCache::inCache($oldPath, $root)) {
return;
}
if($root===false) {
@@ -205,10 +205,10 @@ class OC_FileCache_Update{
$view=new OC_FilesystemView($root);
}
- $cached=OC_FileCache_Cached::get($oldPath,$root);
+ $cached=OC_FileCache_Cached::get($oldPath, $root);
$oldSize=$cached['size'];
- OC_FileCache::increaseSize(dirname($oldPath),-$oldSize,$root);
- OC_FileCache::increaseSize(dirname($newPath),$oldSize,$root);
- OC_FileCache::move($oldPath,$newPath);
+ OC_FileCache::increaseSize(dirname($oldPath), -$oldSize, $root);
+ OC_FileCache::increaseSize(dirname($newPath), $oldSize, $root);
+ OC_FileCache::move($oldPath, $newPath);
}
} \ No newline at end of file
diff --git a/lib/filechunking.php b/lib/filechunking.php
index d03af226d8b..5ab33c77ad7 100644
--- a/lib/filechunking.php
+++ b/lib/filechunking.php
@@ -55,12 +55,13 @@ class OC_FileChunking {
public function assemble($f) {
$cache = $this->getCache();
$prefix = $this->getPrefix();
+ $count = 0;
for($i=0; $i < $this->info['chunkcount']; $i++) {
$chunk = $cache->get($prefix.$i);
$cache->remove($prefix.$i);
- fwrite($f,$chunk);
+ $count += fwrite($f,$chunk);
}
- fclose($f);
+ return $count;
}
public function signature_split($orgfile, $input) {
@@ -91,4 +92,57 @@ class OC_FileChunking {
'count' => $count,
);
}
+
+ public function file_assemble($path) {
+ $absolutePath = OC_Filesystem::normalizePath(OC_Filesystem::getView()->getAbsolutePath($path));
+ $data = '';
+ // use file_put_contents as method because that best matches what this function does
+ if (OC_FileProxy::runPreProxies('file_put_contents', $absolutePath, $data) && OC_Filesystem::isValidPath($path)) {
+ $path = OC_Filesystem::getView()->getRelativePath($absolutePath);
+ $exists = OC_Filesystem::file_exists($path);
+ $run = true;
+ if(!$exists) {
+ OC_Hook::emit(
+ OC_Filesystem::CLASSNAME,
+ OC_Filesystem::signal_create,
+ array(
+ OC_Filesystem::signal_param_path => $path,
+ OC_Filesystem::signal_param_run => &$run
+ )
+ );
+ }
+ OC_Hook::emit(
+ OC_Filesystem::CLASSNAME,
+ OC_Filesystem::signal_write,
+ array(
+ OC_Filesystem::signal_param_path => $path,
+ OC_Filesystem::signal_param_run => &$run
+ )
+ );
+ if(!$run) {
+ return false;
+ }
+ $target = OC_Filesystem::fopen($path, 'w');
+ if($target) {
+ $count = $this->assemble($target);
+ fclose($target);
+ if(!$exists) {
+ OC_Hook::emit(
+ OC_Filesystem::CLASSNAME,
+ OC_Filesystem::signal_post_create,
+ array( OC_Filesystem::signal_param_path => $path)
+ );
+ }
+ OC_Hook::emit(
+ OC_Filesystem::CLASSNAME,
+ OC_Filesystem::signal_post_write,
+ array( OC_Filesystem::signal_param_path => $path)
+ );
+ OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count);
+ return $count > 0;
+ }else{
+ return false;
+ }
+ }
+ }
}
diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index adbff3d301a..5a0dbdb6fe2 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -26,6 +26,7 @@
*/
class OC_FileProxy_Quota extends OC_FileProxy{
+ static $rootView;
private $userQuota=-1;
/**
@@ -86,7 +87,10 @@ class OC_FileProxy_Quota extends OC_FileProxy{
}
public function preCopy($path1,$path2) {
- return (OC_Filesystem::filesize($path1)<$this->getFreeSpace() or $this->getFreeSpace()==0);
+ if(!self::$rootView){
+ self::$rootView = new OC_FilesystemView('');
+ }
+ return (self::$rootView->filesize($path1)<$this->getFreeSpace() or $this->getFreeSpace()==0);
}
public function preFromTmpFile($tmpfile,$path) {
@@ -96,4 +100,4 @@ class OC_FileProxy_Quota extends OC_FileProxy{
public function preFromUploadedFile($tmpfile,$path) {
return (filesize($tmpfile)<$this->getFreeSpace() or $this->getFreeSpace()==0);
}
-} \ No newline at end of file
+}
diff --git a/lib/files.php b/lib/files.php
index 63dd96b9509..360614caec9 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -29,6 +29,35 @@ class OC_Files {
static $tmpFiles=array();
/**
+ * get the filesystem info
+ * @param string path
+ * @return array
+ *
+ * returns an associative array with the following keys:
+ * - size
+ * - mtime
+ * - ctime
+ * - mimetype
+ * - encrypted
+ * - versioned
+ */
+ public static function getFileInfo($path) {
+ if (($path == '/Shared' || substr($path, 0, 8) == '/Shared/') && OC_App::isEnabled('files_sharing')) {
+ if ($path == '/Shared') {
+ $info = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP_ROOT);
+ }
+ else {
+ $info = OCP\Share::getItemSharedWith('file', '/'.$name, OC_Share_Backend_File::FORMAT_FILE_APP);
+ }
+ $info = $info[0];
+ }
+ else {
+ $info = OC_FileCache::get($path);
+ }
+ return $info;
+ }
+
+ /**
* get the content of a directory
* @param dir $directory path under datadirectory
*/
diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index 78e4877a005..66ae5542e36 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -173,7 +173,7 @@ class Local extends \OC\Files\Storage\Common{
}
public function free_space($path) {
- return disk_free_space($this->datadir.$path);
+ return @disk_free_space($this->datadir.$path);
}
public function search($query) {
diff --git a/lib/filesystem.php b/lib/filesystem.php
index ef8b3fef5bb..e936dfcce26 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -375,7 +375,7 @@ class OC_Filesystem{
* @return string
*/
static public function getLocalPath($path) {
- $datadir = OC_User::getHome($user).'/files';
+ $datadir = OC_User::getHome(OC_User::getUser()).'/files';
$newpath = $path;
if (strncmp($newpath, $datadir, strlen($datadir)) == 0) {
$newpath = substr($path, strlen($datadir));
@@ -545,6 +545,7 @@ class OC_Filesystem{
} else {
$path=$params['oldpath'];
}
+ $path = self::normalizePath($path);
OC_Connector_Sabre_Node::removeETagPropertyForPath($path);
}
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 36fef485513..678e6703cf0 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -263,24 +263,26 @@ class OC_FilesystemView {
$path = $this->getRelativePath($absolutePath);
$exists = $this->file_exists($path);
$run = true;
- if(!$exists) {
+ if( $this->fakeRoot==OC_Filesystem::getRoot() ){
+ if(!$exists) {
+ OC_Hook::emit(
+ OC_Filesystem::CLASSNAME,
+ OC_Filesystem::signal_create,
+ array(
+ OC_Filesystem::signal_param_path => $path,
+ OC_Filesystem::signal_param_run => &$run
+ )
+ );
+ }
OC_Hook::emit(
OC_Filesystem::CLASSNAME,
- OC_Filesystem::signal_create,
+ OC_Filesystem::signal_write,
array(
OC_Filesystem::signal_param_path => $path,
OC_Filesystem::signal_param_run => &$run
)
);
}
- OC_Hook::emit(
- OC_Filesystem::CLASSNAME,
- OC_Filesystem::signal_write,
- array(
- OC_Filesystem::signal_param_path => $path,
- OC_Filesystem::signal_param_run => &$run
- )
- );
if(!$run) {
return false;
}
@@ -289,18 +291,20 @@ class OC_FilesystemView {
$count=OC_Helper::streamCopy($data, $target);
fclose($target);
fclose($data);
- if(!$exists) {
+ if( $this->fakeRoot==OC_Filesystem::getRoot() ){
+ if(!$exists) {
+ OC_Hook::emit(
+ OC_Filesystem::CLASSNAME,
+ OC_Filesystem::signal_post_create,
+ array( OC_Filesystem::signal_param_path => $path)
+ );
+ }
OC_Hook::emit(
OC_Filesystem::CLASSNAME,
- OC_Filesystem::signal_post_create,
+ OC_Filesystem::signal_post_write,
array( OC_Filesystem::signal_param_path => $path)
);
}
- OC_Hook::emit(
- OC_Filesystem::CLASSNAME,
- OC_Filesystem::signal_post_write,
- array( OC_Filesystem::signal_param_path => $path)
- );
OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count);
return $count > 0;
}else{
@@ -330,14 +334,16 @@ class OC_FilesystemView {
return false;
}
$run=true;
- OC_Hook::emit(
- OC_Filesystem::CLASSNAME, OC_Filesystem::signal_rename,
- array(
- OC_Filesystem::signal_param_oldpath => $path1,
- OC_Filesystem::signal_param_newpath => $path2,
- OC_Filesystem::signal_param_run => &$run
- )
- );
+ if( $this->fakeRoot==OC_Filesystem::getRoot() ){
+ OC_Hook::emit(
+ OC_Filesystem::CLASSNAME, OC_Filesystem::signal_rename,
+ array(
+ OC_Filesystem::signal_param_oldpath => $path1,
+ OC_Filesystem::signal_param_newpath => $path2,
+ OC_Filesystem::signal_param_run => &$run
+ )
+ );
+ }
if($run) {
$mp1 = $this->getMountPoint($path1.$postFix1);
$mp2 = $this->getMountPoint($path2.$postFix2);
@@ -353,14 +359,16 @@ class OC_FilesystemView {
$storage1->unlink($this->getInternalPath($path1.$postFix1));
$result = $count>0;
}
- OC_Hook::emit(
- OC_Filesystem::CLASSNAME,
- OC_Filesystem::signal_post_rename,
- array(
- OC_Filesystem::signal_param_oldpath => $path1,
- OC_Filesystem::signal_param_newpath => $path2
- )
- );
+ if( $this->fakeRoot==OC_Filesystem::getRoot() ){
+ OC_Hook::emit(
+ OC_Filesystem::CLASSNAME,
+ OC_Filesystem::signal_post_rename,
+ array(
+ OC_Filesystem::signal_param_oldpath => $path1,
+ OC_Filesystem::signal_param_newpath => $path2
+ )
+ );
+ }
return $result;
}
}
@@ -378,35 +386,37 @@ class OC_FilesystemView {
return false;
}
$run=true;
- OC_Hook::emit(
- OC_Filesystem::CLASSNAME,
- OC_Filesystem::signal_copy,
- array(
- OC_Filesystem::signal_param_oldpath => $path1,
- OC_Filesystem::signal_param_newpath=>$path2,
- OC_Filesystem::signal_param_run => &$run
- )
- );
- $exists=$this->file_exists($path2);
- if($run and !$exists) {
+ if( $this->fakeRoot==OC_Filesystem::getRoot() ){
OC_Hook::emit(
OC_Filesystem::CLASSNAME,
- OC_Filesystem::signal_create,
+ OC_Filesystem::signal_copy,
array(
- OC_Filesystem::signal_param_path => $path2,
- OC_Filesystem::signal_param_run => &$run
- )
- );
- }
- if($run) {
- OC_Hook::emit(
- OC_Filesystem::CLASSNAME,
- OC_Filesystem::signal_write,
- array(
- OC_Filesystem::signal_param_path => $path2,
+ OC_Filesystem::signal_param_oldpath => $path1,
+ OC_Filesystem::signal_param_newpath=>$path2,
OC_Filesystem::signal_param_run => &$run
)
);
+ $exists=$this->file_exists($path2);
+ if($run and !$exists) {
+ OC_Hook::emit(
+ OC_Filesystem::CLASSNAME,
+ OC_Filesystem::signal_create,
+ array(
+ OC_Filesystem::signal_param_path => $path2,
+ OC_Filesystem::signal_param_run => &$run
+ )
+ );
+ }
+ if($run) {
+ OC_Hook::emit(
+ OC_Filesystem::CLASSNAME,
+ OC_Filesystem::signal_write,
+ array(
+ OC_Filesystem::signal_param_path => $path2,
+ OC_Filesystem::signal_param_run => &$run
+ )
+ );
+ }
}
if($run) {
$mp1=$this->getMountPoint($path1.$postFix1);
@@ -420,26 +430,28 @@ class OC_FilesystemView {
$target = $this->fopen($path2.$postFix2, 'w');
$result = OC_Helper::streamCopy($source, $target);
}
- OC_Hook::emit(
- OC_Filesystem::CLASSNAME,
- OC_Filesystem::signal_post_copy,
- array(
- OC_Filesystem::signal_param_oldpath => $path1,
- OC_Filesystem::signal_param_newpath=>$path2
- )
- );
- if(!$exists) {
+ if( $this->fakeRoot==OC_Filesystem::getRoot() ){
OC_Hook::emit(
OC_Filesystem::CLASSNAME,
- OC_Filesystem::signal_post_create,
- array(OC_Filesystem::signal_param_path => $path2)
+ OC_Filesystem::signal_post_copy,
+ array(
+ OC_Filesystem::signal_param_oldpath => $path1,
+ OC_Filesystem::signal_param_newpath=>$path2
+ )
+ );
+ if(!$exists) {
+ OC_Hook::emit(
+ OC_Filesystem::CLASSNAME,
+ OC_Filesystem::signal_post_create,
+ array(OC_Filesystem::signal_param_path => $path2)
+ );
+ }
+ OC_Hook::emit(
+ OC_Filesystem::CLASSNAME,
+ OC_Filesystem::signal_post_write,
+ array( OC_Filesystem::signal_param_path => $path2)
);
}
- OC_Hook::emit(
- OC_Filesystem::CLASSNAME,
- OC_Filesystem::signal_post_write,
- array( OC_Filesystem::signal_param_path => $path2)
- );
return $result;
}
}
diff --git a/lib/helper.php b/lib/helper.php
index 70b2f78862b..e70379d1731 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -62,8 +62,11 @@ class OC_Helper {
}
}
- foreach($args as $k => $v) {
- $urlLinkTo .= '&'.$k.'='.$v;
+ if (!empty($args)) {
+ $urlLinkTo .= '?';
+ foreach($args as $k => $v) {
+ $urlLinkTo .= '&'.$k.'='.$v;
+ }
}
return $urlLinkTo;
@@ -654,7 +657,7 @@ class OC_Helper {
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))) {
+ 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) - 1;
$count++;
diff --git a/lib/image.php b/lib/image.php
index f4b3c2cc071..861353e039d 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -543,21 +543,7 @@ class OC_Image {
$new_height = $maxsize;
}
- $process = imagecreatetruecolor(round($new_width), round($new_height));
- if ($process == false) {
- OC_Log::write('core',__METHOD__.'(): Error creating true color image',OC_Log::ERROR);
- imagedestroy($process);
- return false;
- }
-
- imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
- if ($process == false) {
- OC_Log::write('core',__METHOD__.'(): Error resampling process image '.$new_width.'x'.$new_height,OC_Log::ERROR);
- imagedestroy($process);
- return false;
- }
- imagedestroy($this->resource);
- $this->resource = $process;
+ $this->preciseResize(round($new_width), round($new_height));
return true;
}
@@ -666,6 +652,28 @@ class OC_Image {
return true;
}
+ /**
+ * @brief Resizes the image to fit within a boundry while preserving ratio.
+ * @param $maxWidth
+ * @param $maxHeight
+ * @returns bool
+ */
+ public function fitIn($maxWidth, $maxHeight) {
+ if(!$this->valid()) {
+ OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR);
+ return false;
+ }
+ $width_orig=imageSX($this->resource);
+ $height_orig=imageSY($this->resource);
+ $ratio = $width_orig/$height_orig;
+
+ $newWidth = min($maxWidth, $ratio*$maxHeight);
+ $newHeight = min($maxHeight, $maxWidth/$ratio);
+
+ $this->preciseResize(round($newWidth), round($newHeight));
+ return true;
+ }
+
public function destroy() {
if($this->valid()) {
imagedestroy($this->resource);
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index 7a9ee26b477..5c68174fa07 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -21,5 +21,7 @@
"last month" => "Sidste måned",
"months ago" => "måneder siden",
"last year" => "Sidste år",
-"years ago" => "år siden"
+"years ago" => "år siden",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s er tilgængelig. Få <a href=\"%s\">mere information</a>",
+"up to date" => "opdateret"
);
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 4a567003de2..aea631aba28 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -14,10 +14,10 @@
"Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.",
"seconds ago" => "Vor wenigen Sekunden",
"1 minute ago" => "Vor einer Minute",
-"%d minutes ago" => "Vor %d Minuten",
+"%d minutes ago" => "Vor %d Minute(n)",
"today" => "Heute",
"yesterday" => "Gestern",
-"%d days ago" => "Vor %d Tagen",
+"%d days ago" => "Vor %d Tag(en)",
"last month" => "Letzten Monat",
"months ago" => "Vor Monaten",
"last year" => "Letztes Jahr",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index d9f272258e1..e4e12490711 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -11,7 +11,7 @@
"Selected files too large to generate zip file." => "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip.",
"Application is not enabled" => "Δεν ενεργοποιήθηκε η εφαρμογή",
"Authentication error" => "Σφάλμα πιστοποίησης",
-"Token expired. Please reload page." => "Το αναγνωριστικό έληξε. Παρακαλώ επανα-φορτώστε την σελίδα.",
+"Token expired. Please reload page." => "Το αναγνωριστικό έληξε. Παρακαλώ φορτώστε ξανά την σελίδα.",
"seconds ago" => "δευτερόλεπτα πριν",
"1 minute ago" => "1 λεπτό πριν",
"%d minutes ago" => "%d λεπτά πριν",
@@ -21,5 +21,8 @@
"last month" => "τον προηγούμενο μήνα",
"months ago" => "μήνες πριν",
"last year" => "τον προηγούμενο χρόνο",
-"years ago" => "χρόνια πριν"
+"years ago" => "χρόνια πριν",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s είναι διαθέσιμα. Δείτε <a href=\"%s\">περισσότερες πληροφορίες</a>",
+"up to date" => "ενημερωμένο",
+"updates check is disabled" => "ο έλεγχος ενημερώσεων είναι απενεργοποιημένος"
);
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index 3f89e2eca73..b3c1c52ecee 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -21,5 +21,8 @@
"last month" => "lasta monato",
"months ago" => "monatojn antaŭe",
"last year" => "lasta jaro",
-"years ago" => "jarojn antaŭe"
+"years ago" => "jarojn antaŭe",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s haveblas. Ekhavu <a href=\"%s\">pli da informo</a>",
+"up to date" => "ĝisdata",
+"updates check is disabled" => "ĝisdateckontrolo estas malkapabligita"
);
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index d8da90a3cbf..87f222af838 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -21,5 +21,8 @@
"last month" => "eelmisel kuul",
"months ago" => "kuud tagasi",
"last year" => "eelmisel aastal",
-"years ago" => "aastat tagasi"
+"years ago" => "aastat tagasi",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s on saadaval. Vaata <a href=\"%s\">lisainfot</a>",
+"up to date" => "ajakohane",
+"updates check is disabled" => "uuenduste kontrollimine on välja lülitatud"
);
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
new file mode 100644
index 00000000000..7a9de627c2d
--- /dev/null
+++ b/lib/l10n/gl.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Axuda",
+"Personal" => "Personal",
+"Settings" => "Preferencias",
+"Users" => "Usuarios",
+"Apps" => "Apps",
+"Admin" => "Administración",
+"ZIP download is turned off." => "Descargas ZIP está deshabilitadas",
+"Files need to be downloaded one by one." => "Os ficheiros necesitan ser descargados de un en un",
+"Back to Files" => "Voltar a ficheiros",
+"Selected files too large to generate zip file." => "Os ficheiros seleccionados son demasiado grandes para xerar un ficheiro ZIP",
+"Application is not enabled" => "O aplicativo non está habilitado",
+"Authentication error" => "Erro na autenticación",
+"Token expired. Please reload page." => "Testemuño caducado. Por favor recargue a páxina.",
+"seconds ago" => "hai segundos",
+"1 minute ago" => "hai 1 minuto",
+"%d minutes ago" => "hai %d minutos",
+"today" => "hoxe",
+"yesterday" => "onte",
+"%d days ago" => "hai %d días",
+"last month" => "último mes",
+"months ago" => "meses atrás",
+"last year" => "último ano",
+"years ago" => "anos atrás",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s está dispoñible. Obteña <a href=\"%s\">máis información</a>",
+"up to date" => "ao día",
+"updates check is disabled" => "comprobación de actualizacións está deshabilitada"
+);
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
new file mode 100644
index 00000000000..5fffeec2335
--- /dev/null
+++ b/lib/l10n/ro.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Ajutor",
+"Personal" => "Personal",
+"Settings" => "Setări",
+"Users" => "Utilizatori",
+"Apps" => "Aplicații",
+"Admin" => "Admin",
+"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.",
+"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.",
+"seconds ago" => "secunde în urmă",
+"1 minute ago" => "1 minut în urmă",
+"%d minutes ago" => "%d minute în urmă",
+"today" => "astăzi",
+"yesterday" => "ieri",
+"%d days ago" => "%d zile în urmă",
+"last month" => "ultima lună",
+"months ago" => "luni în urmă",
+"last year" => "ultimul an",
+"years ago" => "ani în urmă",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s este disponibil. Vezi <a href=\"%s\">mai multe informații</a>",
+"up to date" => "la zi",
+"updates check is disabled" => "verificarea după actualizări este dezactivată"
+);
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 3b2681ba8d1..74425f0e134 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -22,5 +22,7 @@
"months ago" => "месяцы назад",
"last year" => "в прошлом году",
"years ago" => "годы назад",
+"%s is available. Get <a href=\"%s\">more information</a>" => "Возможно обновление до %s. <a href=\"%s\">Подробнее</a>",
+"up to date" => "актуальная версия",
"updates check is disabled" => "проверка обновлений отключена"
);
diff --git a/lib/l10n/ru_RU.php b/lib/l10n/ru_RU.php
new file mode 100644
index 00000000000..1e691993014
--- /dev/null
+++ b/lib/l10n/ru_RU.php
@@ -0,0 +1,27 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Помощь",
+"Personal" => "Персональный",
+"Settings" => "Настройки",
+"Users" => "Пользователи",
+"Apps" => "Приложения",
+"Admin" => "Админ",
+"Files need to be downloaded one by one." => "Файлы должны быть загружены один за другим.",
+"Back to Files" => "Обратно к файлам",
+"Selected files too large to generate zip file." => "Выбранные файлы слишком велики для генерации zip-архива.",
+"Application is not enabled" => "Приложение не запущено",
+"Authentication error" => "Ошибка аутентификации",
+"Token expired. Please reload page." => "Маркер истек. Пожалуйста, перезагрузите страницу.",
+"seconds ago" => "секунд назад",
+"1 minute ago" => "1 минуту назад",
+"%d minutes ago" => "%d минут назад",
+"today" => "сегодня",
+"yesterday" => "вчера",
+"%d days ago" => "%d дней назад",
+"last month" => "в прошлом месяце",
+"months ago" => "месяц назад",
+"last year" => "в прошлом году",
+"years ago" => "год назад",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s доступно. Получите <a href=\"%s\">more information</a>",
+"up to date" => "до настоящего времени",
+"updates check is disabled" => "Проверка обновлений отключена"
+);
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
new file mode 100644
index 00000000000..33b329c30bb
--- /dev/null
+++ b/lib/l10n/sk_SK.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Pomoc",
+"Personal" => "Osobné",
+"Settings" => "Nastavenia",
+"Users" => "Užívatelia",
+"Apps" => "Aplikácie",
+"Admin" => "Správca",
+"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.",
+"Application is not enabled" => "Aplikácia nie je zapnutá",
+"Authentication error" => "Chyba autentifikácie",
+"1 minute ago" => "pred 1 minútou",
+"%d minutes ago" => "pred %d minútami",
+"today" => "dnes",
+"yesterday" => "včera",
+"%d days ago" => "pred %d dňami",
+"last month" => "minulý mesiac",
+"months ago" => "pred mesiacmi",
+"last year" => "minulý rok",
+"years ago" => "pred rokmi",
+"up to date" => "aktuálny",
+"updates check is disabled" => "sledovanie aktualizácií je vypnuté"
+);
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 273773f2f7b..eac839e78f3 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -12,16 +12,16 @@
"Application is not enabled" => "Aplikacija ni omogočena",
"Authentication error" => "Napaka overitve",
"Token expired. Please reload page." => "Žeton je potekel. Prosimo, če spletno stran znova naložite.",
-"seconds ago" => "sekund nazaj",
+"seconds ago" => "pred nekaj sekundami",
"1 minute ago" => "pred minuto",
"%d minutes ago" => "pred %d minutami",
"today" => "danes",
"yesterday" => "včeraj",
"%d days ago" => "pred %d dnevi",
"last month" => "prejšnji mesec",
-"months ago" => "mesecev nazaj",
+"months ago" => "pred nekaj meseci",
"last year" => "lani",
-"years ago" => "let nazaj",
+"years ago" => "pred nekaj leti",
"%s is available. Get <a href=\"%s\">more information</a>" => "%s je na voljo. <a href=\"%s\">Več informacij.</a>",
"up to date" => "ažuren",
"updates check is disabled" => "preverjanje za posodobitve je onemogočeno"
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 18f6a4a623d..423aa12b2d7 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -20,5 +20,6 @@
"last month" => "минулого місяця",
"months ago" => "місяці тому",
"last year" => "минулого року",
-"years ago" => "роки тому"
+"years ago" => "роки тому",
+"updates check is disabled" => "перевірка оновлень відключена"
);
diff --git a/lib/l10n/vi.php b/lib/l10n/vi.php
new file mode 100644
index 00000000000..fc41d69819a
--- /dev/null
+++ b/lib/l10n/vi.php
@@ -0,0 +1,28 @@
+<?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ị",
+"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.",
+"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.",
+"seconds ago" => "1 giây trước",
+"1 minute ago" => "1 phút trước",
+"%d minutes ago" => "%d phút trước",
+"today" => "hôm nay",
+"yesterday" => "hôm qua",
+"%d days ago" => "%d ngày trước",
+"last month" => "tháng trước",
+"months ago" => "tháng trước",
+"last year" => "năm trước",
+"years ago" => "năm trước",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s có sẵn. <a href=\"%s\">xem thêm ở đây</a>",
+"up to date" => "đến ngày",
+"updates check is disabled" => "đã TĂT chức năng cập nhật "
+);
diff --git a/lib/l10n/zh_CN.GB2312.php b/lib/l10n/zh_CN.GB2312.php
new file mode 100644
index 00000000000..4b0a5e9f4d2
--- /dev/null
+++ b/lib/l10n/zh_CN.GB2312.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Help" => "帮助",
+"Personal" => "私人",
+"Settings" => "设置",
+"Users" => "用户",
+"Apps" => "程序",
+"Admin" => "管理员",
+"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 文件。",
+"Application is not enabled" => "应用未启用",
+"Authentication error" => "验证错误",
+"Token expired. Please reload page." => "会话过期。请刷新页面。",
+"seconds ago" => "秒前",
+"1 minute ago" => "1 分钟前",
+"%d minutes ago" => "%d 分钟前",
+"today" => "今天",
+"yesterday" => "昨天",
+"%d days ago" => "%d 天前",
+"last month" => "上个月",
+"months ago" => "月前",
+"last year" => "去年",
+"years ago" => "年前",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s 不可用。获知 <a href=\"%s\">详情</a>",
+"up to date" => "最新",
+"updates check is disabled" => "更新检测已禁用"
+);
diff --git a/lib/migrate.php b/lib/migrate.php
index 823b3574f16..611a935ee5d 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -84,21 +84,15 @@ class OC_Migrate{
$types = array( 'user', 'instance', 'system', 'userfiles' );
if( !in_array( $type, $types ) ) {
OC_Log::write( 'migration', 'Invalid export type', OC_Log::ERROR );
- return json_encode( array( array( 'success' => false ) ) );
+ return json_encode( array( 'success' => false ) );
}
self::$exporttype = $type;
// Userid?
if( self::$exporttype == 'user' ) {
// Check user exists
- if( !is_null($uid) ) {
- $db = new OC_User_Database;
- if( !$db->userExists( $uid ) ) {
- OC_Log::write('migration', 'User: '.$uid.' is not in the database and so cannot be exported.', OC_Log::ERROR);
- return json_encode( array( 'success' => false ) );
- }
- self::$uid = $uid;
- } else {
- self::$uid = OC_User::getUser();
+ self::$uid = is_null($uid) ? OC_User::getUser() : $uid;
+ if(!OC_User::userExists(self::$uid)){
+ return json_encode( array( 'success' => false) );
}
}
// Calculate zipname
diff --git a/lib/migration/content.php b/lib/migration/content.php
index 64b8168cd98..89b1e782d86 100644
--- a/lib/migration/content.php
+++ b/lib/migration/content.php
@@ -30,7 +30,7 @@ class OC_Migration_Content{
// Holds the MDB2 object
private $db=null;
// Holds an array of tmpfiles to delete after zip creation
- private $tmpfiles=false;
+ private $tmpfiles=array();
/**
* @brief sets up the
@@ -43,18 +43,21 @@ class OC_Migration_Content{
$this->zip = $zip;
$this->db = $db;
- if( !is_null( $db ) ) {
- // Get db path
- $db = $this->db->getDatabase();
- $this->tmpfiles[] = $db;
- }
-
}
// @brief prepares the db
// @param $query the sql query to prepare
public function prepare( $query ) {
-
+
+ // Only add database to tmpfiles if actually used
+ if( !is_null( $this->db ) ) {
+ // Get db path
+ $db = $this->db->getDatabase();
+ if(!in_array($db, $this->tmpfiles)){
+ $this->tmpfiles[] = $db;
+ }
+ }
+
// Optimize the query
$query = $this->processQuery( $query );
diff --git a/lib/ocs.php b/lib/ocs.php
index 3a9be4cf09d..7350c3c8821 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -84,7 +84,7 @@ class OC_OCS {
$method='get';
}elseif($_SERVER['REQUEST_METHOD'] == 'PUT') {
$method='put';
- parse_str(file_get_contents("php://input"),$put_vars);
+ parse_str(file_get_contents("php://input"), $put_vars);
}elseif($_SERVER['REQUEST_METHOD'] == 'POST') {
$method='post';
}else{
@@ -94,8 +94,8 @@ class OC_OCS {
// preprocess url
$url = strtolower($_SERVER['REQUEST_URI']);
- if(substr($url,(strlen($url)-1))<>'/') $url.='/';
- $ex=explode('/',$url);
+ if(substr($url, (strlen($url)-1))<>'/') $url.='/';
+ $ex=explode('/', $url);
$paracount=count($ex);
$format = self::readData($method, 'format', 'text', '');
@@ -107,23 +107,23 @@ class OC_OCS {
// PERSON
// personcheck - POST - PERSON/CHECK
- }elseif(($method=='post') and ($ex[$paracount-4] == 'v1.php') and ($ex[$paracount-3]=='person') and ($ex[$paracount-2] == 'check')) {
+ } elseif(($method=='post') and ($ex[$paracount-4] == 'v1.php') and ($ex[$paracount-3]=='person') and ($ex[$paracount-2] == 'check')) {
$login = self::readData($method, 'login', 'text');
$passwd = self::readData($method, 'password', 'text');
- OC_OCS::personcheck($format,$login,$passwd);
+ OC_OCS::personcheck($format, $login, $passwd);
// ACTIVITY
// activityget - GET ACTIVITY page,pagesize als urlparameter
}elseif(($method=='get') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'activity')) {
$page = self::readData($method, 'page', 'int', 0);
- $pagesize = self::readData($method, 'pagesize','int', 10);
+ $pagesize = self::readData($method, 'pagesize', 'int', 10);
if($pagesize<1 or $pagesize>100) $pagesize=10;
- OC_OCS::activityget($format,$page,$pagesize);
+ OC_OCS::activityget($format, $page, $pagesize);
// activityput - POST ACTIVITY
}elseif(($method=='post') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'activity')) {
$message = self::readData($method, 'message', 'text');
- OC_OCS::activityput($format,$message);
+ OC_OCS::activityput($format, $message);
// PRIVATEDATA
@@ -138,7 +138,7 @@ class OC_OCS {
$key=$ex[$paracount-2];
$app=$ex[$paracount-3];
- OC_OCS::privateDataGet($format, $app,$key);
+ OC_OCS::privateDataGet($format, $app, $key);
// set - POST DATA
}elseif(($method=='post') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-4] == 'setattribute')) {
@@ -160,23 +160,23 @@ class OC_OCS {
// quotaget
}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'quota')) {
$user=$ex[$paracount-3];
- OC_OCS::quotaget($format,$user);
+ OC_OCS::quotaget($format, $user);
// quotaset
}elseif(($method=='post') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'quota')) {
$user=$ex[$paracount-3];
$quota = self::readData('post', 'quota', 'int');
- OC_OCS::quotaset($format,$user,$quota);
+ OC_OCS::quotaset($format, $user, $quota);
// keygetpublic
}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'publickey')) {
$user=$ex[$paracount-3];
- OC_OCS::publicKeyGet($format,$user);
+ OC_OCS::publicKeyGet($format, $user);
// keygetprivate
}elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'privatekey')) {
$user=$ex[$paracount-3];
- OC_OCS::privateKeyGet($format,$user);
+ OC_OCS::privateKeyGet($format, $user);
// add more calls here
@@ -196,7 +196,7 @@ class OC_OCS {
}else{
$txt='Invalid query, please check the syntax. API specifications are here: http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
$txt.=OC_OCS::getdebugoutput();
- echo(OC_OCS::generatexml($format,'failed',999,$txt));
+ echo(OC_OCS::generatexml($format, 'failed', 999, $txt));
}
exit();
}
@@ -237,7 +237,7 @@ class OC_OCS {
$identifieduser='';
}
}else{
- if(!OC_User::login($authuser,$authpw)) {
+ if(!OC_User::login($authuser, $authpw)) {
if($forceuser) {
header('WWW-Authenticate: Basic realm="your valid user account or api key"');
header('HTTP/1.0 401 Unauthorized');
@@ -283,69 +283,69 @@ class OC_OCS {
$writer = xmlwriter_open_memory();
xmlwriter_set_indent( $writer, 2 );
xmlwriter_start_document($writer );
- xmlwriter_start_element($writer,'ocs');
- xmlwriter_start_element($writer,'meta');
- xmlwriter_write_element($writer,'status',$status);
- xmlwriter_write_element($writer,'statuscode',$statuscode);
- xmlwriter_write_element($writer,'message',$message);
+ xmlwriter_start_element($writer, 'ocs');
+ xmlwriter_start_element($writer, 'meta');
+ xmlwriter_write_element($writer, 'status', $status);
+ xmlwriter_write_element($writer, 'statuscode', $statuscode);
+ xmlwriter_write_element($writer, 'message', $message);
if($itemscount<>'') xmlwriter_write_element($writer,'totalitems',$itemscount);
- if(!empty($itemsperpage)) xmlwriter_write_element($writer,'itemsperpage',$itemsperpage);
+ if(!empty($itemsperpage)) xmlwriter_write_element($writer, 'itemsperpage', $itemsperpage);
xmlwriter_end_element($writer);
if($dimension=='0') {
// 0 dimensions
- xmlwriter_write_element($writer,'data',$data);
+ xmlwriter_write_element($writer, 'data', $data);
}elseif($dimension=='1') {
- xmlwriter_start_element($writer,'data');
+ xmlwriter_start_element($writer, 'data');
foreach($data as $key=>$entry) {
- xmlwriter_write_element($writer,$key,$entry);
+ xmlwriter_write_element($writer, $key, $entry);
}
xmlwriter_end_element($writer);
}elseif($dimension=='2') {
xmlwriter_start_element($writer,'data');
foreach($data as $entry) {
- xmlwriter_start_element($writer,$tag);
- if(!empty($tagattribute)) {
- xmlwriter_write_attribute($writer,'details',$tagattribute);
- }
- foreach($entry as $key=>$value) {
- if(is_array($value)) {
- foreach($value as $k=>$v) {
- xmlwriter_write_element($writer,$k,$v);
- }
- } else {
- xmlwriter_write_element($writer,$key,$value);
- }
- }
- xmlwriter_end_element($writer);
- }
+ xmlwriter_start_element($writer, $tag);
+ if(!empty($tagattribute)) {
+ xmlwriter_write_attribute($writer, 'details', $tagattribute);
+ }
+ foreach($entry as $key=>$value) {
+ if(is_array($value)) {
+ foreach($value as $k=>$v) {
+ xmlwriter_write_element($writer, $k, $v);
+ }
+ } else {
+ xmlwriter_write_element($writer, $key, $value);
+ }
+ }
+ xmlwriter_end_element($writer);
+ }
xmlwriter_end_element($writer);
}elseif($dimension=='3') {
- xmlwriter_start_element($writer,'data');
+ xmlwriter_start_element($writer, 'data');
foreach($data as $entrykey=>$entry) {
- xmlwriter_start_element($writer,$tag);
- if(!empty($tagattribute)) {
- xmlwriter_write_attribute($writer,'details',$tagattribute);
- }
- foreach($entry as $key=>$value) {
- if(is_array($value)) {
- xmlwriter_start_element($writer,$entrykey);
- foreach($value as $k=>$v) {
- xmlwriter_write_element($writer,$k,$v);
- }
- xmlwriter_end_element($writer);
- } else {
- xmlwriter_write_element($writer,$key,$value);
- }
- }
- xmlwriter_end_element($writer);
+ xmlwriter_start_element($writer, $tag);
+ if(!empty($tagattribute)) {
+ xmlwriter_write_attribute($writer, 'details', $tagattribute);
+ }
+ foreach($entry as $key=>$value) {
+ if(is_array($value)) {
+ xmlwriter_start_element($writer, $entrykey);
+ foreach($value as $k=>$v) {
+ xmlwriter_write_element($writer, $k, $v);
+ }
+ xmlwriter_end_element($writer);
+ } else {
+ xmlwriter_write_element($writer, $key, $value);
+ }
+ }
+ xmlwriter_end_element($writer);
}
xmlwriter_end_element($writer);
}elseif($dimension=='dynamic') {
- xmlwriter_start_element($writer,'data');
- OC_OCS::toxml($writer,$data,'comment');
+ xmlwriter_start_element($writer, 'data');
+ OC_OCS::toxml($writer, $data, 'comment');
xmlwriter_end_element($writer);
}
@@ -364,18 +364,15 @@ class OC_OCS {
$key = $node;
}
if (is_array($value)) {
- xmlwriter_start_element($writer,$key);
- OC_OCS::toxml($writer,$value,$node);
+ xmlwriter_start_element($writer, $key);
+ OC_OCS::toxml($writer,$value, $node);
xmlwriter_end_element($writer);
}else{
- xmlwriter_write_element($writer,$key,$value);
+ xmlwriter_write_element($writer, $key, $value);
}
}
}
-
-
-
/**
* return the config data of this server
* @param string $format
@@ -383,17 +380,16 @@ class OC_OCS {
*/
private static function apiConfig($format) {
$user=OC_OCS::checkpassword(false);
- $url=substr(OCP\Util::getServerHost().$_SERVER['SCRIPT_NAME'],0,-11).'';
+ $url=substr(OCP\Util::getServerHost().$_SERVER['SCRIPT_NAME'], 0, -11).'';
$xml['version']='1.7';
$xml['website']='ownCloud';
$xml['host']=OCP\Util::getServerHost();
$xml['contact']='';
$xml['ssl']='false';
- echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'config','',1));
+ echo(OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'config', '', 1));
}
-
/**
* check if the provided login/apikey/password is valid
* @param string $format
@@ -403,19 +399,17 @@ class OC_OCS {
*/
private static function personCheck($format,$login,$passwd) {
if($login<>'') {
- if(OC_User::login($login,$passwd)) {
+ if(OC_User::login($login, $passwd)) {
$xml['person']['personid']=$login;
- echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'person','check',2));
+ echo(OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'person', 'check', 2));
}else{
- echo(OC_OCS::generatexml($format,'failed',102,'login not valid'));
+ echo(OC_OCS::generatexml($format, 'failed', 102, 'login not valid'));
}
}else{
- echo(OC_OCS::generatexml($format,'failed',101,'please specify all mandatory fields'));
+ echo(OC_OCS::generatexml($format, 'failed', 101, 'please specify all mandatory fields'));
}
}
-
-
// ACTIVITY API #############################################
/**
@@ -425,12 +419,12 @@ class OC_OCS {
* @param string $pagesize
* @return string xml/json
*/
- private static function activityGet($format,$page,$pagesize) {
+ private static function activityGet($format, $page, $pagesize) {
$user=OC_OCS::checkpassword();
//TODO
- $txt=OC_OCS::generatexml($format,'ok',100,'',$xml,'activity','full',2,$totalcount,$pagesize);
+ $txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'activity', 'full', 2, $totalcount,$pagesize);
echo($txt);
}
@@ -443,7 +437,7 @@ class OC_OCS {
private static function activityPut($format,$message) {
// not implemented in ownCloud
$user=OC_OCS::checkpassword();
- echo(OC_OCS::generatexml($format,'ok',100,''));
+ echo(OC_OCS::generatexml($format, 'ok', 100, ''));
}
// PRIVATEDATA API #############################################
@@ -455,9 +449,9 @@ class OC_OCS {
* @param string $key
* @return string xml/json
*/
- private static function privateDataGet($format,$app="",$key="") {
+ private static function privateDataGet($format, $app="", $key="") {
$user=OC_OCS::checkpassword();
- $result=OC_OCS::getData($user,$app,$key);
+ $result=OC_OCS::getData($user, $app, $key);
$xml=array();
foreach($result as $i=>$log) {
$xml[$i]['key']=$log['key'];
@@ -480,8 +474,8 @@ class OC_OCS {
*/
private static function privateDataSet($format, $app, $key, $value) {
$user=OC_OCS::checkpassword();
- if(OC_OCS::setData($user,$app,$key,$value)) {
- echo(OC_OCS::generatexml($format,'ok',100,''));
+ if(OC_OCS::setData($user, $app, $key, $value)) {
+ echo(OC_OCS::generatexml($format, 'ok', 100, ''));
}
}
@@ -497,8 +491,8 @@ class OC_OCS {
return; //key and app are NOT optional here
}
$user=OC_OCS::checkpassword();
- if(OC_OCS::deleteData($user,$app,$key)) {
- echo(OC_OCS::generatexml($format,'ok',100,''));
+ if(OC_OCS::deleteData($user, $app, $key)) {
+ echo(OC_OCS::generatexml($format, 'ok', 100, ''));
}
}
@@ -510,7 +504,7 @@ class OC_OCS {
* @param bool $like use LIKE instead of = when comparing keys
* @return array
*/
- public static function getData($user,$app="",$key="") {
+ public static function getData($user, $app="", $key="") {
if($app) {
$apps=array($app);
}else{
@@ -520,14 +514,14 @@ class OC_OCS {
$keys=array($key);
}else{
foreach($apps as $app) {
- $keys=OC_Preferences::getKeys($user,$app);
+ $keys=OC_Preferences::getKeys($user, $app);
}
}
$result=array();
foreach($apps as $app) {
foreach($keys as $key) {
- $value=OC_Preferences::getValue($user,$app,$key);
- $result[]=array('app'=>$app,'key'=>$key,'value'=>$value);
+ $value=OC_Preferences::getValue($user, $app, $key);
+ $result[]=array('app'=>$app, 'key'=>$key, 'value'=>$value);
}
}
return $result;
@@ -542,7 +536,7 @@ class OC_OCS {
* @return bool
*/
public static function setData($user, $app, $key, $value) {
- return OC_Preferences::setValue($user,$app,$key,$value);
+ return OC_Preferences::setValue($user, $app, $key, $value);
}
/**
@@ -553,7 +547,7 @@ class OC_OCS {
* @return string xml/json
*/
public static function deleteData($user, $app, $key) {
- return OC_Preferences::deleteKey($user,$app,$key);
+ return OC_Preferences::deleteKey($user, $app, $key);
}
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 8596ea0b3c7..6428a883679 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -53,7 +53,7 @@ class OC_OCSClient{
/**
* @brief Get all the categories from the OCS server
* @returns array with category ids
- *
+ * @note returns NULL if config value appstoreenabled is set to false
* This function returns a list of all the application categories on the OCS server
*/
public static function getCategories() {
diff --git a/lib/public/app.php b/lib/public/app.php
index eb824f043e9..809a656f17f 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -34,120 +34,109 @@ namespace OCP;
* This class provides functions to manage apps in ownCloud
*/
class App {
- /**
- * @brief Makes owncloud aware of this app
- * @brief This call is deprecated and not necessary to use.
- * @param $data array with all information
- * @returns true/false
- *
- * @deprecated this method is deprecated
- * Do not call it anymore
- * It'll remain in our public API for compatibility reasons
- *
- */
- public static function register( $data ) {
+ /**
+ * @brief Makes owncloud aware of this app
+ * @brief This call is deprecated and not necessary to use.
+ * @param $data array with all information
+ * @returns true/false
+ *
+ * @deprecated this method is deprecated
+ * Do not call it anymore
+ * It'll remain in our public API for compatibility reasons
+ *
+ */
+ public static function register( $data ) {
return true; // don't do anything
- }
+ }
- /**
- * @brief adds an entry to the navigation
- * @param $data array containing the data
- * @returns true/false
- *
- * This function adds a new entry to the navigation visible to users. $data
- * is an associative array.
- * The following keys are required:
- * - id: unique id for this entry ('addressbook_index')
- * - href: link to the page
- * - name: Human readable name ('Addressbook')
- *
- * The following keys are optional:
- * - icon: path to the icon of the app
- * - order: integer, that influences the position of your application in
- * the navigation. Lower values come first.
- */
- public static function addNavigationEntry( $data ) {
+ /**
+ * @brief adds an entry to the navigation
+ * @param $data array containing the data
+ * @returns true/false
+ *
+ * This function adds a new entry to the navigation visible to users. $data
+ * is an associative array.
+ * The following keys are required:
+ * - id: unique id for this entry ('addressbook_index')
+ * - href: link to the page
+ * - name: Human readable name ('Addressbook')
+ *
+ * The following keys are optional:
+ * - icon: path to the icon of the app
+ * - order: integer, that influences the position of your application in
+ * the navigation. Lower values come first.
+ */
+ public static function addNavigationEntry( $data ) {
return \OC_App::addNavigationEntry( $data );
}
-
- /**
- * @brief marks a navigation entry as active
- * @param $id id of the entry
- * @returns true/false
- *
- * This function sets a navigation entry as active and removes the 'active'
- * property from all other entries. The templates can use this for
- * highlighting the current position of the user.
- */
- public static function setActiveNavigationEntry( $id ) {
+ /**
+ * @brief marks a navigation entry as active
+ * @param $id id of the entry
+ * @returns true/false
+ *
+ * This function sets a navigation entry as active and removes the 'active'
+ * property from all other entries. The templates can use this for
+ * highlighting the current position of the user.
+ */
+ public static function setActiveNavigationEntry( $id ) {
return \OC_App::setActiveNavigationEntry( $id );
}
-
- /**
- * @brief Register a Configuration Screen that should appear in the personal settings section.
- * @param $app string appid
- * @param $page string page to be included
- */
- public static function registerPersonal( $app, $page ) {
+ /**
+ * @brief Register a Configuration Screen that should appear in the personal settings section.
+ * @param $app string appid
+ * @param $page string page to be included
+ */
+ public static function registerPersonal( $app, $page ) {
return \OC_App::registerPersonal( $app, $page );
}
-
/**
- * @brief Register a Configuration Screen that should appear in the Admin section.
- * @param $app string appid
- * @param $page string page to be included
+ * @brief Register a Configuration Screen that should appear in the Admin section.
+ * @param $app string appid
+ * @param $page string page to be included
*/
public static function registerAdmin( $app, $page ) {
return \OC_App::registerAdmin( $app, $page );
}
-
- /**
- * @brief Read app metadata from the info.xml file
- * @param string $app id of the app or the path of the info.xml file
- * @param boolean path (optional)
- * @returns array
- */
- public static function getAppInfo( $app, $path=false ) {
+ /**
+ * @brief Read app metadata from the info.xml file
+ * @param string $app id of the app or the path of the info.xml file
+ * @param boolean path (optional)
+ * @returns array
+ */
+ public static function getAppInfo( $app, $path=false ) {
return \OC_App::getAppInfo( $app, $path);
}
-
-
- /**
- * @brief checks whether or not an app is enabled
- * @param $app app
- * @returns true/false
- *
- * This function checks whether or not an app is enabled.
- */
- public static function isEnabled( $app ) {
+ /**
+ * @brief checks whether or not an app is enabled
+ * @param $app app
+ * @returns true/false
+ *
+ * This function checks whether or not an app is enabled.
+ */
+ public static function isEnabled( $app ) {
return \OC_App::isEnabled( $app );
}
+ /**
+ * @brief Check if the app is enabled, redirects to home if not
+ * @param $app app
+ * @returns true/false
+ */
+ public static function checkAppEnabled( $app ) {
+ return \OC_Util::checkAppEnabled( $app );
+ }
- /**
- * @brief Check if the app is enabled, redirects to home if not
- * @param $app app
- * @returns true/false
- */
- public static function checkAppEnabled( $app ) {
- return \OC_Util::checkAppEnabled( $app );
- }
-
-
- /**
- * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml
- * @param $app app
- * @returns true/false
- */
- public static function getAppVersion( $app ) {
+ /**
+ * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml
+ * @param $app app
+ * @returns true/false
+ */
+ public static function getAppVersion( $app ) {
return \OC_App::getAppVersion( $app );
}
-
-
-
}
diff --git a/lib/public/config.php b/lib/public/config.php
index fa9658e7288..377150115ff 100644
--- a/lib/public/config.php
+++ b/lib/public/config.php
@@ -38,8 +38,6 @@ namespace OCP;
* This class provides functions to read and write configuration data. configuration can be on a system, application or user level
*/
class Config {
-
-
/**
* @brief Gets a value from config.php
* @param $key key
@@ -53,7 +51,6 @@ class Config {
return(\OC_Config::getValue( $key, $default ));
}
-
/**
* @brief Sets a value
* @param $key key
@@ -67,70 +64,60 @@ class Config {
return(\OC_Config::setValue( $key, $value ));
}
-
- /**
- * @brief Gets the config value
- * @param $app app
- * @param $key key
- * @param $default = null, default value if the key does not exist
- * @returns the value or $default
- *
- * This function gets a value from the appconfig table. If the key does
- * not exist the default value will be returnes
- */
- public static function getAppValue( $app, $key, $default = null ) {
+ /**
+ * @brief Gets the config value
+ * @param $app app
+ * @param $key key
+ * @param $default = null, default value if the key does not exist
+ * @returns the value or $default
+ *
+ * This function gets a value from the appconfig table. If the key does
+ * not exist the default value will be returnes
+ */
+ public static function getAppValue( $app, $key, $default = null ) {
return(\OC_Appconfig::getValue( $app, $key, $default ));
}
-
- /**
- * @brief sets a value in the appconfig
- * @param $app app
- * @param $key key
- * @param $value value
- * @returns true/false
- *
- * Sets a value. If the key did not exist before it will be created.
- */
- public static function setAppValue( $app, $key, $value ) {
+ /**
+ * @brief sets a value in the appconfig
+ * @param $app app
+ * @param $key key
+ * @param $value value
+ * @returns true/false
+ *
+ * Sets a value. If the key did not exist before it will be created.
+ */
+ public static function setAppValue( $app, $key, $value ) {
return(\OC_Appconfig::setValue( $app, $key, $value ));
}
-
- /**
- * @brief Gets the preference
- * @param $user user
- * @param $app app
- * @param $key key
- * @param $default = null, default value if the key does not exist
- * @returns the value or $default
- *
- * This function gets a value from the prefernces table. If the key does
- * not exist the default value will be returnes
- */
- public static function getUserValue( $user, $app, $key, $default = null ) {
+ /**
+ * @brief Gets the preference
+ * @param $user user
+ * @param $app app
+ * @param $key key
+ * @param $default = null, default value if the key does not exist
+ * @returns the value or $default
+ *
+ * This function gets a value from the prefernces table. If the key does
+ * not exist the default value will be returnes
+ */
+ public static function getUserValue( $user, $app, $key, $default = null ) {
return(\OC_Preferences::getValue( $user, $app, $key, $default ));
}
-
- /**
- * @brief sets a value in the preferences
- * @param $user user
- * @param $app app
- * @param $key key
- * @param $value value
- * @returns true/false
- *
- * Adds a value to the preferences. If the key did not exist before, it
- * will be added automagically.
- */
- public static function setUserValue( $user, $app, $key, $value ) {
+ /**
+ * @brief sets a value in the preferences
+ * @param $user user
+ * @param $app app
+ * @param $key key
+ * @param $value value
+ * @returns true/false
+ *
+ * Adds a value to the preferences. If the key did not exist before, it
+ * will be added automagically.
+ */
+ public static function setUserValue( $user, $app, $key, $value ) {
return(\OC_Preferences::setValue( $user, $app, $key, $value ));
}
-
-
-
-
-
-
}
diff --git a/lib/public/db.php b/lib/public/db.php
index 5ac356bb475..6ce62b27ca2 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -34,8 +34,6 @@ namespace OCP;
* This class provides access to the internal database system. Use this class exlusively if you want to access databases
*/
class DB {
-
-
/**
* @brief Prepare a SQL query
* @param $query Query string
@@ -47,7 +45,6 @@ class DB {
return(\OC_DB::prepare($query,$limit,$offset));
}
-
/**
* @brief gets last value of autoincrement
* @param $table string The optional table name (will replace *PREFIX*) and add sequence suffix
@@ -62,7 +59,6 @@ class DB {
return(\OC_DB::insertid($table));
}
-
/**
* @brief Start a transaction
*/
@@ -70,7 +66,6 @@ class DB {
return(\OC_DB::beginTransaction());
}
-
/**
* @brief Commit the database changes done during a transaction that is in progress
*/
@@ -78,7 +73,6 @@ class DB {
return(\OC_DB::commit());
}
-
/**
* @brief check if a result is an error, works with MDB2 and PDOException
* @param mixed $result
@@ -87,7 +81,4 @@ class DB {
public static function isError($result) {
return(\OC_DB::isError($result));
}
-
-
-
}
diff --git a/lib/public/files.php b/lib/public/files.php
index 2f4f459bd91..90889c59ad8 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -34,8 +34,6 @@ namespace OCP;
* This class provides access to the internal filesystem abstraction layer. Use this class exlusively if you want to access files
*/
class Files {
-
-
/**
* @brief Recusive deletion of folders
* @param string $dir path to the folder
@@ -45,7 +43,6 @@ class Files {
\OC_Helper::rmdirr( $dir );
}
-
/**
* get the mimetype form a local file
* @param string path
@@ -56,7 +53,6 @@ class Files {
return(\OC_Helper::getMimeType( $path ));
}
-
/**
* copy the contents of one stream to another
* @param resource source
@@ -67,7 +63,6 @@ class Files {
return(\OC_Helper::streamCopy( $source, $target ));
}
-
/**
* create a temporary file with an unique filename
* @param string postfix
@@ -79,7 +74,6 @@ class Files {
return(\OC_Helper::tmpFile( $postfix ));
}
-
/**
* create a temporary folder with an unique filename
* @return string
@@ -90,7 +84,6 @@ class Files {
return(\OC_Helper::tmpFolder());
}
-
/**
* Adds a suffix to the name in case the file exists
*
@@ -102,16 +95,12 @@ class Files {
return(\OC_Helper::buildNotExistingFileName( $path, $filename ));
}
- /**
- * @param string appid
- * @param $app app
- * @return OC_FilesystemView
- */
- public static function getStorage( $app ) {
+ /**
+ * @param string appid
+ * @param $app app
+ * @return OC_FilesystemView
+ */
+ public static function getStorage( $app ) {
return \OC_App::getStorage( $app );
}
-
-
-
-
}
diff --git a/lib/public/json.php b/lib/public/json.php
index 93be920c6d7..2186dd8ee49 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -34,7 +34,6 @@ namespace OCP;
* This class provides convinient functions to generate and send JSON data. Usefull for Ajax calls
*/
class JSON {
-
/**
* @brief Encode and print $data in JSON format
* @param array $data The data to use
@@ -170,5 +169,4 @@ class JSON {
public static function checkAdminUser() {
return(\OC_JSON::checkAdminUser());
}
-
}
diff --git a/lib/public/response.php b/lib/public/response.php
index febb3f14361..95e67a85720 100644
--- a/lib/public/response.php
+++ b/lib/public/response.php
@@ -34,8 +34,6 @@ namespace OCP;
* This class provides convinient functions to send the correct http response headers
*/
class Response {
-
-
/**
* @brief Enable response caching by sending correct HTTP headers
* @param $cache_time time to cache the response
@@ -47,7 +45,6 @@ class Response {
return(\OC_Response::enableCaching( $cache_time ));
}
-
/**
* Checks and set Last-Modified header, when the request matches sends a
* 'not modified' response
@@ -57,7 +54,6 @@ class Response {
return(\OC_Response::setLastModifiedHeader( $lastModified ));
}
-
/**
* @brief disable browser caching
* @see enableCaching with cache_time = 0
@@ -66,7 +62,6 @@ class Response {
return(\OC_Response::disableCaching());
}
-
/**
* Checks and set ETag header, when the request matches sends a
* 'not modified' response
@@ -76,7 +71,6 @@ class Response {
return(\OC_Response::setETagHeader( $etag ));
}
-
/**
* @brief Send file as response, checking and setting caching headers
* @param $filepath of file to send
@@ -102,6 +96,4 @@ class Response {
static public function redirect( $location ) {
return(\OC_Response::redirect( $location ));
}
-
-
-}
+} \ No newline at end of file
diff --git a/lib/public/share.php b/lib/public/share.php
index cf61681424f..b215d7f9389 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -252,26 +252,26 @@ class Share {
\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
throw new \Exception($message);
return false;
- } else if ($shareType === self::SHARE_TYPE_CONTACT) {
- if (!\OC_App::isEnabled('contacts')) {
- $message = 'Sharing '.$itemSource.' failed, because the contacts app is not enabled';
- \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
- return false;
- }
- $vcard = \OC_Contacts_App::getContactVCard($shareWith);
- if (!isset($vcard)) {
- $message = 'Sharing '.$itemSource.' failed, because the contact does not exist';
- \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
- throw new \Exception($message);
- }
- $details = \OC_Contacts_VCard::structureContact($vcard);
- // TODO Add ownCloud user to contacts vcard
- if (!isset($details['EMAIL'])) {
- $message = 'Sharing '.$itemSource.' failed, because no email address is associated with the contact';
- \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
- throw new \Exception($message);
- }
- return self::shareItem($itemType, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions);
+// } else if ($shareType === self::SHARE_TYPE_CONTACT) {
+// if (!\OC_App::isEnabled('contacts')) {
+// $message = 'Sharing '.$itemSource.' failed, because the contacts app is not enabled';
+// \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+// return false;
+// }
+// $vcard = \OC_Contacts_App::getContactVCard($shareWith);
+// if (!isset($vcard)) {
+// $message = 'Sharing '.$itemSource.' failed, because the contact does not exist';
+// \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+// throw new \Exception($message);
+// }
+// $details = \OC_Contacts_VCard::structureContact($vcard);
+// // TODO Add ownCloud user to contacts vcard
+// if (!isset($details['EMAIL'])) {
+// $message = 'Sharing '.$itemSource.' failed, because no email address is associated with the contact';
+// \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+// throw new \Exception($message);
+// }
+// return self::shareItem($itemType, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions);
} else {
// Future share types need to include their own conditions
$message = 'Share type '.$shareType.' is not valid for '.$itemSource;
@@ -337,10 +337,21 @@ class Share {
public static function unshareFromSelf($itemType, $itemTarget) {
if ($item = self::getItemSharedWith($itemType, $itemTarget)) {
if ((int)$item['share_type'] === self::SHARE_TYPE_GROUP) {
- // TODO
+ // Insert an extra row for the group share and set permission to 0 to prevent it from showing up for the user
+ $query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`, `file_target`) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
+ $query->execute(array($item['item_type'], $item['item_source'], $item['item_target'], $item['id'], self::$shareTypeGroupUserUnique, \OC_User::getUser(), $item['uid_owner'], 0, $item['stime'], $item['file_source'], $item['file_target']));
+ \OC_DB::insertid('*PREFIX*share');
+ // Delete all reshares by this user of the group share
+ self::delete($item['id'], true, \OC_User::getUser());
+ } else if ((int)$item['share_type'] === self::$shareTypeGroupUserUnique) {
+ // Set permission to 0 to prevent it from showing up for the user
+ $query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?');
+ $query->execute(array(0, $item['id']));
+ self::delete($item['id'], true);
+ } else {
+ self::delete($item['id']);
}
- // Delete
- return self::delete($item['id']);
+ return true;
}
return false;
}
@@ -406,6 +417,16 @@ class Share {
throw new \Exception($message);
}
+ public static function setExpirationDate($itemType, $itemSource, $date) {
+ if ($item = self::getItems($itemType, $itemSource, null, null, \OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) {
+ error_log('setting');
+ $query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `expiration` = ? WHERE `id` = ?');
+ $query->execute(array($date, $item['id']));
+ return true;
+ }
+ return false;
+ }
+
/**
* @brief Get the backend class for the specified item type
* @param string Item type
@@ -447,8 +468,11 @@ class Share {
$collectionTypes[] = $type;
}
}
- if (count($collectionTypes) > 1) {
+ if (!self::getBackend($itemType) instanceof Share_Backend_Collection) {
unset($collectionTypes[0]);
+ }
+ // Return array if collections were found or the item type is a collection itself - collections can be inside collections
+ if (count($collectionTypes) > 0) {
return $collectionTypes;
}
return false;
@@ -493,9 +517,13 @@ class Share {
$root = '';
if ($includeCollections && !isset($item) && ($collectionTypes = self::getCollectionItemTypes($itemType))) {
// If includeCollections is true, find collections of this item type, e.g. a music album contains songs
- $itemTypes = array_merge(array($itemType), $collectionTypes);
+ if (!in_array($itemType, $collectionTypes)) {
+ $itemTypes = array_merge(array($itemType), $collectionTypes);
+ } else {
+ $itemTypes = $collectionTypes;
+ }
$placeholders = join(',', array_fill(0, count($itemTypes), '?'));
- $where = ' WHERE `item_type` IN ('.$placeholders.')';
+ $where .= ' WHERE item_type IN ('.$placeholders.'))';
$queryArgs = $itemTypes;
} else {
$where = ' WHERE `item_type` = ?';
@@ -570,7 +598,7 @@ class Share {
}
}
$queryArgs[] = $item;
- if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
+ if ($includeCollections && $collectionTypes) {
$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
$where .= ' OR item_type IN ('.$placeholders.'))';
$queryArgs = array_merge($queryArgs, $collectionTypes);
@@ -594,23 +622,23 @@ class Share {
// TODO Optimize selects
if ($format == self::FORMAT_STATUSES) {
if ($itemType == 'file' || $itemType == 'folder') {
- $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `file_source`, `path`';
+ $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `file_source`, `path`, `expiration`';
} else {
- $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`';
+ $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `expiration`';
}
} else {
if (isset($uidOwner)) {
if ($itemType == 'file' || $itemType == 'folder') {
- $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`';
+ $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`, `expiration`';
} else {
- $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`, `stime`, `file_source`';
+ $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`, `stime`, `file_source`, `expiration`';
}
} else {
if ($fileDependent) {
if (($itemType == 'file' || $itemType == 'folder') && $format == \OC_Share_Backend_File::FORMAT_FILE_APP || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT) {
- $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `file_target`, `permissions`, `name`, `ctime`, `mtime`, `mimetype`, `size`, `encrypted`, `versioned`, `writable`';
+ $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `file_target`, `permissions`, `expiration`, `name`, `ctime`, `mtime`, `mimetype`, `size`, `encrypted`, `versioned`, `writable`';
} else {
- $select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`';
+ $select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`';
}
} else {
$select = '*';
@@ -629,6 +657,9 @@ class Share {
$row['share_with'] = $items[$row['parent']]['share_with'];
// Remove the parent group share
unset($items[$row['parent']]);
+ if ($row['permissions'] == 0) {
+ continue;
+ }
} else if (!isset($uidOwner)) {
// Check if the same target already exists
if (isset($targets[$row[$column]])) {
@@ -662,6 +693,13 @@ class Share {
$row['path'] = substr($row['path'], $root);
}
}
+ if (isset($row['expiration'])) {
+ $time = new \DateTime();
+ if ($row['expiration'] < date('Y-m-d H:i', $time->format('U') - $time->getOffset())) {
+ self::delete($row['id']);
+ continue;
+ }
+ }
$items[$row['id']] = $row;
}
if (!empty($items)) {
@@ -676,29 +714,54 @@ class Share {
}
}
// Check if this is a collection of the requested item type
- if ($includeCollections && $row['item_type'] != $itemType) {
+ if ($includeCollections && $collectionTypes && in_array($row['item_type'], $collectionTypes)) {
if (($collectionBackend = self::getBackend($row['item_type'])) && $collectionBackend instanceof Share_Backend_Collection) {
- $row['collection'] = array('item_type' => $itemType, $column => $row[$column]);
- // Fetch all of the children sources
- $children = $collectionBackend->getChildren($row[$column]);
- foreach ($children as $child) {
- $childItem = $row;
- $childItem['item_source'] = $child;
- // $childItem['item_target'] = $child['target']; TODO
- if (isset($item)) {
- if ($childItem[$column] == $item) {
- // Return only the item instead of a 2-dimensional array
- if ($limit == 1 && $format == self::FORMAT_NONE) {
- return $childItem;
+ // Collections can be inside collections, check if the item is a collection
+ if (isset($item) && $row['item_type'] == $itemType && $row[$column] == $item) {
+ $collectionItems[] = $row;
+ } else {
+ $collection = array();
+ $collection['item_type'] = $row['item_type'];
+ if ($row['item_type'] == 'file' || $row['item_type'] == 'folder') {
+ $collection['path'] = basename($row['path']);
+ }
+ $row['collection'] = $collection;
+ // Fetch all of the children sources
+ $children = $collectionBackend->getChildren($row[$column]);
+ foreach ($children as $child) {
+ $childItem = $row;
+ $childItem['item_type'] = $itemType;
+ if ($row['item_type'] != 'file' && $row['item_type'] != 'folder') {
+ $childItem['item_source'] = $child['source'];
+ $childItem['item_target'] = $child['target'];
+ }
+ if ($backend instanceof Share_Backend_File_Dependent) {
+ if ($row['item_type'] == 'file' || $row['item_type'] == 'folder') {
+ $childItem['file_source'] = $child['source'];
} else {
- // Unset the items array and break out of both loops
- $items = array();
- $items[] = $childItem;
- break 2;
+ $childItem['file_source'] = \OC_FileCache::getId($child['file_path']);
}
+ $childItem['file_target'] = \OC_Filesystem::normalizePath($child['file_path']);
+ }
+ if (isset($item)) {
+ if ($childItem[$column] == $item) {
+ // Return only the item instead of a 2-dimensional array
+ if ($limit == 1) {
+ if ($format == self::FORMAT_NONE) {
+ return $childItem;
+ } else {
+ // Unset the items array and break out of both loops
+ $items = array();
+ $items[] = $childItem;
+ break 2;
+ }
+ } else {
+ $collectionItems[] = $childItem;
+ }
+ }
+ } else {
+ $collectionItems[] = $childItem;
}
- } else {
- $collectionItems[] = $childItem;
}
}
}
@@ -848,6 +911,7 @@ class Share {
// Insert an extra row for the group share if the item or file target is unique for this user
if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
$query->execute(array($itemType, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
+ \OC_DB::insertid('*PREFIX*share');
}
}
if ($parentFolder === true) {
@@ -1153,7 +1217,7 @@ interface Share_Backend_Collection extends Share_Backend {
/**
* @brief Get the sources of the children of the item
* @param string Item source
- * @return array Returns an array of sources
+ * @return array Returns an array of children each inside an array with the keys: source, target, and file_path if applicable
*/
public function getChildren($itemSource);
diff --git a/lib/public/user.php b/lib/public/user.php
index b530321f21d..b320ce8ea0c 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -34,8 +34,6 @@ namespace OCP;
* This class provides access to the user management. You can get information about the currently logged in user and the permissions for example
*/
class User {
-
-
/**
* @brief get the user id of the user currently logged in.
* @return string uid or false
@@ -44,7 +42,6 @@ class User {
return \OC_USER::getUser();
}
-
/**
* @brief Get a list of all users
* @returns array with all uids
@@ -55,7 +52,6 @@ class User {
return \OC_USER::getUsers();
}
-
/**
* @brief Check if the user is logged in
* @returns true/false
@@ -66,7 +62,6 @@ class User {
return \OC_USER::isLoggedIn();
}
-
/**
* @brief check if a user exists
* @param string $uid the username
@@ -76,7 +71,6 @@ class User {
return \OC_USER::userExists( $uid );
}
-
/**
* @brief Loggs the user out including all the session data
* @returns true
@@ -87,7 +81,6 @@ class User {
return \OC_USER::logout();
}
-
/**
* @brief Check if the password is correct
* @param $uid The username
@@ -100,23 +93,18 @@ class User {
return \OC_USER::checkPassword( $uid, $password );
}
+ /**
+ * Check if the user is a admin, redirects to home if not
+ */
+ public static function checkAdminUser() {
+ \OC_Util::checkAdminUser();
+ }
- /**
- * Check if the user is a admin, redirects to home if not
- */
- public static function checkAdminUser() {
- \OC_Util::checkAdminUser();
- }
-
-
- /**
- * Check if the user is logged in, redirects to home if not. With
- * redirect URL parameter to the request URI.
- */
- public static function checkLoggedIn() {
- \OC_Util::checkLoggedIn();
- }
-
-
-
+ /**
+ * Check if the user is logged in, redirects to home if not. With
+ * redirect URL parameter to the request URI.
+ */
+ public static function checkLoggedIn() {
+ \OC_Util::checkLoggedIn();
+ }
}
diff --git a/lib/public/util.php b/lib/public/util.php
index ed23521b040..747448e62eb 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -34,8 +34,6 @@ namespace OCP;
* This class provides different helper functions to make the life of a developer easier
*/
class Util {
-
-
// consts for Logging
const DEBUG=0;
const INFO=1;
@@ -43,7 +41,6 @@ class Util {
const ERROR=3;
const FATAL=4;
-
/**
* @brief get the current installed version of ownCloud
* @return array
@@ -52,7 +49,6 @@ class Util {
return(\OC_Util::getVersion());
}
-
/**
* @brief send an email
* @param string $toaddress
@@ -68,18 +64,16 @@ class Util {
\OC_MAIL::send( $toaddress, $toname, $subject, $mailtext, $fromaddress, $fromname, $html=0, $altbody='', $ccaddress='', $ccname='', $bcc='');
}
-
- /**
+ /**
* @brief write a message in the log
* @param string $app
* @param string $message
* @param int level
- */
- public static function writeLog( $app, $message, $level ) {
- // call the internal log class
- \OC_LOG::write( $app, $message, $level );
- }
-
+ */
+ public static function writeLog( $app, $message, $level ) {
+ // call the internal log class
+ \OC_LOG::write( $app, $message, $level );
+ }
/**
* @brief add a css file
@@ -87,8 +81,7 @@ class Util {
*/
public static function addStyle( $application, $file = null ) {
\OC_Util::addStyle( $application, $file );
- }
-
+ }
/**
* @brief add a javascript file
@@ -97,7 +90,7 @@ class Util {
*/
public static function addScript( $application, $file = null ) {
\OC_Util::addScript( $application, $file );
- }
+ }
/**
* @brief Add a custom element to the header
@@ -118,8 +111,6 @@ class Util {
return(\OC_Util::formatDate( $timestamp,$dateOnly ));
}
-
-
/**
* @brief Creates an absolute url
* @param $app app
@@ -133,7 +124,6 @@ class Util {
return(\OC_Helper::linkToAbsolute( $app, $file, $args ));
}
-
/**
* @brief Creates an absolute url for remote use
* @param $service id
@@ -156,7 +146,6 @@ class Util {
return \OC_Helper::linkToPublic($service);
}
-
/**
* @brief Creates an url
* @param $app app
@@ -199,11 +188,10 @@ class Util {
*
* Returns the path to the image.
*/
- public static function imagePath( $app, $image ) {
+ public static function imagePath( $app, $image ) {
return(\OC_Helper::imagePath( $app, $image ));
}
-
/**
* @brief Make a human file size
* @param $bytes file size in bytes
@@ -244,7 +232,6 @@ class Util {
return(\OC_Hook::connect( $signalclass, $signalname, $slotclass, $slotname ));
}
-
/**
* @brief emitts a signal
* @param $signalclass class name of emitter
@@ -260,7 +247,6 @@ class Util {
return(\OC_Hook::emit( $signalclass, $signalname, $params ));
}
-
/**
* Register an get/post call. This is important to prevent CSRF attacks
* TODO: write example
@@ -269,7 +255,6 @@ class Util {
return(\OC_Util::callRegister());
}
-
/**
* Check an ajax get/post call if the request token is valid. exit if not.
* Todo: Write howto
diff --git a/lib/setup.php b/lib/setup.php
index f27254a42a4..c21c8be3957 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -9,7 +9,7 @@ $opts = array(
'hasSQLite' => $hasSQLite,
'hasMySQL' => $hasMySQL,
'hasPostgreSQL' => $hasPostgreSQL,
- 'hasOracle' => $hasOracle,
+ 'hasOracle' => $hasOracle,
'directory' => $datadir,
'errors' => array(),
);
@@ -51,10 +51,10 @@ class OC_Setup {
if($dbtype=='mysql' or $dbtype == 'pgsql' or $dbtype == 'oci') { //mysql and postgresql needs more config options
if($dbtype=='mysql')
$dbprettyname = 'MySQL';
- else if($dbtype=='pgsql')
- $dbprettyname = 'PostgreSQL';
- else
- $dbprettyname = 'Oracle';
+ else if($dbtype=='pgsql')
+ $dbprettyname = 'PostgreSQL';
+ else
+ $dbprettyname = 'Oracle';
if(empty($options['dbuser'])) {
@@ -63,7 +63,7 @@ class OC_Setup {
if(empty($options['dbname'])) {
$error[] = "$dbprettyname enter the database name.";
}
- if(empty($options['dbhost'])) {
+ if($dbtype != 'oci' && empty($options['dbhost'])) {
$error[] = "$dbprettyname set the database host.";
}
}
@@ -232,117 +232,125 @@ class OC_Setup {
}
}
}
- elseif($dbtype == 'oci') {
- $dbuser = $options['dbuser'];
- $dbpass = $options['dbpass'];
- $dbname = $options['dbname'];
- $dbtablespace = $options['dbtablespace'];
- $dbhost = $options['dbhost'];
- $dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
- OC_CONFIG::setValue('dbname', $dbname);
- OC_CONFIG::setValue('dbtablespace', $dbtablespace);
- OC_CONFIG::setValue('dbhost', $dbhost);
- OC_CONFIG::setValue('dbtableprefix', $dbtableprefix);
-
- $e_host = addslashes($dbhost);
- $e_dbname = addslashes($dbname);
- //check if the database user has admin right
- $connection_string = '//'.$e_host.'/'.$e_dbname;
- $connection = @oci_connect($dbuser, $dbpass, $connection_string);
- if(!$connection) {
- $e = oci_error();
- $error[] = array(
- 'error' => 'Oracle username and/or password not valid',
- 'hint' => 'You need to enter either an existing account or the administrator.'
- );
- return $error;
- } else {
- //check for roles creation rights in oracle
-
- $query="SELECT count(*) FROM user_role_privs, role_sys_privs WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
- $stmt = oci_parse($connection, $query);
- if (!$stmt) {
- $entry='DB Error: "'.oci_last_error($connection).'"<br />';
- $entry.='Offending command was: '.$query.'<br />';
- echo($entry);
- }
- $result = oci_execute($stmt);
- if($result) {
- $row = oci_fetch_row($stmt);
- }
- if($result and $row[0] > 0) {
- //use the admin login data for the new database user
-
- //add prefix to the oracle user name to prevent collisions
- $dbusername='oc_'.$username;
- //create a new password so we don't need to store the admin config in the config file
- $dbpassword=md5(time().$dbpass);
-
- //oracle passwords are treated as identifiers:
- // must start with aphanumeric char
- // needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
- $dbpassword=substr($dbpassword, 0, 30);
-
- self::oci_createDBUser($dbusername, $dbpassword, $dbtablespace, $connection);
-
- OC_CONFIG::setValue('dbuser', $dbusername);
- OC_CONFIG::setValue('dbname', $dbusername);
- OC_CONFIG::setValue('dbpassword', $dbpassword);
-
- //create the database not neccessary, oracle implies user = schema
- //self::oci_createDatabase($dbname, $dbusername, $connection);
- } else {
-
- OC_CONFIG::setValue('dbuser', $dbuser);
- OC_CONFIG::setValue('dbname', $dbname);
- OC_CONFIG::setValue('dbpassword', $dbpass);
-
- //create the database not neccessary, oracle implies user = schema
- //self::oci_createDatabase($dbname, $dbuser, $connection);
- }
-
- //FIXME check tablespace exists: select * from user_tablespaces
-
- // the connection to dbname=oracle is not needed anymore
- oci_close($connection);
-
- // connect to the oracle database (schema=$dbuser) an check if the schema needs to be filled
- $dbuser = OC_CONFIG::getValue('dbuser');
- //$dbname = OC_CONFIG::getValue('dbname');
- $dbpass = OC_CONFIG::getValue('dbpassword');
-
- $e_host = addslashes($dbhost);
- $e_dbname = addslashes($dbname);
-
- $connection_string = '//'.$e_host.'/'.$e_dbname;
- $connection = @oci_connect($dbuser, $dbpass, $connection_string);
- if(!$connection) {
- $error[] = array(
- 'error' => 'Oracle username and/or password not valid',
- 'hint' => 'You need to enter either an existing account or the administrator.'
- );
- return $error;
- } else {
- $query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
- $stmt = oci_parse($connection, $query);
- $un = $dbtableprefix.'users';
- oci_bind_by_name($stmt, ':un', $un);
- if (!$stmt) {
- $entry='DB Error: "'.oci_last_error($connection).'"<br />';
- $entry.='Offending command was: '.$query.'<br />';
- echo($entry);
- }
- $result = oci_execute($stmt);
-
- if($result) {
- $row = oci_fetch_row($stmt);
- }
- if(!$result or $row[0]==0) {
- OC_DB::createDbFromStructure('db_structure.xml');
- }
- }
- }
- }
+ elseif($dbtype == 'oci') {
+ $dbuser = $options['dbuser'];
+ $dbpass = $options['dbpass'];
+ $dbname = $options['dbname'];
+ $dbtablespace = $options['dbtablespace'];
+ $dbhost = isset($options['dbhost'])?$options['dbhost']:'';
+ $dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
+ OC_CONFIG::setValue('dbname', $dbname);
+ OC_CONFIG::setValue('dbtablespace', $dbtablespace);
+ OC_CONFIG::setValue('dbhost', $dbhost);
+ OC_CONFIG::setValue('dbtableprefix', $dbtableprefix);
+
+ $e_host = addslashes($dbhost);
+ $e_dbname = addslashes($dbname);
+ //check if the database user has admin right
+ if ($e_host == '') {
+ $easy_connect_string = $e_dbname; // use dbname as easy connect name
+ } else {
+ $easy_connect_string = '//'.$e_host.'/'.$e_dbname;
+ }
+ $connection = @oci_connect($dbuser, $dbpass, $easy_connect_string);
+ if(!$connection) {
+ $e = oci_error();
+ $error[] = array(
+ 'error' => 'Oracle username and/or password not valid',
+ 'hint' => 'You need to enter either an existing account or the administrator.'
+ );
+ return $error;
+ } else {
+ //check for roles creation rights in oracle
+
+ $query="SELECT count(*) FROM user_role_privs, role_sys_privs WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
+ $stmt = oci_parse($connection, $query);
+ if (!$stmt) {
+ $entry='DB Error: "'.oci_last_error($connection).'"<br />';
+ $entry.='Offending command was: '.$query.'<br />';
+ echo($entry);
+ }
+ $result = oci_execute($stmt);
+ if($result) {
+ $row = oci_fetch_row($stmt);
+ }
+ if($result and $row[0] > 0) {
+ //use the admin login data for the new database user
+
+ //add prefix to the oracle user name to prevent collisions
+ $dbusername='oc_'.$username;
+ //create a new password so we don't need to store the admin config in the config file
+ $dbpassword=md5(time().$dbpass);
+
+ //oracle passwords are treated as identifiers:
+ // must start with aphanumeric char
+ // needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
+ $dbpassword=substr($dbpassword, 0, 30);
+
+ self::oci_createDBUser($dbusername, $dbpassword, $dbtablespace, $connection);
+
+ OC_CONFIG::setValue('dbuser', $dbusername);
+ OC_CONFIG::setValue('dbname', $dbusername);
+ OC_CONFIG::setValue('dbpassword', $dbpassword);
+
+ //create the database not neccessary, oracle implies user = schema
+ //self::oci_createDatabase($dbname, $dbusername, $connection);
+ } else {
+
+ OC_CONFIG::setValue('dbuser', $dbuser);
+ OC_CONFIG::setValue('dbname', $dbname);
+ OC_CONFIG::setValue('dbpassword', $dbpass);
+
+ //create the database not neccessary, oracle implies user = schema
+ //self::oci_createDatabase($dbname, $dbuser, $connection);
+ }
+
+ //FIXME check tablespace exists: select * from user_tablespaces
+
+ // the connection to dbname=oracle is not needed anymore
+ oci_close($connection);
+
+ // connect to the oracle database (schema=$dbuser) an check if the schema needs to be filled
+ $dbuser = OC_CONFIG::getValue('dbuser');
+ //$dbname = OC_CONFIG::getValue('dbname');
+ $dbpass = OC_CONFIG::getValue('dbpassword');
+
+ $e_host = addslashes($dbhost);
+ $e_dbname = addslashes($dbname);
+
+ if ($e_host == '') {
+ $easy_connect_string = $e_dbname; // use dbname as easy connect name
+ } else {
+ $easy_connect_string = '//'.$e_host.'/'.$e_dbname;
+ }
+ $connection = @oci_connect($dbuser, $dbpass, $easy_connect_string);
+ if(!$connection) {
+ $error[] = array(
+ 'error' => 'Oracle username and/or password not valid',
+ 'hint' => 'You need to enter either an existing account or the administrator.'
+ );
+ return $error;
+ } else {
+ $query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
+ $stmt = oci_parse($connection, $query);
+ $un = $dbtableprefix.'users';
+ oci_bind_by_name($stmt, ':un', $un);
+ if (!$stmt) {
+ $entry='DB Error: "'.oci_last_error($connection).'"<br />';
+ $entry.='Offending command was: '.$query.'<br />';
+ echo($entry);
+ }
+ $result = oci_execute($stmt);
+
+ if($result) {
+ $row = oci_fetch_row($stmt);
+ }
+ if(!$result or $row[0]==0) {
+ OC_DB::createDbFromStructure('db_structure.xml');
+ }
+ }
+ }
+ }
else {
//delete the old sqlite database first, might cause infinte loops otherwise
if(file_exists("$datadir/owncloud.db")) {
@@ -462,79 +470,79 @@ class OC_Setup {
}
}
}
- /**
- *
- * @param String $name
- * @param String $password
- * @param String $tablespace
- * @param resource $connection
- */
- private static function oci_createDBUser($name, $password, $tablespace, $connection) {
-
- $query = "SELECT * FROM all_users WHERE USERNAME = :un";
- $stmt = oci_parse($connection, $query);
- if (!$stmt) {
- $entry='DB Error: "'.oci_error($connection).'"<br />';
- $entry.='Offending command was: '.$query.'<br />';
- echo($entry);
- }
- oci_bind_by_name($stmt, ':un', $name);
- $result = oci_execute($stmt);
- if(!$result) {
- $entry='DB Error: "'.oci_error($connection).'"<br />';
- $entry.='Offending command was: '.$query.'<br />';
- echo($entry);
- }
-
- if(! oci_fetch_row($stmt)) {
- //user does not exists let's create it :)
- //password must start with alphabetic character in oracle
- $query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$tablespace; //TODO set default tablespace
- $stmt = oci_parse($connection, $query);
- if (!$stmt) {
- $entry='DB Error: "'.oci_error($connection).'"<br />';
- $entry.='Offending command was: '.$query.'<br />';
- echo($entry);
- }
- //oci_bind_by_name($stmt, ':un', $name);
- $result = oci_execute($stmt);
- if(!$result) {
- $entry='DB Error: "'.oci_error($connection).'"<br />';
- $entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'<br />';
- echo($entry);
- }
- } else { // change password of the existing role
- $query = "ALTER USER :un IDENTIFIED BY :pw";
- $stmt = oci_parse($connection, $query);
- if (!$stmt) {
- $entry='DB Error: "'.oci_error($connection).'"<br />';
- $entry.='Offending command was: '.$query.'<br />';
- echo($entry);
- }
- oci_bind_by_name($stmt, ':un', $name);
- oci_bind_by_name($stmt, ':pw', $password);
- $result = oci_execute($stmt);
- if(!$result) {
- $entry='DB Error: "'.oci_error($connection).'"<br />';
- $entry.='Offending command was: '.$query.'<br />';
- echo($entry);
- }
- }
- // grant neccessary roles
- $query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
- $stmt = oci_parse($connection, $query);
- if (!$stmt) {
- $entry='DB Error: "'.oci_error($connection).'"<br />';
- $entry.='Offending command was: '.$query.'<br />';
- echo($entry);
- }
- $result = oci_execute($stmt);
- if(!$result) {
- $entry='DB Error: "'.oci_error($connection).'"<br />';
- $entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'<br />';
- echo($entry);
- }
- }
+ /**
+ *
+ * @param String $name
+ * @param String $password
+ * @param String $tablespace
+ * @param resource $connection
+ */
+ private static function oci_createDBUser($name, $password, $tablespace, $connection) {
+
+ $query = "SELECT * FROM all_users WHERE USERNAME = :un";
+ $stmt = oci_parse($connection, $query);
+ if (!$stmt) {
+ $entry='DB Error: "'.oci_error($connection).'"<br />';
+ $entry.='Offending command was: '.$query.'<br />';
+ echo($entry);
+ }
+ oci_bind_by_name($stmt, ':un', $name);
+ $result = oci_execute($stmt);
+ if(!$result) {
+ $entry='DB Error: "'.oci_error($connection).'"<br />';
+ $entry.='Offending command was: '.$query.'<br />';
+ echo($entry);
+ }
+
+ if(! oci_fetch_row($stmt)) {
+ //user does not exists let's create it :)
+ //password must start with alphabetic character in oracle
+ $query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$tablespace; //TODO set default tablespace
+ $stmt = oci_parse($connection, $query);
+ if (!$stmt) {
+ $entry='DB Error: "'.oci_error($connection).'"<br />';
+ $entry.='Offending command was: '.$query.'<br />';
+ echo($entry);
+ }
+ //oci_bind_by_name($stmt, ':un', $name);
+ $result = oci_execute($stmt);
+ if(!$result) {
+ $entry='DB Error: "'.oci_error($connection).'"<br />';
+ $entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'<br />';
+ echo($entry);
+ }
+ } else { // change password of the existing role
+ $query = "ALTER USER :un IDENTIFIED BY :pw";
+ $stmt = oci_parse($connection, $query);
+ if (!$stmt) {
+ $entry='DB Error: "'.oci_error($connection).'"<br />';
+ $entry.='Offending command was: '.$query.'<br />';
+ echo($entry);
+ }
+ oci_bind_by_name($stmt, ':un', $name);
+ oci_bind_by_name($stmt, ':pw', $password);
+ $result = oci_execute($stmt);
+ if(!$result) {
+ $entry='DB Error: "'.oci_error($connection).'"<br />';
+ $entry.='Offending command was: '.$query.'<br />';
+ echo($entry);
+ }
+ }
+ // grant neccessary roles
+ $query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
+ $stmt = oci_parse($connection, $query);
+ if (!$stmt) {
+ $entry='DB Error: "'.oci_error($connection).'"<br />';
+ $entry.='Offending command was: '.$query.'<br />';
+ echo($entry);
+ }
+ $result = oci_execute($stmt);
+ if(!$result) {
+ $entry='DB Error: "'.oci_error($connection).'"<br />';
+ $entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'<br />';
+ echo($entry);
+ }
+ }
/**
* create .htaccess files for apache hosts
diff --git a/lib/template.php b/lib/template.php
index 8c872a2059b..76a0b372b3c 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -158,7 +158,8 @@ class OC_Template{
if($renderas == 'user') {
$this->vars['requesttoken'] = OC_Util::callRegister();
}
- $this->l10n = OC_L10N::get($app);
+ $parts = explode('/', $app); // fix translation when app is something like core/lostpassword
+ $this->l10n = OC_L10N::get($parts[0]);
header('X-Frame-Options: Sameorigin');
header('X-XSS-Protection: 1; mode=block');
header('X-Content-Type-Options: nosniff');
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index d72f5552fde..c898628bcdf 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -41,7 +41,7 @@ class OC_TemplateLayout extends OC_Template {
}
$this->assign( 'apps_paths', str_replace('\\/', '/',json_encode($apps_paths)),false ); // Ugly unescape slashes waiting for better solution
- if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) {
+ if (OC_Config::getValue('installed', false) && !OC_AppConfig::getValue('core', 'remote_core.css', false)) {
OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
}
diff --git a/lib/user.php b/lib/user.php
index 89dab9f9647..7de2a4b7fe6 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -416,9 +416,16 @@ class OC_User {
* @param string $userid the user to disable
*/
public static function disableUser($userid) {
- $query = "INSERT INTO `*PREFIX*preferences` (`userid`, `appid`, `configkey`, `configvalue`) VALUES(?, ?, ?, ?)";
- $query = OC_DB::prepare($query);
- $query->execute(array($userid, 'core', 'enabled', 'false'));
+ $sql = "INSERT INTO `*PREFIX*preferences` (`userid`, `appid`, `configkey`, `configvalue`) VALUES(?, ?, ?, ?)";
+ $stmt = OC_DB::prepare($sql);
+ if ( ! OC_DB::isError($stmt) ) {
+ $result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
+ if ( OC_DB::isError($result) ) {
+ OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
+ }
+ } else {
+ OC_Log::write('OC_User', 'could not disable user: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+ }
}
/**
@@ -426,9 +433,16 @@ class OC_User {
* @param string $userid
*/
public static function enableUser($userid) {
- $query = "DELETE FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
- $query = OC_DB::prepare($query);
- $query->execute(array($userid, 'core', 'enabled', 'false'));
+ $sql = "DELETE FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
+ $stmt = OC_DB::prepare($sql);
+ if ( ! OC_DB::isError($stmt) ) {
+ $result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
+ if ( OC_DB::isError($result) ) {
+ OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
+ }
+ } else {
+ OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+ }
}
/**
@@ -437,10 +451,19 @@ class OC_User {
* @return bool
*/
public static function isEnabled($userid) {
- $query = "SELECT `userid` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
- $query = OC_DB::prepare($query);
- $results = $query->execute(array($userid, 'core', 'enabled', 'false'));
- return $results->numRows() ? false : true;
+ $sql = "SELECT `userid` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
+ $stmt = OC_DB::prepare($sql);
+ if ( ! OC_DB::isError($stmt) ) {
+ $result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
+ if ( ! OC_DB::isError($result) ) {
+ return $result->numRows() ? false : true;
+ } else {
+ OC_Log::write('OC_User', 'could not check if enabled: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
+ }
+ } else {
+ OC_Log::write('OC_User', 'could not check if enabled: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+ }
+ return false;
}
/**
diff --git a/lib/user/database.php b/lib/user/database.php
index 76b44a2f6ca..25e24fcf7e4 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -155,7 +155,7 @@ class OC_User_Database extends OC_User_Backend {
* Get a list of all users.
*/
public function getUsers($search = '', $limit = null, $offset = null) {
- $query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE `uid` LIKE ?',$limit,$offset);
+ $query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)',$limit,$offset);
$result = $query->execute(array($search.'%'));
$users = array();
while ($row = $result->fetchRow()) {
diff --git a/lib/util.php b/lib/util.php
index 78976c96606..a8d2fcedd20 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -81,7 +81,7 @@ class OC_Util {
*/
public static function getVersion() {
// hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4,9,0. This is not visible to the user
- return array(4,83,6);
+ return array(4,84,10);
}
/**
@@ -89,7 +89,7 @@ class OC_Util {
* @return string
*/
public static function getVersionString() {
- return '4.5 beta 2';
+ return '4.5 beta 4';
}
/**
@@ -200,22 +200,24 @@ class OC_Util {
public static function checkServer() {
$errors=array();
+ $web_server_restart= false;
//check for database drivers
if(!(is_callable('sqlite_open') or class_exists('SQLite3')) and !is_callable('mysql_connect') and !is_callable('pg_connect')) {
$errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.<br/>','hint'=>'');//TODO: sane hint
+ $web_server_restart= true;
}
//common hint for all file permissons error messages
$permissionsHint="Permissions can usually be fixed by giving the webserver write access to the ownCloud directory";
// Check if config folder is writable.
- if(!is_writable(OC::$SERVERROOT."/config/")) {
+ if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) {
$errors[]=array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud");
}
// Check if there is a writable install folder.
if(OC_Config::getValue('appstoreenabled', true)) {
- if( OC_App::getInstallPath() === null || !is_writable(OC_App::getInstallPath())) {
+ if( OC_App::getInstallPath() === null || !is_writable(OC_App::getInstallPath()) || !is_readable(OC_App::getInstallPath()) ) {
$errors[]=array('error'=>"Can't write into apps directory",'hint'=>"You can usually fix this by giving the webserver user write access to the apps directory
in owncloud or disabling the appstore in the config file.");
}
@@ -255,35 +257,47 @@ class OC_Util {
if(!$success) {
$errors[]=array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY.")",'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '".OC::$SERVERROOT."' (in a terminal, use the command 'chown -R www-data:www-data /path/to/your/owncloud/install/data' ");
}
- } else if(!is_writable($CONFIG_DATADIRECTORY)) {
+ } else if(!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) {
$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud<br/>','hint'=>$permissionsHint);
}
// check if all required php modules are present
if(!class_exists('ZipArchive')) {
$errors[]=array('error'=>'PHP module zip not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+ $web_server_restart= false;
}
if(!function_exists('mb_detect_encoding')) {
$errors[]=array('error'=>'PHP module mb multibyte not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+ $web_server_restart= false;
}
if(!function_exists('ctype_digit')) {
$errors[]=array('error'=>'PHP module ctype is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+ $web_server_restart= false;
}
if(!function_exists('json_encode')) {
$errors[]=array('error'=>'PHP module JSON is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+ $web_server_restart= false;
}
if(!function_exists('imagepng')) {
$errors[]=array('error'=>'PHP module GD is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+ $web_server_restart= false;
}
if(!function_exists('gzencode')) {
$errors[]=array('error'=>'PHP module zlib is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+ $web_server_restart= false;
}
if(floatval(phpversion())<5.3) {
$errors[]=array('error'=>'PHP 5.3 is required.<br/>','hint'=>'Please ask your server administrator to update PHP to version 5.3 or higher. PHP 5.2 is no longer supported by ownCloud and the PHP community.');
+ $web_server_restart= false;
}
if(!defined('PDO::ATTR_DRIVER_NAME')) {
$errors[]=array('error'=>'PHP PDO module is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+ $web_server_restart= false;
+ }
+
+ if($web_server_restart) {
+ $errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?<br/>','hint'=>'Please ask your server administrator to restart the web server.');
}
return $errors;
diff --git a/lib/vcategories.php b/lib/vcategories.php
index f5123adeeb6..6b1d6a316f1 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -55,7 +55,10 @@ class OC_VCategories {
$this->app = $app;
$this->user = is_null($user) ? OC_User::getUser() : $user;
$categories = trim(OC_Preferences::getValue($this->user, $app, self::PREF_CATEGORIES_LABEL, ''));
- $this->categories = $categories != '' ? @unserialize($categories) : $defcategories;
+ if ($categories) {
+ $categories = @unserialize($categories);
+ }
+ $this->categories = is_array($categories) ? $categories : $defcategories;
}
/**
diff --git a/search/js/result.js b/search/js/result.js
index 27a2383e2c3..aaecde08c6b 100644
--- a/search/js/result.js
+++ b/search/js/result.js
@@ -45,7 +45,7 @@ OC.search.showResults=function(results){
var row=$('#searchresults tr.template').clone();
row.removeClass('template');
row.addClass('result');
- if (index == 0){
+ if (i == 0){
row.children('td.type').text(name);
}
row.find('td.result a').attr('href',type[i].link);
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index 71cb046fc8d..fb78cc89248 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -11,7 +11,7 @@ require_once '../../../lib/base.php';
OC_JSON::checkAdminUser();
-$l = OC_L10N::get('core');
+$l = OC_L10N::get('settings');
if(OC_Config::getValue('appstoreenabled', true)==false) {
OCP\JSON::success(array('type' => 'external', 'data' => array()));
@@ -63,4 +63,3 @@ if(is_array($catagoryNames)) {
}
OCP\JSON::success(array('type' => 'external', 'data' => $apps));
-
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index b9cf6a13670..c3b3491db93 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -10,5 +10,6 @@ $appid = OC_App::enable($_POST['appid']);
if($appid !== false) {
OC_JSON::success(array('data' => array('appid' => $appid)));
} else {
- OC_JSON::error();
+ $l = OC_L10N::get('settings');
+ OC_JSON::error(array("data" => array( "message" => $l->t("Could not enable app. ") )));
}
diff --git a/settings/apps.php b/settings/apps.php
index e613814fe94..a1c1bf6aa53 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -29,45 +29,116 @@ OC_Util::addStyle( "settings", "settings" );
OC_Util::addScript( "settings", "apps" );
OC_App::setActiveNavigationEntry( "core_apps" );
-$registeredApps=OC_App::getAllApps();
-$apps=array();
+$installedApps = OC_App::getAllApps();
-//TODO which apps do we want to blacklist and how do we integrate blacklisting with the multi apps folder feature
-$blacklist=array('files');//we dont want to show configuration for these
+//TODO which apps do we want to blacklist and how do we integrate blacklisting with the multi apps folder feature?
-foreach($registeredApps as $app) {
- if(array_search($app, $blacklist)===false) {
+$blacklist = array('files');//we dont want to show configuration for these
+
+$appList = array();
+
+foreach ( $installedApps as $app ) {
+
+ if ( array_search( $app, $blacklist ) === false ) {
+
$info=OC_App::getAppInfo($app);
+
if (!isset($info['name'])) {
+
OC_Log::write('core', 'App id "'.$app.'" has no name in appinfo', OC_Log::ERROR);
+
continue;
+
}
- $active=(OC_Appconfig::getValue($app, 'enabled', 'no')=='yes')?true:false;
- $info['active']=$active;
+
+ if ( OC_Appconfig::getValue( $app, 'enabled', 'no') == 'yes' ) {
+
+ $active = true;
+
+ } else {
+
+ $active = false;
+
+ }
+
+ $info['active'] = $active;
+
if(isset($info['shipped']) and ($info['shipped']=='true')) {
+
$info['internal']=true;
+
$info['internallabel']='Internal App';
+
}else{
+
$info['internal']=false;
+
$info['internallabel']='3rd Party App';
+
}
- $info['preview']='trans.png';
- $info['version']=OC_App::getAppVersion($app);
- $apps[]=$info;
+
+ $info['preview'] = 'trans.png';
+
+ $info['version'] = OC_App::getAppVersion($app);
+
+ $appList[] = $info;
+
}
}
-function app_sort($a, $b) {
+$remoteApps = OC_App::getAppstoreApps();
+
+if ( $remoteApps ) {
+
+ // Remove duplicates
+ foreach ( $appList as $app ) {
+
+ foreach ( $remoteApps AS $key => $remote ) {
+
+ if (
+ $app['name'] == $remote['name']
+ // To set duplicate detection to use OCS ID instead of string name,
+ // enable this code, remove the line of code above,
+ // and add <ocs_id>[ID]</ocs_id> to info.xml of each 3rd party app:
+ // OR $app['ocs_id'] == $remote['ocs_id']
+ ) {
+
+ unset( $remoteApps[$key]);
+
+ }
+
+ }
+
+ }
+
+ $combinedApps = array_merge( $appList, $remoteApps );
+
+} else {
+
+ $combinedApps = $appList;
+
+}
+
+function app_sort( $a, $b ) {
+
if ($a['active'] != $b['active']) {
+
return $b['active'] - $a['active'];
+
}
+
return strcmp($a['name'], $b['name']);
+
}
-usort($apps, 'app_sort');
+
+usort( $combinedApps, 'app_sort' );
$tmpl = new OC_Template( "settings", "apps", "user" );
-$tmpl->assign('apps', $apps, false);
+
+$tmpl->assign('apps', $combinedApps, false);
+
$appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
+
$tmpl->assign('appid', $appid);
$tmpl->printPage();
diff --git a/settings/css/settings.css b/settings/css/settings.css
index f41edc96fb8..2015e93b43c 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -65,4 +65,4 @@ span.version { margin-left:3em; margin-right:3em; color:#555; }
/* ADMIN */
span.securitywarning {color:#C33; font-weight:bold; }
input[type=radio] { width:1em; }
-table.shareAPI td { padding-right: 2em; } \ No newline at end of file
+table.shareAPI td { padding-bottom: 0.8em; }
diff --git a/settings/js/apps.js b/settings/js/apps.js
index bb931232763..4ffbc41f22c 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -7,18 +7,6 @@
OC.Settings = OC.Settings || {};
OC.Settings.Apps = OC.Settings.Apps || {
- loadOCS:function() {
- $.getJSON(OC.filePath('settings', 'ajax', 'apps/ocs.php'), function(jsondata) {
- if(jsondata.status == 'success'){
- var apps = jsondata.data;
- $.each(apps, function(b, appdata) {
- OC.Settings.Apps.insertApp(appdata);
- });
- } else {
- OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
- }
- });
- },
loadApp:function(app) {
var page = $('#rightcontent');
page.find('p.license').show();
@@ -137,6 +125,4 @@ $(document).ready(function(){
$('#leftcontent').animate({scrollTop: $(item).offset().top-70}, 'slow','swing');
}
}
-
- OC.Settings.Apps.loadOCS();
});
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index eca8a300b1b..36cad27d3a3 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -8,9 +8,6 @@
"Problems connecting to help database." => "الاتصال بقاعدة بيانات المساعدة لم يتم بنجاح",
"Go there manually." => "إذهب هنالك بنفسك",
"Answer" => "الجواب",
-"You use" => "أنت تستخدم",
-"of the available" => "من الموجود",
-"Your password got changed" => "لقد تم تغيير كلمات السر",
"Unable to change your password" => "لم يتم تعديل كلمة السر بنجاح",
"Current password" => "كلمات السر الحالية",
"New password" => "كلمات سر جديدة",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index b261c22b032..6a46348b300 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -13,10 +13,7 @@
"Problems connecting to help database." => "Проблеми при свързване с помощната база",
"Go there manually." => "Отидете ръчно.",
"Answer" => "Отговор",
-"You use" => "Вие ползвате",
-"of the available" => "от наличните",
"Download" => "Изтегляне",
-"Your password got changed" => "Вашата парола е сменена",
"Unable to change your password" => "Невъзможна промяна на паролата",
"Current password" => "Текуща парола",
"New password" => "Нова парола",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 062e9a97342..54bfdecde74 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -3,6 +3,7 @@
"Authentication error" => "Error d'autenticació",
"Group already exists" => "El grup ja existeix",
"Unable to add group" => "No es pot afegir el grup",
+"Could not enable app. " => "No s'ha pogut activar l'apliació",
"Email saved" => "S'ha desat el correu electrònic",
"Invalid email" => "El correu electrònic no és vàlid",
"OpenID Changed" => "OpenID ha canviat",
@@ -12,7 +13,6 @@
"Language changed" => "S'ha canviat l'idioma",
"Unable to add user to group %s" => "No es pot afegir l'usuari al grup %s",
"Unable to remove user from group %s" => "No es pot eliminar l'usuari del grup %s",
-"Error" => "Error",
"Disable" => "Desactiva",
"Enable" => "Activa",
"Saving..." => "S'està desant...",
@@ -20,10 +20,10 @@
"Security Warning" => "Avís de seguretat",
"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." => "La carpeta de dades i els vostres fitxersprobablement són accessibles des d'Internet. La fitxer .htaccess que ownCloud proporciona no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web.",
"Cron" => "Cron",
-"execute one task with each page loaded" => "executa una tasca en carregar cada pàgina",
-"cron.php is registered at a webcron service" => "cron.php està registrat en un servei web cron",
-"use systems cron service" => "usa el servei cron del sistema",
-"Share API" => "API de compartir",
+"Execute one task with each page loaded" => "Executar una tasca de cada pàgina carregada",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php està registrat en un servei webcron. Feu una crida a la pàgina cron.php a l'arrel de ownCloud cada minut a través de http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utilitzeu el sistema de servei cron. Cridar el arxiu cron.php de la carpeta owncloud cada minut utilitzant el sistema de tasques cron.",
+"Sharing" => "Compartir",
"Enable Share API" => "Activa l'API de compartir",
"Allow apps to use the Share API" => "Permet que les aplicacions usin l'API de compartir",
"Allow links" => "Permet enllaços",
@@ -45,11 +45,10 @@
"Problems connecting to help database." => "Problemes per connectar amb la base de dades d'ajuda.",
"Go there manually." => "Vés-hi manualment.",
"Answer" => "Resposta",
-"You use" => "Esteu usant",
-"of the available" => "d'un total disponible de",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Ha utilitzat <strong>%s</strong> de la <strong>%s</strong> disponible",
"Desktop and Mobile Syncing Clients" => "Clients de sincronització d'escriptori i de mòbil",
"Download" => "Baixada",
-"Your password got changed" => "La contrasenya ha canviat",
+"Your password was changed" => "La seva contrasenya s'ha canviat",
"Unable to change your password" => "No s'ha pogut canviar la contrasenya",
"Current password" => "Contrasenya actual",
"New password" => "Contrasenya nova",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index a68f10269f5..bc64b68992b 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -3,6 +3,7 @@
"Authentication error" => "Chyba ověření",
"Group already exists" => "Skupina již existuje",
"Unable to add group" => "Nelze přidat skupinu",
+"Could not enable app. " => "Nelze povolit aplikaci.",
"Email saved" => "E-mail uložen",
"Invalid email" => "Neplatný e-mail",
"OpenID Changed" => "OpenID změněno",
@@ -12,7 +13,6 @@
"Language changed" => "Jazyk byl změněn",
"Unable to add user to group %s" => "Nelze přidat uživatele do skupiny %s",
"Unable to remove user from group %s" => "Nelze odstranit uživatele ze skupiny %s",
-"Error" => "Chyba",
"Disable" => "Zakázat",
"Enable" => "Povolit",
"Saving..." => "Ukládám...",
@@ -20,10 +20,10 @@
"Security Warning" => "Bezpečnostní varování",
"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." => "Váš adresář dat a soubory jsou pravděpodobně přístupné z internetu. Soubor .htacces, který ownCloud poskytuje nefunguje. Doporučujeme Vám abyste nastavili Váš webový server tak, aby nebylo možno přistupovat do adresáře s daty, nebo přesunuli adresář dat mimo kořenovou složku dokumentů webového serveru.",
"Cron" => "Cron",
-"execute one task with each page loaded" => "spustit jednu úlohu s každou načtenou stránkou",
-"cron.php is registered at a webcron service" => "cron.php je registrován jako služba webcron",
-"use systems cron service" => "použít systémovou službu cron",
-"Share API" => "API sdílení",
+"Execute one task with each page loaded" => "Spustit jednu úlohu s každou načtenou stránkou",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php je registrován u služby webcron. Zavolá stránku cron.php v kořenovém adresáři owncloud každou minutu skrze http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Použít systémovou službu cron. Zavolat soubor cron.php ze složky owncloud pomocí systémové úlohy cron každou minutu.",
+"Sharing" => "Sdílení",
"Enable Share API" => "Povolit API sdílení",
"Allow apps to use the Share API" => "Povolit aplikacím používat API sdílení",
"Allow links" => "Povolit odkazy",
@@ -45,11 +45,10 @@
"Problems connecting to help database." => "Problémy s připojením k databázi s nápovědou.",
"Go there manually." => "Přejít ručně.",
"Answer" => "Odpověď",
-"You use" => "Využíváte",
-"of the available" => "z dostupných",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Použili jste <strong>%s</strong> z dostupných <strong>%s<strong>",
"Desktop and Mobile Syncing Clients" => "Klienti pro synchronizaci",
"Download" => "Stáhnout",
-"Your password got changed" => "Vaše heslo bylo změněno",
+"Your password was changed" => "Vaše heslo bylo změněno",
"Unable to change your password" => "Vaše heslo nelze změnit",
"Current password" => "Současné heslo",
"New password" => "Nové heslo",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 0c09a25dfdb..9ad77eb0c17 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -6,17 +6,12 @@
"OpenID Changed" => "OpenID ændret",
"Invalid request" => "Ugyldig forespørgsel",
"Language changed" => "Sprog ændret",
-"Error" => "Fejl",
"Disable" => "Deaktiver",
"Enable" => "Aktiver",
"Saving..." => "Gemmer...",
"__language_name__" => "Dansk",
"Security Warning" => "Sikkerhedsadvarsel",
"Cron" => "Cron",
-"execute one task with each page loaded" => "udfør en opgave for hver indlæst side",
-"cron.php is registered at a webcron service" => "cron.php er tilmeldt en webcron tjeneste",
-"use systems cron service" => "brug systemets cron service",
-"Share API" => "Del API",
"Enable Share API" => "Aktiver dele API",
"Allow apps to use the Share API" => "Tillad apps a bruge dele APIen",
"Allow links" => "Tillad links",
@@ -35,11 +30,8 @@
"Problems connecting to help database." => "Problemer med at forbinde til hjælpe-databasen.",
"Go there manually." => "Gå derhen manuelt.",
"Answer" => "Svar",
-"You use" => "Du benytter",
-"of the available" => "af det tilgængelige",
"Desktop and Mobile Syncing Clients" => "Synkroniserings programmer for desktop og mobil",
"Download" => "Download",
-"Your password got changed" => "Din adgangskode er blevet ændret",
"Unable to change your password" => "Ude af stand til at ændre dit kodeord",
"Current password" => "Nuværende adgangskode",
"New password" => "Ny adgangskode",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 4f3a12934e8..12b1652ce88 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -3,6 +3,7 @@
"Authentication error" => "Anmeldungsfehler",
"Group already exists" => "Gruppe existiert bereits",
"Unable to add group" => "Gruppe konnte nicht angelegt werden",
+"Could not enable app. " => "App konnte nicht aktiviert werden.",
"Email saved" => "E-Mail gespeichert",
"Invalid email" => "Ungültige E-Mail",
"OpenID Changed" => "OpenID geändert",
@@ -12,7 +13,6 @@
"Language changed" => "Sprache geändert",
"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",
-"Error" => "Fehler",
"Disable" => "Deaktivieren",
"Enable" => "Aktivieren",
"Saving..." => "Speichern...",
@@ -20,10 +20,10 @@
"Security Warning" => "Sicherheitshinweis",
"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." => "Ihr Datenverzeichnis ist möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei von OwnCloud 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 außerhalb des Wurzelverzeichnisses des Webservers.",
"Cron" => "Cron",
-"execute one task with each page loaded" => "Führe eine Aufgabe pro geladener Seite aus.",
-"cron.php is registered at a webcron service" => "cron.php ist beim Webcron-Service registriert",
-"use systems cron service" => "Nutze System-Cron-Service",
-"Share API" => "Teilungs-API",
+"Execute one task with each page loaded" => "Führe eine Aufgabe pro geladener Seite aus.",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist bei einem Webcron-Dienst registriert. Rufen Sie die Seite cron.php im ownCloud-Root minütlich per HTTP auf.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Benutzen Sie den System-Crondienst. Rufen Sie die cron.php im ownCloud-Ordner über einen System-Cronjob minütlich auf.",
+"Sharing" => "Freigabe",
"Enable Share API" => "Teilungs-API aktivieren",
"Allow apps to use the Share API" => "Erlaubt Nutzern, die Teilungs-API zu nutzen",
"Allow links" => "Links erlauben",
@@ -45,11 +45,10 @@
"Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
"Go there manually." => "Datenbank direkt besuchen.",
"Answer" => "Antwort",
-"You use" => "Sie nutzen",
-"of the available" => "der verfügbaren",
-"Desktop and Mobile Syncing Clients" => "Desktop- und mobile Synchronierungs-Clients",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s<strong>",
+"Desktop and Mobile Syncing Clients" => "Desktop- und mobile Clients für die Synchronisation",
"Download" => "Download",
-"Your password got changed" => "Ihr Passwort wurde geändert.",
+"Your password was changed" => "Ihr Passwort wurde geändert.",
"Unable to change your password" => "Passwort konnte nicht geändert werden",
"Current password" => "Aktuelles Passwort",
"New password" => "Neues Passwort",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 833ef8e10d5..c6bb9857100 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,55 +1,72 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Σφάλμα στην φόρτωση της λίστας από το App Store",
"Authentication error" => "Σφάλμα πιστοποίησης",
+"Group already exists" => "Η ομάδα υπάρχει ήδη",
+"Unable to add group" => "Αδυναμία προσθήκης ομάδας",
+"Could not enable app. " => "Αδυναμία ενεργοποίησης εφαρμογής ",
"Email saved" => "Το Email αποθηκεύτηκε ",
"Invalid email" => "Μη έγκυρο email",
"OpenID Changed" => "Το OpenID άλλαξε",
"Invalid request" => "Μη έγκυρο αίτημα",
+"Unable to delete group" => "Αδυναμία διαγραφής ομάδας",
+"Unable to delete user" => "Αδυναμία διαγραφής χρήστη",
"Language changed" => "Η γλώσσα άλλαξε",
-"Error" => "Σφάλμα",
+"Unable to add user to group %s" => "Αδυναμία προσθήκη χρήστη στην ομάδα %s",
+"Unable to remove user from group %s" => "Αδυναμία αφαίρεσης χρήστη από την ομάδα %s",
"Disable" => "Απενεργοποίηση",
"Enable" => "Ενεργοποίηση",
"Saving..." => "Αποθήκευση...",
"__language_name__" => "__όνομα_γλώσσας__",
"Security Warning" => "Προειδοποίηση Ασφαλείας",
+"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." => "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανότατα προσβάσιμα από το διαδίκτυο. Το αρχείο .htaccess που παρέχει το owncloud, δεν λειτουργεί. Σας συνιστούμε να ρυθμίσετε τον εξυπηρετητή σας έτσι ώστε ο κατάλογος δεδομένων να μην είναι πλεον προσβάσιμος ή μετακινήστε τον κατάλογο δεδομένων εκτός του καταλόγου document του εξυπηρετητή σας.",
"Cron" => "Cron",
-"execute one task with each page loaded" => "Εκτέλεση μίας εργασίας με κάθε σελίδα που φορτώνεται",
-"cron.php is registered at a webcron service" => "Το cron.php έχει καταχωρηθεί σε μια webcron υπηρεσία",
-"use systems cron service" => "Χρήση της υπηρεσίας cron του συστήματος",
+"Execute one task with each page loaded" => "Εκτέλεση μιας εργασίας με κάθε σελίδα που φορτώνεται",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "Το cron.php είναι καταχωρημένο στην υπηρεσία webcron. Να καλείται μια φορά το λεπτό η σελίδα cron.php από τον root του owncloud μέσω http",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Χρήση υπηρεσίας συστήματος cron. Να καλείται μια φορά το λεπτό, το αρχείο cron.php από τον φάκελο του owncloud μέσω του cronjob του συστήματος.",
+"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 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" => "Να επιτρέπεται ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας",
"Log" => "Αρχείο καταγραφής",
"More" => "Περισσότερο",
+"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>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>, ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Add your App" => "Πρόσθεσε τη δικιά σου εφαρμογή ",
"Select an App" => "Επιλέξτε μια εφαρμογή",
"See application page at apps.owncloud.com" => "Η σελίδα εφαρμογών στο apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-άδεια από <span class=\"author\"></span>",
"Documentation" => "Τεκμηρίωση",
"Managing Big Files" => "Διαχείριση μεγάλων αρχείων",
"Ask a question" => "Ρωτήστε μια ερώτηση",
"Problems connecting to help database." => "Προβλήματα κατά τη σύνδεση με τη βάση δεδομένων βοήθειας.",
"Go there manually." => "Χειροκίνητη μετάβαση.",
"Answer" => "Απάντηση",
-"You use" => "Χρησιμοποιείτε",
-"of the available" => "από τα διαθέσιμα",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Έχετε χρησιμοποιήσει <strong>%s</strong> από τα διαθέσιμα <strong>%s<strong>",
"Desktop and Mobile Syncing Clients" => "Πελάτες συγχρονισμού για Desktop και Mobile",
-"Download" => "Κατέβασε",
-"Your password got changed" => "Ο κωδικός πρόσβασής σας άλλαξε",
+"Download" => "Λήψη",
+"Your password was changed" => "Το συνθηματικό σας έχει αλλάξει",
"Unable to change your password" => "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης",
-"Current password" => "Τρέχων κωδικός πρόσβασης",
-"New password" => "Νέος κωδικός",
+"Current password" => "Τρέχων συνθηματικό",
+"New password" => "Νέο συνθηματικό",
"show" => "εμφάνιση",
-"Change password" => "Αλλαγή κωδικού πρόσβασης",
+"Change password" => "Αλλαγή συνθηματικού",
"Email" => "Email",
"Your email address" => "Διεύθυνση ηλεκτρονικού ταχυδρομείου σας",
-"Fill in an email address to enable password recovery" => "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση κωδικού πρόσβασης",
+"Fill in an email address to enable password recovery" => "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού",
"Language" => "Γλώσσα",
"Help translate" => "Βοηθήστε στην μετάφραση",
"use this address to connect to your ownCloud in your file manager" => "χρησιμοποιήστε αυτή τη διεύθυνση για να συνδεθείτε στο ownCloud σας από το διαχειριστή αρχείων σας",
"Name" => "Όνομα",
-"Password" => "Κωδικός",
+"Password" => "Συνθηματικό",
"Groups" => "Ομάδες",
"Create" => "Δημιουργία",
"Default Quota" => "Προεπιλεγμένο όριο",
"Other" => "Άλλα",
-"Group Admin" => "Διαχειρηστής ομάδας",
+"Group Admin" => "Ομάδα Διαχειριστών",
"Quota" => "Σύνολο χώρου",
"Delete" => "Διαγραφή"
);
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index cb84b2da037..7052bf34c92 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -6,16 +6,12 @@
"OpenID Changed" => "La agordo de OpenID estas ŝanĝita",
"Invalid request" => "Nevalida peto",
"Language changed" => "La lingvo estas ŝanĝita",
-"Error" => "Eraro",
"Disable" => "Malkapabligi",
"Enable" => "Kapabligi",
"Saving..." => "Konservante...",
"__language_name__" => "Esperanto",
"Security Warning" => "Sekureca averto",
"Cron" => "Cron",
-"execute one task with each page loaded" => "lanĉi unu taskon po ĉiu paĝo ŝargita",
-"cron.php is registered at a webcron service" => "cron.php estas registrita kiel webcron-servilo",
-"use systems cron service" => "uzi la cron-servon de la sistemo",
"Log" => "Protokolo",
"More" => "Pli",
"Add your App" => "Aldonu vian aplikaĵon",
@@ -27,11 +23,8 @@
"Problems connecting to help database." => "Problemoj okazis dum konektado al la helpa datumbazo.",
"Go there manually." => "Iri tien mane.",
"Answer" => "Respondi",
-"You use" => "Vi uzas",
-"of the available" => "el la disponeblaj",
"Desktop and Mobile Syncing Clients" => "Labortablaj kaj porteblaj sinkronigoklientoj",
"Download" => "Elŝuti",
-"Your password got changed" => "Via pasvorto ŝanĝiĝis",
"Unable to change your password" => "Ne eblis ŝanĝi vian pasvorton",
"Current password" => "Nuna pasvorto",
"New password" => "Nova pasvorto",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 2f2a06ce058..019a8455c16 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -3,6 +3,7 @@
"Authentication error" => "Error de autenticación",
"Group already exists" => "El grupo ya existe",
"Unable to add group" => "No se pudo añadir el grupo",
+"Could not enable app. " => "No puedo habilitar la app.",
"Email saved" => "Correo guardado",
"Invalid email" => "Correo no válido",
"OpenID Changed" => "OpenID cambiado",
@@ -12,7 +13,6 @@
"Language changed" => "Idioma cambiado",
"Unable to add user to group %s" => "Imposible añadir el usuario al grupo %s",
"Unable to remove user from group %s" => "Imposible eliminar al usuario del grupo %s",
-"Error" => "Error",
"Disable" => "Desactivar",
"Enable" => "Activar",
"Saving..." => "Guardando...",
@@ -20,10 +20,9 @@
"Security Warning" => "Advertencia de seguridad",
"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." => "El directorio de datos -data- y sus archivos probablemente son accesibles desde internet. El archivo .htaccess que provee ownCloud no está funcionando. Recomendamos fuertemente que configure su servidor web de forma que el directorio de datos ya no sea accesible o mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
"Cron" => "Cron",
-"execute one task with each page loaded" => "ejecutar una tarea con cada página cargada",
-"cron.php is registered at a webcron service" => "cron.php se registra en un servicio webcron",
-"use systems cron service" => "usar servicio cron del sistema",
-"Share API" => "API de compartición",
+"Execute one task with each page loaded" => "Ejecutar una tarea con cada página cargada",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está registrado como un servicio del webcron. Llama a la página de cron.php en la raíz de owncloud cada minuto sobre http.",
+"Sharing" => "Compartir",
"Enable Share API" => "Activar API de compartición",
"Allow apps to use the Share API" => "Permitir a las aplicaciones usar la API de compartición",
"Allow links" => "Permitir enlaces",
@@ -45,11 +44,8 @@
"Problems connecting to help database." => "Problemas al conectar con la base de datos de ayuda.",
"Go there manually." => "Ir manualmente",
"Answer" => "Respuesta",
-"You use" => "Estás utilizando",
-"of the available" => "del total disponible de",
"Desktop and Mobile Syncing Clients" => "Clientes de sincronización móviles y de escritorio",
"Download" => "Descargar",
-"Your password got changed" => "Tu contraseña ha sido cambiada",
"Unable to change your password" => "No se ha podido cambiar tu contraseña",
"Current password" => "Contraseña actual",
"New password" => "Nueva contraseña:",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 1f6cf1265dd..42cb42bce97 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,37 +1,45 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "App Sotre'i nimekirja laadimine ebaõnnestus",
"Authentication error" => "Autentimise viga",
+"Group already exists" => "Grupp on juba olemas",
+"Unable to add group" => "Keela grupi lisamine",
"Email saved" => "Kiri on salvestatud",
"Invalid email" => "Vigane e-post",
"OpenID Changed" => "OpenID on muudetud",
"Invalid request" => "Vigane päring",
+"Unable to delete group" => "Keela grupi kustutamine",
+"Unable to delete user" => "Keela kasutaja kustutamine",
"Language changed" => "Keel on muudetud",
-"Error" => "Viga",
+"Unable to add user to group %s" => "Kasutajat ei saa lisada gruppi %s",
+"Unable to remove user from group %s" => "Kasutajat ei saa eemaldada grupist %s",
"Disable" => "Lülita välja",
"Enable" => "Lülita sisse",
"Saving..." => "Salvestamine...",
"__language_name__" => "Eesti",
"Security Warning" => "Turvahoiatus",
"Cron" => "Ajastatud töö",
-"execute one task with each page loaded" => "käivita iga laetud lehe juures üks ülesanne",
-"cron.php is registered at a webcron service" => "cron.php on webcron teenuses registreeritud",
-"use systems cron service" => "kasuta süsteemide cron teenuseid",
+"Enable Share API" => "Luba jagamise API",
+"Allow apps to use the Share API" => "Luba rakendustel kasutada jagamise API-t",
+"Allow links" => "Luba linke",
+"Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega",
+"Allow resharing" => "Luba edasijagamine",
+"Allow users to share items shared with them again" => "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud",
+"Allow users to share with anyone" => "Luba kasutajatel kõigiga jagada",
+"Allow users to only share with users in their groups" => "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad",
"Log" => "Logi",
"More" => "Veel",
"Add your App" => "Lisa oma rakendus",
"Select an App" => "Vali programm",
"See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>",
"Documentation" => "Dokumentatsioon",
"Managing Big Files" => "Suurte failide haldamine",
"Ask a question" => "Küsi küsimus",
"Problems connecting to help database." => "Probleemid abiinfo andmebaasiga ühendumisel.",
"Go there manually." => "Mine sinna käsitsi.",
"Answer" => "Vasta",
-"You use" => "Sa kasutad",
-"of the available" => "saadaolevast",
"Desktop and Mobile Syncing Clients" => "Töölaua ja mobiiliga sünkroniseerimise rakendused",
"Download" => "Lae alla",
-"Your password got changed" => "Sinu parooli on muudetud",
"Unable to change your password" => "Sa ei saa oma parooli muuta",
"Current password" => "Praegune parool",
"New password" => "Uus parool",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 4c95c7e4718..4320b8ae693 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,12 +1,18 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
"Authentication error" => "Autentifikazio errorea",
+"Group already exists" => "Taldea dagoeneko existitzenda",
+"Unable to add group" => "Ezin izan da taldea gehitu",
+"Could not enable app. " => "Ezin izan da aplikazioa gaitu.",
"Email saved" => "Eposta gorde da",
"Invalid email" => "Baliogabeko eposta",
"OpenID Changed" => "OpenID aldatuta",
"Invalid request" => "Baliogabeko eskaria",
+"Unable to delete group" => "Ezin izan da taldea ezabatu",
+"Unable to delete user" => "Ezin izan da erabiltzailea ezabatu",
"Language changed" => "Hizkuntza aldatuta",
-"Error" => "Errorea",
+"Unable to add user to group %s" => "Ezin izan da erabiltzailea %s taldera gehitu",
+"Unable to remove user from group %s" => "Ezin izan da erabiltzailea %s taldetik ezabatu",
"Disable" => "Ez-gaitu",
"Enable" => "Gaitu",
"Saving..." => "Gordetzen...",
@@ -14,10 +20,10 @@
"Security Warning" => "Segurtasun abisua",
"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." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.",
"Cron" => "Cron",
-"execute one task with each page loaded" => "exekutatu zeregina orri karga bakoitzean",
-"cron.php is registered at a webcron service" => "cron.php webcron zerbitzu batean erregistratuta dago",
-"use systems cron service" => "erabili sistemaren cron zerbitzua",
-"Share API" => "Partekatze APIa",
+"Execute one task with each page loaded" => "Exekutatu zeregin bat orri karga bakoitzean",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php webcron zerbitzu batean erregistratua dago. Deitu cron.php orria ownclouden erroan minuturo http bidez.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Erabili sistemaren cron zerbitzua. Deitu cron.php fitxategia owncloud karpetan minuturo sistemaren cron lan baten bidez.",
+"Sharing" => "Partekatzea",
"Enable Share API" => "Gaitu Partekatze APIa",
"Allow apps to use the Share API" => "Baimendu aplikazioak Partekatze APIa erabiltzeko",
"Allow links" => "Baimendu loturak",
@@ -32,17 +38,17 @@
"Add your App" => "Gehitu zure aplikazioa",
"Select an App" => "Aukeratu programa bat",
"See application page at apps.owncloud.com" => "Ikusi programen orria apps.owncloud.com en",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>",
"Documentation" => "Dokumentazioa",
"Managing Big Files" => "Fitxategi handien kudeaketa",
"Ask a question" => "Egin galdera bat",
"Problems connecting to help database." => "Arazoak daude laguntza datubasera konektatzeko.",
"Go there manually." => "Joan hara eskuz.",
"Answer" => "Erantzun",
-"You use" => "Erabiltzen ari zara ",
-"of the available" => "eta guztira erabil dezakezu ",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Eskuragarri dituzun <strong>%s</strong>etik <strong>%s</strong> erabili duzu",
"Desktop and Mobile Syncing Clients" => "Mahaigain eta mugikorren sinkronizazio bezeroak",
"Download" => "Deskargatu",
-"Your password got changed" => "Zure pasahitza aldatu da",
+"Your password was changed" => "Zere pasahitza aldatu da",
"Unable to change your password" => "Ezin izan da zure pasahitza aldatu",
"Current password" => "Uneko pasahitza",
"New password" => "Pasahitz berria",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 215966728d6..d8a49cc440b 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -4,7 +4,6 @@
"OpenID Changed" => "OpenID تغییر کرد",
"Invalid request" => "درخواست غیر قابل قبول",
"Language changed" => "زبان تغییر کرد",
-"Error" => "خطا",
"Disable" => "غیرفعال",
"Enable" => "فعال",
"Saving..." => "درحال ذخیره ...",
@@ -21,11 +20,8 @@
"Problems connecting to help database." => "مشکلاتی برای وصل شدن به پایگاه داده کمکی",
"Go there manually." => "بروید آنجا به صورت دستی",
"Answer" => "پاسخ",
-"You use" => "شما استفاده می کنید",
-"of the available" => "از فعال ها",
"Desktop and Mobile Syncing Clients" => " ابزار مدیریت با دسکتاپ و موبایل",
"Download" => "بارگیری",
-"Your password got changed" => "گذرواژه شما تغییر یافته",
"Unable to change your password" => "ناتوان در تغییر گذرواژه",
"Current password" => "گذرواژه کنونی",
"New password" => "گذرواژه جدید",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 54647c29616..0969b6e3654 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -3,6 +3,7 @@
"Authentication error" => "Todennusvirhe",
"Group already exists" => "Ryhmä on jo olemassa",
"Unable to add group" => "Ryhmän lisäys epäonnistui",
+"Could not enable app. " => "Sovelluksen käyttöönotto epäonnistui.",
"Email saved" => "Sähköposti tallennettu",
"Invalid email" => "Virheellinen sähköposti",
"OpenID Changed" => "OpenID on vaihdettu",
@@ -12,7 +13,6 @@
"Language changed" => "Kieli on vaihdettu",
"Unable to add user to group %s" => "Käyttäjän tai ryhmän %s lisääminen ei onnistu",
"Unable to remove user from group %s" => "Käyttäjän poistaminen ryhmästä %s ei onnistu",
-"Error" => "Virhe",
"Disable" => "Poista käytöstä",
"Enable" => "Käytä",
"Saving..." => "Tallennetaan...",
@@ -20,10 +20,7 @@
"Security Warning" => "Turvallisuusvaroitus",
"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htaccess-tiedosto, jolla kontrolloidaan pääsyä, ei toimi. Suosittelemme, että muutat web-palvelimesi asetukset niin ettei data-kansio ole enää pääsyä tai siirrät data-kansion pois web-palvelimen tiedostojen juuresta.",
"Cron" => "Cron",
-"execute one task with each page loaded" => "suorita yksi tehtävä jokaisella ladatulla sivulla",
-"cron.php is registered at a webcron service" => "cron.php on rekisteröity webcron-palvelulla",
-"use systems cron service" => "käytä järjestelmän cron-palvelua",
-"Share API" => "Jaon ohelmointirajapinta (Share API)",
+"Sharing" => "Jakaminen",
"Enable Share API" => "Ota käyttöön jaon ohjelmoitirajapinta (Share API)",
"Allow apps to use the Share API" => "Salli sovellusten käyttää jaon ohjelmointirajapintaa (Share API)",
"Allow links" => "Salli linkit",
@@ -45,11 +42,10 @@
"Problems connecting to help database." => "Virhe yhdistettäessä tietokantaan.",
"Go there manually." => "Ohje löytyy sieltä.",
"Answer" => "Vastaus",
-"You use" => "Olet käyttänyt",
-"of the available" => ", käytettävissäsi on yhteensä",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Käytössäsi on <strong>%s</strong>/<strong>%s<strong>",
"Desktop and Mobile Syncing Clients" => "Tietokoneen ja mobiililaitteiden synkronointisovellukset",
"Download" => "Lataa",
-"Your password got changed" => "Salasanasi on vaihdettu",
+"Your password was changed" => "Salasanasi vaihdettiin",
"Unable to change your password" => "Salasanaasi ei voitu vaihtaa",
"Current password" => "Nykyinen salasana",
"New password" => "Uusi salasana",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 7baa923bfcb..01fe9518682 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -12,7 +12,6 @@
"Language changed" => "Langue changée",
"Unable to add user to group %s" => "Impossible d'ajouter l'utilisateur au groupe %s",
"Unable to remove user from group %s" => "Impossible de supprimer l'utilisateur du groupe %s",
-"Error" => "Erreur",
"Disable" => "Désactiver",
"Enable" => "Activer",
"Saving..." => "Sauvegarde...",
@@ -20,10 +19,6 @@
"Security Warning" => "Alertes de sécurité",
"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." => "Votre répertoire de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni avec ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce répertoire ne soit plus accessible, ou bien de déplacer le répertoire de données à l'extérieur de la racine du serveur web.",
"Cron" => "Cron",
-"execute one task with each page loaded" => "exécuter une tâche pour chaque page chargée",
-"cron.php is registered at a webcron service" => "cron.php est enregistré comme un service webcron",
-"use systems cron service" => "utiliser le service cron du système ",
-"Share API" => "API de partage",
"Enable Share API" => "Activer l'API de partage",
"Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
"Allow links" => "Autoriser les liens",
@@ -38,18 +33,15 @@
"Add your App" => "Ajoutez votre application",
"Select an App" => "Sélectionner une Application",
"See application page at apps.owncloud.com" => "Voir la page des applications à l'url apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-sous licence, par <span class=\"author\"></span>",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>",
"Documentation" => "Documentation",
"Managing Big Files" => "Gérer les gros fichiers",
"Ask a question" => "Poser une question",
"Problems connecting to help database." => "Problème de connexion à la base de données d'aide.",
"Go there manually." => "S'y rendre manuellement.",
"Answer" => "Réponse",
-"You use" => "Vous utilisez",
-"of the available" => "de votre espace de stockage d'une taille totale de",
"Desktop and Mobile Syncing Clients" => "Clients de synchronisation Mobile et Ordinateur",
"Download" => "Télécharger",
-"Your password got changed" => "Votre mot de passe a été changé",
"Unable to change your password" => "Impossible de changer votre mot de passe",
"Current password" => "Mot de passe actuel",
"New password" => "Nouveau mot de passe",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 52aa13c461c..a0fe0989149 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -6,16 +6,12 @@
"OpenID Changed" => "Mudou o OpenID",
"Invalid request" => "Petición incorrecta",
"Language changed" => "O idioma mudou",
-"Error" => "Erro",
"Disable" => "Deshabilitar",
"Enable" => "Habilitar",
"Saving..." => "Gardando...",
"__language_name__" => "Galego",
"Security Warning" => "Aviso de seguridade",
"Cron" => "Cron",
-"execute one task with each page loaded" => "executar unha tarefa con cada páxina cargada",
-"cron.php is registered at a webcron service" => "cron.php está rexistrada como un servizo webcron",
-"use systems cron service" => "utilice o servizo cron do sistema",
"Log" => "Conectar",
"More" => "Máis",
"Add your App" => "Engade o teu aplicativo",
@@ -27,11 +23,8 @@
"Problems connecting to help database." => "Problemas conectando coa base de datos de axuda",
"Go there manually." => "Ir manualmente.",
"Answer" => "Resposta",
-"You use" => "Vostede usa",
-"of the available" => "dun total de",
"Desktop and Mobile Syncing Clients" => "Cliente de sincronización de escritorio e móbil",
"Download" => "Descargar",
-"Your password got changed" => "O seu contrasinal mudou",
"Unable to change your password" => "Incapaz de trocar o seu contrasinal",
"Current password" => "Contrasinal actual",
"New password" => "Novo contrasinal",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index c7189e94354..bb98a876b82 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -19,11 +19,8 @@
"Problems connecting to help database." => "בעיות בהתחברות לבסיס נתוני העזרה",
"Go there manually." => "גש לשם באופן ידני",
"Answer" => "מענה",
-"You use" => "הנך משתמש ",
-"of the available" => "מתוך ",
"Desktop and Mobile Syncing Clients" => "לקוחות סנכרון למחשב שולחני ולנייד",
"Download" => "הורדה",
-"Your password got changed" => "הססמה שלך שונתה",
"Unable to change your password" => "לא ניתן לשנות את הססמה שלך",
"Current password" => "ססמה נוכחית",
"New password" => "ססמה חדשה",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 8c5251520cc..587974c8c76 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -6,14 +6,11 @@
"OpenID Changed" => "OpenID promijenjen",
"Invalid request" => "Neispravan zahtjev",
"Language changed" => "Jezik promijenjen",
-"Error" => "Greška",
"Disable" => "Isključi",
"Enable" => "Uključi",
"Saving..." => "Spremanje...",
"__language_name__" => "__ime_jezika__",
"Cron" => "Cron",
-"cron.php is registered at a webcron service" => "cron.php je registriran kod webcron servisa",
-"use systems cron service" => "koristi sistemski cron servis",
"Log" => "dnevnik",
"More" => "više",
"Add your App" => "Dodajte vašu aplikaciju",
@@ -25,11 +22,8 @@
"Problems connecting to help database." => "Problem pri spajanju na bazu podataka pomoći",
"Go there manually." => "Idite tamo ručno.",
"Answer" => "Odgovor",
-"You use" => "Koristite",
-"of the available" => "od dostupno",
"Desktop and Mobile Syncing Clients" => "Desktop i Mobile sinkronizaciji klijenti",
"Download" => "preuzimanje",
-"Your password got changed" => "Vaša lozinka je promijenjena",
"Unable to change your password" => "Nemoguće promijeniti lozinku",
"Current password" => "Trenutna lozinka",
"New password" => "Nova lozinka",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 23534d85759..e58a0b6c199 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -6,7 +6,6 @@
"OpenID Changed" => "OpenID megváltozott",
"Invalid request" => "Érvénytelen kérés",
"Language changed" => "A nyelv megváltozott",
-"Error" => "Hiba",
"Disable" => "Letiltás",
"Enable" => "Engedélyezés",
"Saving..." => "Mentés...",
@@ -23,11 +22,8 @@
"Problems connecting to help database." => "Sikertelen csatlakozás a Súgó adatbázishoz",
"Go there manually." => "Menj oda kézzel",
"Answer" => "Válasz",
-"You use" => "Használatban: ",
-"of the available" => ", rendelkezésre áll: ",
"Desktop and Mobile Syncing Clients" => "Asztali- és mobilkliensek kezelése",
"Download" => "Letöltés",
-"Your password got changed" => "A jelszavad megváltozott",
"Unable to change your password" => "Nem lehet megváltoztatni a jelszavad",
"Current password" => "Jelenlegi jelszó",
"New password" => "Új jelszó",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index e9d6a065a21..398a59da135 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -10,10 +10,7 @@
"Documentation" => "Documentation",
"Ask a question" => "Facer un question",
"Answer" => "Responsa",
-"You use" => "Tu usa",
-"of the available" => "del disponibile",
"Download" => "Discargar",
-"Your password got changed" => "Tu contrasigno esseva cambiate",
"Unable to change your password" => "Non pote cambiar tu contrasigno",
"Current password" => "Contrasigno currente",
"New password" => "Nove contrasigno",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 636be1af955..7ab21d7feaf 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -20,11 +20,8 @@
"Problems connecting to help database." => "Bermasalah saat menghubungi database bantuan.",
"Go there manually." => "Pergi kesana secara manual.",
"Answer" => "Jawab",
-"You use" => "Anda menggunakan",
-"of the available" => "dari yang tersedia",
"Desktop and Mobile Syncing Clients" => "Klien sync Desktop dan Mobile",
"Download" => "Unduh",
-"Your password got changed" => "Password anda telah dirubah",
"Unable to change your password" => "Tidak dapat merubah password anda",
"Current password" => "Password saat ini",
"New password" => "Password baru",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 695ed31eeef..474149c836c 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -3,6 +3,7 @@
"Authentication error" => "Errore di autenticazione",
"Group already exists" => "Il gruppo esiste già",
"Unable to add group" => "Impossibile aggiungere il gruppo",
+"Could not enable app. " => "Impossibile abilitare l'applicazione.",
"Email saved" => "Email salvata",
"Invalid email" => "Email non valida",
"OpenID Changed" => "OpenID modificato",
@@ -12,7 +13,6 @@
"Language changed" => "Lingua modificata",
"Unable to add user to group %s" => "Impossibile aggiungere l'utente al gruppo %s",
"Unable to remove user from group %s" => "Impossibile rimuovere l'utente dal gruppo %s",
-"Error" => "Errore",
"Disable" => "Disabilita",
"Enable" => "Abilita",
"Saving..." => "Salvataggio in corso...",
@@ -20,10 +20,10 @@
"Security Warning" => "Avviso di sicurezza",
"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." => "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess fornito da ownCloud non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile e spostare la cartella fuori dalla radice del server web.",
"Cron" => "Cron",
-"execute one task with each page loaded" => "esegui un'attività con ogni pagina caricata",
-"cron.php is registered at a webcron service" => "cron.php è registrato a un servizio webcron",
-"use systems cron service" => "usa il servizio cron di sistema",
-"Share API" => "API di condivisione",
+"Execute one task with each page loaded" => "Esegui un'operazione per ogni pagina caricata",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php è registrato su un servizio webcron. Chiama la pagina cron.php nella radice di owncloud ogni minuto su http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usa il servizio cron di sistema. Chiama il file cron.php nella cartella di owncloud tramite una pianificazione del cron di sistema ogni minuto.",
+"Sharing" => "Condivisione",
"Enable Share API" => "Abilita API di condivisione",
"Allow apps to use the Share API" => "Consenti alle applicazioni di utilizzare le API di condivisione",
"Allow links" => "Consenti collegamenti",
@@ -45,11 +45,10 @@
"Problems connecting to help database." => "Problemi di connessione al database di supporto.",
"Go there manually." => "Raggiungilo manualmente.",
"Answer" => "Risposta",
-"You use" => "Stai utilizzando",
-"of the available" => "su un totale di",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Hai utilizzato <strong>%s</strong> dei <strong>%s<strong> disponibili",
"Desktop and Mobile Syncing Clients" => "Client di sincronizzazione desktop e mobile",
"Download" => "Scaricamento",
-"Your password got changed" => "La tua password è stata cambiata",
+"Your password was changed" => "La tua password è cambiata",
"Unable to change your password" => "Modifica password non riuscita",
"Current password" => "Password attuale",
"New password" => "Nuova password",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index fe1eed19806..72f79837d90 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -3,6 +3,7 @@
"Authentication error" => "認証エラー",
"Group already exists" => "グループは既に存在しています",
"Unable to add group" => "グループを追加できません",
+"Could not enable app. " => "アプリを有効にできませんでした。",
"Email saved" => "メールアドレスを保存しました",
"Invalid email" => "無効なメールアドレス",
"OpenID Changed" => "OpenIDが変更されました",
@@ -12,7 +13,6 @@
"Language changed" => "言語が変更されました",
"Unable to add user to group %s" => "ユーザをグループ %s に追加できません",
"Unable to remove user from group %s" => "ユーザをグループ %s から削除できません",
-"Error" => "エラー",
"Disable" => "無効",
"Enable" => "有効",
"Saving..." => "保存中...",
@@ -20,10 +20,10 @@
"Security Warning" => "セキュリティ警告",
"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." => "データディレクトリとファイルが恐らくインターネットからアクセスできるようになっています。ownCloudが提供する .htaccessファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。",
"Cron" => "cron(自動定期実行)",
-"execute one task with each page loaded" => "ページを開く毎にタスクを1つ実行",
-"cron.php is registered at a webcron service" => "cron.phpをwebcronサービスに登録しました",
-"use systems cron service" => "システムのcronサービスを使用",
-"Share API" => "Share API",
+"Execute one task with each page loaded" => "各ページの読み込み時にタスクを1つ実行する",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php は webcron サービスとして登録されています。HTTP経由で1分間に1回の頻度で owncloud のルートページ内の cron.php ページを呼び出します。",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "システムのcronサービスを利用する。1分に1回の頻度でシステムのcronジョブによりowncloudフォルダ内のcron.phpファイルを呼び出してください。",
+"Sharing" => "共有中",
"Enable Share API" => "Share APIを有効",
"Allow apps to use the Share API" => "Share APIの使用をアプリケーションに許可",
"Allow links" => "リンクを許可",
@@ -45,11 +45,10 @@
"Problems connecting to help database." => "ヘルプデータベースへの接続時に問題が発生しました",
"Go there manually." => "手動で移動してください。",
"Answer" => "解答",
-"You use" => "あなたは",
-"of the available" => "を利用しています。利用可能容量:",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "現在、<strong>%s</strong> / <strong>%s<strong> を利用しています",
"Desktop and Mobile Syncing Clients" => "デスクトップおよびモバイル用の同期クライアント",
"Download" => "ダウンロード",
-"Your password got changed" => "パスワードは変更されました",
+"Your password was changed" => "パスワードを変更しました",
"Unable to change your password" => "パスワードを変更することができません",
"Current password" => "現在のパスワード",
"New password" => "新しいパスワード",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index ada09c845cf..b2c00808967 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -6,16 +6,12 @@
"OpenID Changed" => "OpenID 변경됨",
"Invalid request" => "잘못된 요청",
"Language changed" => "언어가 변경되었습니다",
-"Error" => "에러",
"Disable" => "비활성화",
"Enable" => "활성화",
"Saving..." => "저장...",
"__language_name__" => "한국어",
"Security Warning" => "보안 경고",
"Cron" => "크론",
-"execute one task with each page loaded" => "각 페이지가 로드 된 하나의 작업을 실행",
-"cron.php is registered at a webcron service" => "cron.php는 webcron 서비스에 등록이 되어 있습니다.",
-"use systems cron service" => "cron 시스템 서비스를 사용",
"Log" => "로그",
"More" => "더",
"Add your App" => "앱 추가",
@@ -27,11 +23,8 @@
"Problems connecting to help database." => "데이터베이스에 연결하는 데 문제가 발생하였습니다.",
"Go there manually." => "직접 갈 수 있습니다.",
"Answer" => "대답",
-"You use" => "현재 사용 중:",
-"of the available" => "사용 가능:",
"Desktop and Mobile Syncing Clients" => "데스크탑 및 모바일 동기화 클라이언트",
"Download" => "다운로드",
-"Your password got changed" => "암호가 변경되었습니다",
"Unable to change your password" => "암호를 변경할 수 없음",
"Current password" => "현재 암호",
"New password" => "새 암호",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 55db067f8cf..abad102bb59 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -6,16 +6,12 @@
"OpenID Changed" => "OpenID huet geännert",
"Invalid request" => "Ongülteg Requête",
"Language changed" => "Sprooch huet geännert",
-"Error" => "Fehler",
"Disable" => "Ofschalten",
"Enable" => "Aschalten",
"Saving..." => "Speicheren...",
"__language_name__" => "__language_name__",
"Security Warning" => "Sécherheets Warnung",
"Cron" => "Cron",
-"cron.php is registered at a webcron service" => "cron.php ass als en webcron Service registréiert",
-"use systems cron service" => "benotz den systems cron Service",
-"Share API" => "Share API",
"Enable Share API" => "Share API aschalten",
"Allow apps to use the Share API" => "Erlab Apps d'Share API ze benotzen",
"Allow links" => "Links erlaben",
@@ -33,11 +29,8 @@
"Problems connecting to help database." => "Problemer sinn opgetrueden beim Versuch sech un d'Hëllef Datebank ze verbannen.",
"Go there manually." => "Gei manuell dohinner.",
"Answer" => "Äntwert",
-"You use" => "Du benotz",
-"of the available" => "vun den disponibelen",
"Desktop and Mobile Syncing Clients" => "Desktop an Mobile Syncing Clienten",
"Download" => "Download",
-"Your password got changed" => "Däin Passwuert ass geännert ginn",
"Unable to change your password" => "Konnt däin Passwuert net änneren",
"Current password" => "Momentan 't Passwuert",
"New password" => "Neit Passwuert",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 701ec867270..09cb02d147d 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -5,14 +5,12 @@
"OpenID Changed" => "OpenID pakeistas",
"Invalid request" => "Klaidinga užklausa",
"Language changed" => "Kalba pakeista",
-"Error" => "Klaida",
"Disable" => "Išjungti",
"Enable" => "Įjungti",
"Saving..." => "Saugoma..",
"__language_name__" => "Kalba",
"Security Warning" => "Saugumo įspėjimas",
"Cron" => "Cron",
-"use systems cron service" => "naudoti sistemos cron servisą",
"Log" => "Žurnalas",
"More" => "Daugiau",
"Add your App" => "Pridėti programėlę",
@@ -21,10 +19,7 @@
"Ask a question" => "Užduoti klausimą",
"Problems connecting to help database." => "Problemos jungiantis prie duomenų bazės",
"Answer" => "Atsakyti",
-"You use" => "Jūs naudojate",
-"of the available" => "iš galimų",
"Download" => "Atsisiųsti",
-"Your password got changed" => "Jūsų slaptažodis buvo pakeistas",
"Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
"Current password" => "Dabartinis slaptažodis",
"New password" => "Naujas slaptažodis",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 9780127890a..829cda0f917 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -6,7 +6,6 @@
"OpenID Changed" => "OpenID nomainīts",
"Invalid request" => "Nepareizs vaicājums",
"Language changed" => "Valoda tika nomainīta",
-"Error" => "Kļūme",
"Disable" => "Atvienot",
"Enable" => "Pievienot",
"Saving..." => "Saglabā...",
@@ -24,11 +23,8 @@
"Problems connecting to help database." => "Problēmas ar datubāzes savienojumu",
"Go there manually." => "Nokļūt tur pašrocīgi",
"Answer" => "Atbildēt",
-"You use" => "Jūs iymantojat",
-"of the available" => "no pieejamajiem",
"Desktop and Mobile Syncing Clients" => "Desktop un mobīlo ierīču sinhronizācijas rīks",
"Download" => "Lejuplādēt",
-"Your password got changed" => "Jūsu parole tika nomainīta",
"Unable to change your password" => "Nav iespējams nomainīt jūsu paroli",
"Current password" => "Pašreizējā parole",
"New password" => "Jauna parole",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index ce89f3b40c7..78d05660e71 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -19,11 +19,8 @@
"Problems connecting to help database." => "Проблем при поврзување со базата за помош",
"Go there manually." => "Оди таму рачно.",
"Answer" => "Одговор",
-"You use" => "Вие користите",
-"of the available" => "од достапните",
"Desktop and Mobile Syncing Clients" => "Десктоп и мобилник клиенти за синхронизирање",
"Download" => "Преземање",
-"Your password got changed" => "Вашата лозинка беше сменета",
"Unable to change your password" => "Вашата лозинка неможе да се смени",
"Current password" => "Моментална лозинка",
"New password" => "Нова лозинка",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index a1d3007c895..18719989462 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -21,11 +21,8 @@
"Problems connecting to help database." => "Masalah menghubung untuk membantu pengkalan data",
"Go there manually." => "Pergi ke sana secara manual",
"Answer" => "Jawapan",
-"You use" => "Anda menggunakan",
-"of the available" => "yang tersedia",
"Desktop and Mobile Syncing Clients" => "Klien Selarian untuk Desktop dan Mobile",
"Download" => "Muat turun",
-"Your password got changed" => "Kata laluan anda diubah",
"Unable to change your password" => "Gagal mengubah kata laluan anda ",
"Current password" => "Kata laluan semasa",
"New password" => "Kata laluan baru",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 57c18813522..daeb1b78e7f 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -6,16 +6,12 @@
"OpenID Changed" => "OpenID endret",
"Invalid request" => "Ugyldig forespørsel",
"Language changed" => "Språk endret",
-"Error" => "Feil",
"Disable" => "Slå avBehandle ",
"Enable" => "Slå på",
"Saving..." => "Lagrer...",
"__language_name__" => "__language_name__",
"Security Warning" => "Sikkerhetsadvarsel",
"Cron" => "Cron",
-"execute one task with each page loaded" => "utfør en oppgave med hver side som blir lastet",
-"cron.php is registered at a webcron service" => "cron.php er registrert som en webcron tjeneste",
-"use systems cron service" => "benytt systemets cron tjeneste",
"Log" => "Logg",
"More" => "Mer",
"Add your App" => "Legg til din App",
@@ -27,11 +23,8 @@
"Problems connecting to help database." => "Problemer med å koble til hjelp-databasen",
"Go there manually." => "Gå dit manuelt",
"Answer" => "Svar",
-"You use" => "Du bruker",
-"of the available" => "av den tilgjengelige",
"Desktop and Mobile Syncing Clients" => "Klienter for datamaskiner og mobile enheter",
"Download" => "Last ned",
-"Your password got changed" => "Passordet ditt ble endret",
"Unable to change your password" => "Kunne ikke endre passordet ditt",
"Current password" => "Nåværende passord",
"New password" => "Nytt passord",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 5957f6282f1..e28adf88345 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -3,6 +3,7 @@
"Authentication error" => "Authenticatie fout",
"Group already exists" => "Groep bestaat al",
"Unable to add group" => "Niet in staat om groep toe te voegen",
+"Could not enable app. " => "Kan de app. niet activeren",
"Email saved" => "E-mail bewaard",
"Invalid email" => "Ongeldige e-mail",
"OpenID Changed" => "OpenID is aangepast",
@@ -12,17 +13,15 @@
"Language changed" => "Taal aangepast",
"Unable to add user to group %s" => "Niet in staat om gebruiker toe te voegen aan groep %s",
"Unable to remove user from group %s" => "Niet in staat om gebruiker te verwijderen uit groep %s",
-"Error" => "Fout",
"Disable" => "Uitschakelen",
"Enable" => "Inschakelen",
"Saving..." => "Aan het bewaren.....",
"__language_name__" => "Nederlands",
"Security Warning" => "Veiligheidswaarschuwing",
+"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." => "Uw data folder en uw bestanden zijn hoogst waarschijnlijk vanaf het internet bereikbaar. Het .htaccess bestand dat ownCloud meelevert werkt niet. Het is ten zeerste aangeraden om uw webserver zodanig te configureren, dat de data folder niet bereikbaar is vanaf het internet of verplaatst uw data folder naar een locatie buiten de webserver document root.",
"Cron" => "Cron",
-"execute one task with each page loaded" => "Voer 1 taak uit bij elke geladen pagina",
-"cron.php is registered at a webcron service" => "cron.php is geregistreerd bij een webcron service",
-"use systems cron service" => "gebruik de systeem cron service",
-"Share API" => "Deel API",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php is bij een webcron dienst geregistreerd. Roep de cron.php pagina in de owncloud root via http één maal per minuut op.",
+"Sharing" => "Delen",
"Enable Share API" => "Zet de Deel API aan",
"Allow apps to use the Share API" => "Sta apps toe om de Deel API te gebruiken",
"Allow links" => "Sta links toe",
@@ -44,11 +43,10 @@
"Problems connecting to help database." => "Problemen bij het verbinden met de helpdatabank.",
"Go there manually." => "Ga er zelf heen.",
"Answer" => "Beantwoord",
-"You use" => "U gebruikt",
-"of the available" => "van de beschikbare",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>",
"Desktop and Mobile Syncing Clients" => "Desktop en mobiele synchronisatie apparaten",
"Download" => "Download",
-"Your password got changed" => "Uw wachtwoord is aangepast",
+"Your password was changed" => "Je wachtwoord is veranderd",
"Unable to change your password" => "Niet in staat om uw wachtwoord te wijzigen",
"Current password" => "Huidig wachtwoord",
"New password" => "Nieuw wachtwoord",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 25cf29b91d5..d712f749bbf 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -6,7 +6,6 @@
"OpenID Changed" => "OpenID endra",
"Invalid request" => "Ugyldig førespurnad",
"Language changed" => "Språk endra",
-"Error" => "Feil",
"Disable" => "Slå av",
"Enable" => "Slå på",
"__language_name__" => "Nynorsk",
@@ -15,9 +14,6 @@
"Problems connecting to help database." => "Problem ved tilkopling til hjelpedatabasen.",
"Go there manually." => "Gå der på eigen hand.",
"Answer" => "Svar",
-"You use" => "Du bruker",
-"of the available" => "av dei tilgjengelege",
-"Your password got changed" => "Passordet ditt er endra",
"Unable to change your password" => "Klarte ikkje å endra passordet",
"Current password" => "Passord",
"New password" => "Nytt passord",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 851099ef6b7..7c5fa65d22d 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -3,6 +3,7 @@
"Authentication error" => "Błąd uwierzytelniania",
"Group already exists" => "Grupa już istnieje",
"Unable to add group" => "Nie można dodać grupy",
+"Could not enable app. " => "Nie można włączyć aplikacji.",
"Email saved" => "Email zapisany",
"Invalid email" => "Niepoprawny email",
"OpenID Changed" => "Zmieniono OpenID",
@@ -12,7 +13,6 @@
"Language changed" => "Język zmieniony",
"Unable to add user to group %s" => "Nie można dodać użytkownika do grupy %s",
"Unable to remove user from group %s" => "Nie można usunąć użytkownika z grupy %s",
-"Error" => "Błąd",
"Disable" => "Wyłączone",
"Enable" => "Włączone",
"Saving..." => "Zapisywanie...",
@@ -20,10 +20,10 @@
"Security Warning" => "Ostrzeżenia bezpieczeństwa",
"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." => "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.",
"Cron" => "Cron",
-"execute one task with each page loaded" => "wykonanie jednego zadania z każdej załadowanej strony",
-"cron.php is registered at a webcron service" => "cron.php jest zarejestrowany w usłudze webcron",
-"use systems cron service" => "korzystaj z usługi systemowej cron",
-"Share API" => "Udostępnij API",
+"Execute one task with each page loaded" => "Wykonanie jednego zadania z każdej strony wczytywania",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php jest zarejestrowany w usłudze webcron. Przywołaj stronę cron.php w katalogu głównym owncloud raz na minute przez http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Użyj usługi systemowej cron. Przywołaj plik cron.php z katalogu owncloud przez systemowe cronjob raz na minute.",
+"Sharing" => "Udostępnianij",
"Enable Share API" => "Włącz udostępniane API",
"Allow apps to use the Share API" => "Zezwalaj aplikacjom na używanie API",
"Allow links" => "Zezwalaj na łącza",
@@ -45,11 +45,8 @@
"Problems connecting to help database." => "Problem z połączeniem z bazą danych.",
"Go there manually." => "Przejdź na stronę ręcznie.",
"Answer" => "Odpowiedź",
-"You use" => "Używane",
-"of the available" => "z dostępnych",
"Desktop and Mobile Syncing Clients" => "Klienci synchronizacji",
"Download" => "Ściągnij",
-"Your password got changed" => "Zmieniono hasło",
"Unable to change your password" => "Nie można zmienić hasła",
"Current password" => "Bieżące hasło",
"New password" => "Nowe hasło",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 6933e585545..c940fb642c6 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -5,14 +5,11 @@
"OpenID Changed" => "Mudou OpenID",
"Invalid request" => "Pedido inválido",
"Language changed" => "Mudou Idioma",
-"Error" => "Erro",
"Disable" => "Desabilitado",
"Enable" => "Habilitado",
"Saving..." => "Gravando...",
"__language_name__" => "Português",
"Security Warning" => "Aviso de Segurança",
-"execute one task with each page loaded" => "executar uma tarefa com cada página em aberto",
-"cron.php is registered at a webcron service" => "cron.php esta registrado no serviço de webcron",
"Log" => "Log",
"More" => "Mais",
"Add your App" => "Adicione seu Aplicativo",
@@ -24,11 +21,8 @@
"Problems connecting to help database." => "Problemas ao conectar na base de dados.",
"Go there manually." => "Ir manualmente.",
"Answer" => "Resposta",
-"You use" => "Você usa",
-"of the available" => "do disponível",
"Desktop and Mobile Syncing Clients" => "Sincronizando Desktop e Mobile",
"Download" => "Download",
-"Your password got changed" => "Sua senha foi modificada",
"Unable to change your password" => "Não é possivel alterar a sua senha",
"Current password" => "Senha atual",
"New password" => "Nova senha",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index bf939df4aeb..f7440d832a0 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -6,16 +6,12 @@
"OpenID Changed" => "OpenID alterado",
"Invalid request" => "Pedido inválido",
"Language changed" => "Idioma alterado",
-"Error" => "Erro",
"Disable" => "Desativar",
"Enable" => "Ativar",
"Saving..." => "A guardar...",
"__language_name__" => "__language_name__",
"Security Warning" => "Aviso de Segurança",
"Cron" => "Cron",
-"execute one task with each page loaded" => "Executar uma tarefa com cada página carregada",
-"cron.php is registered at a webcron service" => "cron.php está registado num serviço webcron",
-"use systems cron service" => "usar o serviço cron do sistema",
"Log" => "Log",
"More" => "Mais",
"Add your App" => "Adicione a sua aplicação",
@@ -27,11 +23,8 @@
"Problems connecting to help database." => "Problemas ao conectar à base de dados de ajuda",
"Go there manually." => "Vá lá manualmente",
"Answer" => "Resposta",
-"You use" => "Está a usar",
-"of the available" => "do disponível",
"Desktop and Mobile Syncing Clients" => "Clientes de sincronização desktop e movel",
"Download" => "Transferir",
-"Your password got changed" => "A sua palavra-chave foi alterada",
"Unable to change your password" => "Não foi possivel alterar a sua palavra-chave",
"Current password" => "Palavra-chave atual",
"New password" => "Nova palavra-chave",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index c82cdaab2a4..ee0d804716b 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,37 +1,54 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Imposibil de încărcat lista din App Store",
"Authentication error" => "Eroare de autentificare",
+"Group already exists" => "Grupul există deja",
+"Unable to add group" => "Nu s-a putut adăuga grupul",
+"Could not enable app. " => "Nu s-a putut activa aplicația.",
"Email saved" => "E-mail salvat",
"Invalid email" => "E-mail nevalid",
"OpenID Changed" => "OpenID schimbat",
"Invalid request" => "Cerere eronată",
+"Unable to delete group" => "Nu s-a putut șterge grupul",
+"Unable to delete user" => "Nu s-a putut șterge utilizatorul",
"Language changed" => "Limba a fost schimbată",
-"Error" => "Erroare",
+"Unable to add user to group %s" => "Nu s-a putut adăuga utilizatorul la grupul %s",
+"Unable to remove user from group %s" => "Nu s-a putut elimina utilizatorul din grupul %s",
"Disable" => "Dezactivați",
"Enable" => "Activați",
"Saving..." => "Salvez...",
"__language_name__" => "_language_name_",
"Security Warning" => "Avertisment de securitate",
+"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." => "Directorul tău de date și fișierele tale probabil sunt accesibile prin internet. Fișierul .htaccess oferit de ownCloud nu funcționează. Îți recomandăm să configurezi server-ul tău web într-un mod în care directorul de date să nu mai fie accesibil sau mută directorul de date în afara directorului root al server-ului web.",
"Cron" => "Cron",
-"execute one task with each page loaded" => "executâ o sarcină cu fiecare pagină încărcată",
-"cron.php is registered at a webcron service" => "cron.php e înregistrat la un serviciu de webcron",
-"use systems cron service" => "utilizează serviciul de cron al sistemului",
+"Execute one task with each page loaded" => "Execută o sarcină la fiecare pagină încărcată",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php este înregistrat în serviciul webcron. Accesează pagina cron.php din root-ul owncloud odată pe minut prin http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Folosește serviciul cron al sistemului. Accesează fișierul cron.php din directorul owncloud printr-un cronjob de sistem odată la fiecare minut.",
+"Sharing" => "Partajare",
+"Enable Share API" => "Activare API partajare",
+"Allow apps to use the Share API" => "Permite aplicațiilor să folosească API-ul de partajare",
+"Allow links" => "Pemite legături",
+"Allow users to share items to the public with links" => "Permite utilizatorilor să partajeze fișiere în mod public prin legături",
+"Allow resharing" => "Permite repartajarea",
+"Allow users to share items shared with them again" => "Permite utilizatorilor să repartajeze fișiere partajate cu ei",
+"Allow users to share with anyone" => "Permite utilizatorilor să partajeze cu oricine",
+"Allow users to only share with users in their groups" => "Permite utilizatorilor să partajeze doar cu utilizatori din același grup",
"Log" => "Jurnal de activitate",
"More" => "Mai mult",
+"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>." => "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Add your App" => "Adaugă aplicația ta",
"Select an App" => "Selectează o aplicație",
"See application page at apps.owncloud.com" => "Vizualizează pagina applicației pe apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>",
"Documentation" => "Documetație",
"Managing Big Files" => "Gestionînd fișiere mari",
"Ask a question" => "Întreabă",
"Problems connecting to help database." => "Probleme de conectare la baza de date.",
"Go there manually." => "Pe cale manuală.",
"Answer" => "Răspuns",
-"You use" => "Utilizezi",
-"of the available" => "din cele diponibile",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Ai utilizat <strong>%s</strong> din <strong>%s<strong> spațiu disponibil",
"Desktop and Mobile Syncing Clients" => "Clienți de sincronizare pentru telefon mobil și desktop",
"Download" => "Descărcări",
-"Your password got changed" => "Parola ta s-a schimbat",
+"Your password was changed" => "Parola a fost modificată",
"Unable to change your password" => "Imposibil de-ați schimbat parola",
"Current password" => "Parola curentă",
"New password" => "Noua parolă",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 5cbeb002ec6..b658a4bbafb 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,37 +1,47 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Загрузка из App Store запрещена",
"Authentication error" => "Ошибка авторизации",
+"Group already exists" => "Группа уже существует",
+"Unable to add group" => "Невозможно добавить группу",
"Email saved" => "Email сохранен",
"Invalid email" => "Неправильный Email",
"OpenID Changed" => "OpenID изменён",
"Invalid request" => "Неверный запрос",
+"Unable to delete group" => "Невозможно удалить группу",
+"Unable to delete user" => "Невозможно удалить пользователя",
"Language changed" => "Язык изменён",
-"Error" => "Ошибка",
-"Disable" => "Отключить",
+"Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s",
+"Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s",
+"Disable" => "Выключить",
"Enable" => "Включить",
"Saving..." => "Сохранение...",
"__language_name__" => "Русский ",
"Security Warning" => "Предупреждение безопасности",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или вынести каталог data за пределы корневого каталога веб-сервера.",
"Cron" => "Задание",
-"execute one task with each page loaded" => "Запускать задание при загрузке каждой страницы",
-"cron.php is registered at a webcron service" => "cron.php зарегистрирован в webcron сервисе",
-"use systems cron service" => "использовать системные задания",
+"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 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" => "Ограничить публикацию группами пользователя",
"Log" => "Журнал",
"More" => "Ещё",
+"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>." => "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Add your App" => "Добавить приложение",
"Select an App" => "Выберите приложение",
"See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>",
"Documentation" => "Документация",
"Managing Big Files" => "Управление большими файлами",
"Ask a question" => "Задать вопрос",
"Problems connecting to help database." => "Проблема соединения с базой данных помощи.",
"Go there manually." => "Войти самостоятельно.",
"Answer" => "Ответ",
-"You use" => "Вы используете",
-"of the available" => "из доступных",
"Desktop and Mobile Syncing Clients" => "Клиенты синхронизации для рабочих станций и мобильных устройств",
"Download" => "Загрузка",
-"Your password got changed" => "Ваш пароль был изменён",
"Unable to change your password" => "Невозможно сменить пароль",
"Current password" => "Текущий пароль",
"New password" => "Новый пароль",
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
new file mode 100644
index 00000000000..a61b40e4fb2
--- /dev/null
+++ b/settings/l10n/ru_RU.php
@@ -0,0 +1,68 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Невозможно загрузить список из App Store",
+"Authentication error" => "Ошибка авторизации",
+"Group already exists" => "Группа уже существует",
+"Unable to add group" => "Невозможно добавить группу",
+"Could not enable app. " => "Не удалось запустить приложение",
+"Email saved" => "Email сохранен",
+"Invalid email" => "Неверный email",
+"OpenID Changed" => "OpenID изменен",
+"Invalid request" => "Неверный запрос",
+"Unable to delete group" => "Невозможно удалить группу",
+"Unable to delete user" => "Невозможно удалить пользователя",
+"Language changed" => "Язык изменен",
+"Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s",
+"Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s",
+"Disable" => "Отключить",
+"Enable" => "Включить",
+"Saving..." => "Сохранение",
+"__language_name__" => "__язык_имя__",
+"Security Warning" => "Предупреждение системы безопасности",
+"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." => "Ваш каталог данных и файлы возможно доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить сервер таким образом, чтобы каталог данных был бы больше не доступен, или переместить каталог данных за пределы корневой папки веб-сервера.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Выполняйте одну задачу на каждой загружаемой странице",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php зарегистрирован в службе webcron. Обращайтесь к странице cron.php в корне owncloud раз в минуту по http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Используйте системный сервис cron. Исполняйте файл cron.php в папке owncloud с помощью системы cronjob раз в минуту.",
+"Sharing" => "Совместное использование",
+"Enable Share API" => "Включить разделяемые API",
+"Allow apps to use the Share API" => "Разрешить приложениям использовать Share API",
+"Allow links" => "Предоставить ссылки",
+"Allow resharing" => "Разрешить повторное совместное использование",
+"Allow users to share with anyone" => "Разрешить пользователям разделение с кем-либо",
+"Allow users to only share with users in their groups" => "Разрешить пользователям разделение только с пользователями в их группах",
+"Log" => "Вход",
+"More" => "Подробнее",
+"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>." => "Разработанный <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>.",
+"Add your App" => "Добавить Ваше приложение",
+"Select an App" => "Выбрать приложение",
+"See application page at apps.owncloud.com" => "Обратитесь к странице приложений на apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
+"Documentation" => "Документация",
+"Managing Big Files" => "Управление большими файлами",
+"Ask a question" => "Задать вопрос",
+"Problems connecting to help database." => "Проблемы, связанные с разделом Помощь базы данных",
+"Go there manually." => "Сделать вручную.",
+"Answer" => "Ответ",
+"Desktop and Mobile Syncing Clients" => "Клиенты синхронизации настольной и мобильной систем",
+"Download" => "Загрузка",
+"Unable to change your password" => "Невозможно изменить Ваш пароль",
+"Current password" => "Текущий пароль",
+"New password" => "Новый пароль",
+"show" => "показать",
+"Change password" => "Изменить пароль",
+"Email" => "Электронная почта",
+"Your email address" => "Адрес Вашей электронной почты",
+"Fill in an email address to enable password recovery" => "Введите адрес электронной почты для возможности восстановления пароля",
+"Language" => "Язык",
+"Help translate" => "Помогите перевести",
+"use this address to connect to your ownCloud in your file manager" => "Используйте этот адрес для соединения с Вашим ownCloud в файловом менеджере",
+"Name" => "Имя",
+"Password" => "Пароль",
+"Groups" => "Группы",
+"Create" => "Создать",
+"Default Quota" => "Квота по умолчанию",
+"Other" => "Другой",
+"Group Admin" => "Группа Admin",
+"Quota" => "квота",
+"Delete" => "Удалить"
+);
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index f8032afe5b4..ebbd495df7b 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,29 +1,47 @@
<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nie je možné nahrať zoznam z App Store",
+"Authentication error" => "Chyba pri autentifikácii",
+"Group already exists" => "Skupina už existuje",
+"Unable to add group" => "Nie je možné pridať skupinu",
+"Could not enable app. " => "Nie je možné zapnúť aplikáciu.",
"Email saved" => "Email uložený",
"Invalid email" => "Neplatný email",
"OpenID Changed" => "OpenID zmenené",
"Invalid request" => "Neplatná požiadavka",
+"Unable to delete group" => "Nie je možné zmazať skupinu",
+"Unable to delete user" => "Nie je možné zmazať užívateľa",
"Language changed" => "Jazyk zmenený",
+"Unable to add user to group %s" => "Nie je možné pridať užívateľa do skupiny %s",
+"Unable to remove user from group %s" => "Nie je možné zmazať užívateľa zo skupiny %s",
"Disable" => "Zakázať",
"Enable" => "Povoliť",
"Saving..." => "Ukladám...",
"__language_name__" => "Slovensky",
+"Security Warning" => "Bezpečnostné varovanie",
+"Sharing" => "Zdieľanie",
+"Enable Share API" => "Zapnúť API zdieľania",
+"Allow apps to use the Share API" => "Povoliť aplikáciam používať API pre zdieľanie",
+"Allow links" => "Povoliť odkazy",
+"Allow users to share items to the public with links" => "Povoliť užívateľom zdieľať obsah pomocou verejných odkazov",
+"Allow resharing" => "Povoliť opakované zdieľanie",
+"Allow users to share with anyone" => "Povoliť užívateľom zdieľať s každým",
+"Allow users to only share with users in their groups" => "Povoliť užívateľom zdieľanie iba s užívateľmi ich vlastnej skupiny",
"Log" => "Záznam",
"More" => "Viac",
"Add your App" => "Pridať vašu aplikáciu",
"Select an App" => "Vyberte aplikáciu",
"See application page at apps.owncloud.com" => "Pozrite si stránku aplikácie na apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>",
"Documentation" => "Dokumentácia",
"Managing Big Files" => "Spravovanie veľké súbory",
"Ask a question" => "Opýtajte sa otázku",
"Problems connecting to help database." => "Problémy spojené s pomocnou databázou.",
"Go there manually." => "Prejsť tam ručne.",
"Answer" => "Odpoveď",
-"You use" => "Používate",
-"of the available" => "z dostupných",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Použili ste <strong>%s</strong> dostupného <strong>%s<strong>",
"Desktop and Mobile Syncing Clients" => "Klienti pre synchronizáciu",
"Download" => "Stiahnúť",
-"Your password got changed" => "Vaše heslo sa zmenilo",
+"Your password was changed" => "Heslo bolo zmenené",
"Unable to change your password" => "Nedokážem zmeniť vaše heslo",
"Current password" => "Aktuálne heslo",
"New password" => "Nové heslo",
@@ -41,6 +59,7 @@
"Create" => "Vytvoriť",
"Default Quota" => "Predvolená kvóta",
"Other" => "Iné",
+"Group Admin" => "Správca skupiny",
"Quota" => "Kvóta",
"Delete" => "Odstrániť"
);
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 7b5c6bee3cb..9fbf376dea5 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -3,6 +3,7 @@
"Authentication error" => "Napaka overitve",
"Group already exists" => "Skupina že obstaja",
"Unable to add group" => "Ni mogoče dodati skupine",
+"Could not enable app. " => "Aplikacije ni bilo mogoče omogočiti.",
"Email saved" => "E-poštni naslov je bil shranjen",
"Invalid email" => "Neveljaven e-poštni naslov",
"OpenID Changed" => "OpenID je bil spremenjen",
@@ -12,7 +13,6 @@
"Language changed" => "Jezik je bil spremenjen",
"Unable to add user to group %s" => "Uporabnika ni mogoče dodati k skupini %s",
"Unable to remove user from group %s" => "Uporabnika ni mogoče odstraniti iz skupine %s",
-"Error" => "Napaka",
"Disable" => "Onemogoči",
"Enable" => "Omogoči",
"Saving..." => "Shranjevanje...",
@@ -20,12 +20,12 @@
"Security Warning" => "Varnostno opozorilo",
"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." => "Vaša mapa data in vaše datoteke so verjetno vsem dostopne preko interneta. Datoteka .htaccess vključena v ownCloud ni omogočena. Močno vam priporočamo, da nastavite vaš spletni strežnik tako, da mapa data ne bo več na voljo vsem, ali pa jo preselite izven korenske mape spletnega strežnika.",
"Cron" => "Periodično opravilo",
-"execute one task with each page loaded" => "izvedi eno nalogo z vsako naloženo stranjo",
-"cron.php is registered at a webcron service" => "cron.php je vpisan na storitev webcron",
-"use systems cron service" => "uporabi sistemski servis za periodična opravila",
-"Share API" => "API souporabe",
+"Execute one task with each page loaded" => "Izvede eno opravilo z vsako naloženo stranjo.",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "Datoteka cron.php je prijavljena pri enem od spletnih servisov za periodična opravila. Preko protokola http pokličite datoteko cron.php, ki se nahaja v ownCloud korenski mapi, enkrat na minuto.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Uporabi sistemski servis za periodična opravila. Preko sistemskega servisa pokličite datoteko cron.php, ki se nahaja v ownCloud korenski mapi, enkrat na minuto.",
+"Sharing" => "Souporaba",
"Enable Share API" => "Omogoči API souporabe",
-"Allow apps to use the Share API" => "Dovoli aplikacijam uporabo API-ja souporabe",
+"Allow apps to use the Share API" => "Aplikacijam dovoli uporabo API-ja souporabe",
"Allow links" => "Dovoli povezave",
"Allow users to share items to the public with links" => "Uporabnikom dovoli souporabo z javnimi povezavami",
"Allow resharing" => "Dovoli nadaljnjo souporabo",
@@ -34,7 +34,7 @@
"Allow users to only share with users in their groups" => "Uporabnikom dovoli souporabo le znotraj njihove skupine",
"Log" => "Dnevnik",
"More" => "Več",
-"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>." => "Razvit s strani <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnosti ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je izdana pod licenco <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Razvija ga <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud skupnost</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je izdana pod licenco <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Add your App" => "Dodajte vašo aplikacijo",
"Select an App" => "Izberite aplikacijo",
"See application page at apps.owncloud.com" => "Obiščite spletno stran aplikacije na apps.owncloud.com",
@@ -45,11 +45,8 @@
"Problems connecting to help database." => "Težave pri povezovanju s podatkovno zbirko pomoči.",
"Go there manually." => "Pojdi tja ročno.",
"Answer" => "Odgovor",
-"You use" => "Uporabljate",
-"of the available" => "od razpoložljivih",
"Desktop and Mobile Syncing Clients" => "Namizni in mobilni odjemalci za sinhronizacijo",
"Download" => "Prenesi",
-"Your password got changed" => "Vaše geslo je bilo spremenjeno",
"Unable to change your password" => "Vašega gesla ni bilo mogoče spremeniti.",
"Current password" => "Trenutno geslo",
"New password" => "Novo geslo",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 84881c2f1a8..3fc1cd8c1ec 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -7,9 +7,6 @@
"Problems connecting to help database." => "Проблем у повезивању са базом помоћи",
"Go there manually." => "Отиђите тамо ручно.",
"Answer" => "Одговор",
-"You use" => "Користите",
-"of the available" => "од доступних",
-"Your password got changed" => "Ваша лозинка је измењена",
"Unable to change your password" => "Не могу да изменим вашу лозинку",
"Current password" => "Тренутна лозинка",
"New password" => "Нова лозинка",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 8bfc0fa989f..5a85856979d 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -7,9 +7,6 @@
"Problems connecting to help database." => "Problem u povezivanju sa bazom pomoći",
"Go there manually." => "Otiđite tamo ručno.",
"Answer" => "Odgovor",
-"You use" => "Koristite",
-"of the available" => "od dostupnih",
-"Your password got changed" => "Vaša lozinka je izmenjena",
"Unable to change your password" => "Ne mogu da izmenim vašu lozinku",
"Current password" => "Trenutna lozinka",
"New password" => "Nova lozinka",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 1a18e9670de..8e6f0dbbd7b 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -3,6 +3,7 @@
"Authentication error" => "Autentiseringsfel",
"Group already exists" => "Gruppen finns redan",
"Unable to add group" => "Kan inte lägga till grupp",
+"Could not enable app. " => "Kunde inte aktivera appen.",
"Email saved" => "E-post sparad",
"Invalid email" => "Ogiltig e-post",
"OpenID Changed" => "OpenID ändrat",
@@ -12,7 +13,6 @@
"Language changed" => "Språk ändrades",
"Unable to add user to group %s" => "Kan inte lägga till användare i gruppen %s",
"Unable to remove user from group %s" => "Kan inte radera användare från gruppen %s",
-"Error" => "Fel",
"Disable" => "Deaktivera",
"Enable" => "Aktivera",
"Saving..." => "Sparar...",
@@ -20,10 +20,10 @@
"Security Warning" => "Säkerhetsvarning",
"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." => "Din datamapp och dina filer kan möjligen vara nåbara från internet. Filen .htaccess som ownCloud tillhandahåller fungerar inte. Vi rekommenderar starkt att du ställer in din webbserver på ett sätt så att datamappen inte är nåbar. Alternativt att ni flyttar datamappen utanför webbservern.",
"Cron" => "Cron",
-"execute one task with each page loaded" => "utför en uppgift vid varje sidladdning",
-"cron.php is registered at a webcron service" => "cron.php är registrerad på en webcron-tjänst",
-"use systems cron service" => "använd systemets cron-tjänst",
-"Share API" => "Delat API",
+"Execute one task with each page loaded" => "Exekvera en uppgift vid varje sidladdning",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php är registrerad som en webcron-tjänst. Anropa cron.php sidan i ownCloud en gång i minuten över HTTP.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Använd system-tjänsten cron. Anropa filen cron.php i ownCloud-mappen via ett cronjobb varje minut.",
+"Sharing" => "Dela",
"Enable Share API" => "Aktivera delat API",
"Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
"Allow links" => "Tillåt länkar",
@@ -45,11 +45,10 @@
"Problems connecting to help database." => "Problem med att ansluta till hjälpdatabasen.",
"Go there manually." => "Gå dit manuellt.",
"Answer" => "Svar",
-"You use" => "Du använder",
-"of the available" => "av tillgängliga",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Du har använt <strong>%s</strong> av tillgängliga <strong>%s<strong>",
"Desktop and Mobile Syncing Clients" => "Synkroniseringsklienter för dator och mobil",
"Download" => "Ladda ner",
-"Your password got changed" => "Ditt lösenord har ändrats",
+"Your password was changed" => "Ditt lösenord har ändrats",
"Unable to change your password" => "Kunde inte ändra ditt lösenord",
"Current password" => "Nuvarande lösenord",
"New password" => "Nytt lösenord",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index d775af76713..c3ed4e859fc 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -3,6 +3,7 @@
"Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
"Group already exists" => "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
"Unable to add group" => "ไม่สามารถเพิ่มกลุ่มได้",
+"Could not enable app. " => "ไม่สามารถเปิดใช้งานแอปได้",
"Email saved" => "อีเมลถูกบันทึกแล้ว",
"Invalid email" => "อีเมลไม่ถูกต้อง",
"OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
@@ -12,7 +13,6 @@
"Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
"Unable to add user to group %s" => "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้",
"Unable to remove user from group %s" => "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้",
-"Error" => "ข้อผิดพลาด",
"Disable" => "ปิดใช้งาน",
"Enable" => "เปิดใช้งาน",
"Saving..." => "กำลังบันทึุกข้อมูล...",
@@ -20,10 +20,10 @@
"Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
"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." => "ไดเร็กทอรี่ข้อมูลและไฟล์ของคุณสามารถเข้าถึงได้จากอินเทอร์เน็ต ไฟล์ .htaccess ที่ ownCloud มีให้ไม่สามารถทำงานได้อย่างเหมาะสม เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ใหม่ในรูปแบบที่ไดเร็กทอรี่เก็บข้อมูลไม่สามารถเข้าถึงได้อีกต่อไป หรือคุณได้ย้ายไดเร็กทอรี่ที่ใช้เก็บข้อมูลไปอยู่ภายนอกตำแหน่ง root ของเว็บเซิร์ฟเวอร์แล้ว",
"Cron" => "Cron",
-"execute one task with each page loaded" => "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง",
-"cron.php is registered at a webcron service" => "cron.php ได้ถูกลงทะเบียนที่บริการ webcron",
-"use systems cron service" => "ใช้บริการ cron จากระบบ",
-"Share API" => "API สำหรับคุณสมบัติแชร์ข้อมูล",
+"Execute one task with each page loaded" => "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ได้รับการลงทะเบียนแล้วกับเว็บผู้ให้บริการ webcron เรียกหน้าเว็บ cron.php ที่ตำแหน่ง root ของ owncloud หลังจากนี้สักครู่ผ่านทาง http",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "ใช้บริการ cron จากระบบ เรียกไฟล์ cron.php ในโฟลเดอร์ owncloud ผ่านทาง cronjob ของระบบหลังจากนี้สักครู่",
+"Sharing" => "การแชร์ข้อมูล",
"Enable Share API" => "เปิดใช้งาน API สำหรับคุณสมบัติแชร์ข้อมูล",
"Allow apps to use the Share API" => "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
"Allow links" => "อนุญาตให้ใช้งานลิงก์ได้",
@@ -45,11 +45,10 @@
"Problems connecting to help database." => "เกิดปัญหาในการเชื่อมต่อกับฐานข้อมูลช่วยเหลือ",
"Go there manually." => "ไปที่นั่นด้วยตนเอง",
"Answer" => "คำตอบ",
-"You use" => "คุณใช้พื้นที่ไป",
-"of the available" => "จากจำนวนที่ใช้ได้",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "คุณได้ใช้ <strong>%s</strong> จากที่สามารถใช้ได้ <strong>%s<strong>",
"Desktop and Mobile Syncing Clients" => "โปรแกรมเชื่อมข้อมูลไฟล์สำหรับเครื่องเดสก์ท็อปและมือถือ",
"Download" => "ดาวน์โหลด",
-"Your password got changed" => "เปลี่ยนรหัสผ่านเรียบร้อยแล้ว",
+"Your password was changed" => "รหัสผ่านของคุณถูกเปลี่ยนแล้ว",
"Unable to change your password" => "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
"Current password" => "รหัสผ่านปัจจุบัน",
"New password" => "รหัสผ่านใหม่",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 6e68d792e74..31486c7776a 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -21,11 +21,8 @@
"Problems connecting to help database." => "Yardım veritabanına bağlanmada sorunlar var.",
"Go there manually." => "Oraya elle gidin.",
"Answer" => "Cevap",
-"You use" => "Kullanıyorsunuz",
-"of the available" => "mevcut olandan",
"Desktop and Mobile Syncing Clients" => "Masaüstü ve Mobil Senkron İstemcileri",
"Download" => "İndir",
-"Your password got changed" => "Parolanız değiştirildi",
"Unable to change your password" => "Parolanız değiştirilemiyor",
"Current password" => "Mevcut parola",
"New password" => "Yeni parola",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 37ecd73fb68..82b6881dfc1 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -5,9 +5,6 @@
"Select an App" => "Вибрати додаток",
"Ask a question" => "Запитати",
"Problems connecting to help database." => "Проблема при з'єднані з базою допомоги",
-"You use" => "Ви використовуєте",
-"of the available" => "з доступної",
-"Your password got changed" => "Ваш пароль змінено",
"Current password" => "Поточний пароль",
"New password" => "Новий пароль",
"show" => "показати",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 1cad2e148d0..18de6a6068f 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -1,33 +1,47 @@
<?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",
+"Group already exists" => "Nhóm đã tồn tại",
+"Unable to add group" => "Không thể thêm nhóm",
"Email saved" => "Lưu email",
"Invalid email" => "Email không hợp lệ",
"OpenID Changed" => "Đổi OpenID",
"Invalid request" => "Yêu cầu không hợp lệ",
+"Unable to delete group" => "Không thể xóa nhóm",
+"Unable to delete user" => "Không thể xóa người dùng",
"Language changed" => "Ngôn ngữ đã được thay đổi",
-"Error" => "Lỗi",
+"Unable to add user to group %s" => "Không thể thêm người dùng vào nhóm %s",
+"Unable to remove user from group %s" => "Không thể xóa người dùng từ nhóm %s",
"Disable" => "Vô hiệu",
"Enable" => "Cho phép",
"Saving..." => "Đang tiến hành lưu ...",
"__language_name__" => "__Ngôn ngữ___",
"Security Warning" => "Cảnh bảo bảo mật",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ internet. Tập tin .htaccess của ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ webserver của bạn để thư mục dữ liệu không còn bị truy cập hoặc bạn di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.",
+"Cron" => "Cron",
+"Enable Share API" => "Bật chia sẻ API",
+"Allow apps to use the Share API" => "Cho phép các ứng dụng sử dụng chia sẻ API",
+"Allow links" => "Cho phép liên kết",
+"Allow users to share items to the public with links" => "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết",
+"Allow resharing" => "Cho phép chia sẻ lại",
+"Allow users to share items shared with them again" => "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ",
+"Allow users to share with anyone" => "Cho phép người dùng chia sẻ với bất cứ ai",
+"Allow users to only share with users in their groups" => "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ",
"Log" => "Log",
"More" => "nhiều hơn",
+"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>." => "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Add your App" => "Thêm ứng dụng của bạn",
"Select an App" => "Chọn một ứng dụng",
"See application page at apps.owncloud.com" => "Xem ứng dụng tại apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Giấy phép được cấp bởi <span class=\"author\"></span>",
"Documentation" => "Tài liệu",
"Managing Big Files" => "Quản lý tập tin lớn",
"Ask a question" => "Đặt câu hỏi",
"Problems connecting to help database." => "Vấn đề kết nối đến cơ sở dữ liệu.",
"Go there manually." => "Đến bằng thủ công",
"Answer" => "trả lời",
-"You use" => "Bạn sử dụng",
-"of the available" => "có sẵn",
"Desktop and Mobile Syncing Clients" => "Đồng bộ dữ liệu",
"Download" => "Tải về",
-"Your password got changed" => "Mật khẩu đã được thay đổi",
"Unable to change your password" => "Không thể đổi mật khẩu",
"Current password" => "Mật khẩu cũ",
"New password" => "Mật khẩu mới ",
@@ -45,6 +59,7 @@
"Create" => "Tạo",
"Default Quota" => "Hạn ngạch mặt định",
"Other" => "Khác",
+"Group Admin" => "Nhóm quản trị",
"Quota" => "Hạn ngạch",
"Delete" => "Xóa"
);
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index 83111beb10e..26bfbbd7ae5 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -1,34 +1,54 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "不能从App Store 中加载列表",
"Authentication error" => "认证错误",
+"Group already exists" => "群组已存在",
+"Unable to add group" => "未能添加群组",
+"Could not enable app. " => "未能启用应用",
"Email saved" => "Email 保存了",
"Invalid email" => "非法Email",
"OpenID Changed" => "OpenID 改变了",
"Invalid request" => "非法请求",
+"Unable to delete group" => "未能删除群组",
+"Unable to delete user" => "未能删除用户",
"Language changed" => "语言改变了",
-"Error" => "错误",
+"Unable to add user to group %s" => "未能添加用户到群组 %s",
+"Unable to remove user from group %s" => "未能将用户从群组 %s 移除",
"Disable" => "禁用",
"Enable" => "启用",
"Saving..." => "保存中...",
"__language_name__" => "Chinese",
"Security Warning" => "安全警告",
+"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." => "您的数据文件夹和您的文件可能可以从互联网访问。ownCloud 提供的 .htaccess 文件未工作。我们强烈建议您配置您的网络服务器,让数据文件夹不能访问,或将数据文件夹移出网络服务器文档根目录。",
"Cron" => "定时",
+"Execute one task with each page loaded" => "在每个页面载入时执行一项任务",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php 已作为 webcron 服务注册。owncloud 根用户将通过 http 协议每分钟调用一次 cron.php。",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "使用系统 cron 服务。通过系统 cronjob 每分钟调用一次 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 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" => "只允许用户与群组内用户分享",
"Log" => "日志",
"More" => "更多",
+"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>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社区</a>开发,<a href=\"https://github.com/owncloud\" target=\"_blank\">s源代码</a> 以 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 许可协议发布。",
"Add your App" => "添加你的应用程序",
"Select an App" => "选择一个程序",
"See application page at apps.owncloud.com" => "在owncloud.com上查看应用程序",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>授权协议 <span class=\"author\"></span>",
"Documentation" => "文档",
"Managing Big Files" => "管理大文件",
"Ask a question" => "提一个问题",
"Problems connecting to help database." => "连接到帮助数据库时的问题",
"Go there manually." => "收到转到.",
"Answer" => "回答",
-"You use" => "你使用",
-"of the available" => "可用的",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "您已使用了 <strong>%s</strong>,总可用 <strong>%s<strong>",
"Desktop and Mobile Syncing Clients" => "桌面和移动同步客户端",
"Download" => "下载",
-"Your password got changed" => "你的密码已经改变",
+"Your password was changed" => "您的密码以变更",
"Unable to change your password" => "不能改变你的密码",
"Current password" => "现在的密码",
"New password" => "新密码",
@@ -46,6 +66,7 @@
"Create" => "新建",
"Default Quota" => "默认限额",
"Other" => "其他的",
+"Group Admin" => "群组管理员",
"Quota" => "限额",
"Delete" => "删除"
);
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 7927cec61c7..41f22776885 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -3,6 +3,7 @@
"Authentication error" => "认证错误",
"Group already exists" => "已存在组",
"Unable to add group" => "不能添加组",
+"Could not enable app. " => "无法开启App",
"Email saved" => "电子邮件已保存",
"Invalid email" => "无效的电子邮件",
"OpenID Changed" => "OpenID 已修改",
@@ -12,7 +13,6 @@
"Language changed" => "语言已修改",
"Unable to add user to group %s" => "不能把用户添加到组 %s",
"Unable to remove user from group %s" => "不能从组%s中移除用户",
-"Error" => "错误",
"Disable" => "禁用",
"Enable" => "启用",
"Saving..." => "正在保存",
@@ -20,10 +20,10 @@
"Security Warning" => "安全警告",
"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." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器,以使数据文件夹不可被访问,或者将数据文件夹移到web服务器以外。",
"Cron" => "计划任务",
-"execute one task with each page loaded" => "为每个装入的页面执行任务",
-"cron.php is registered at a webcron service" => "crop.php 已",
-"use systems cron service" => "实现系统 cron 服务",
-"Share API" => "共享API",
+"Execute one task with each page loaded" => "每次页面加载完成后执行任务",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php已被注册到网络定时任务服务。通过http每分钟调用owncloud根目录的cron.php网页。",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "使用系统定时任务服务。每分钟通过系统定时任务调用owncloud文件夹中的cron.php文件",
+"Sharing" => "分享",
"Enable Share API" => "开启共享API",
"Allow apps to use the Share API" => "允许 应用 使用共享API",
"Allow links" => "允许连接",
@@ -45,11 +45,8 @@
"Problems connecting to help database." => "连接帮助数据库错误 ",
"Go there manually." => "手动访问",
"Answer" => "回答",
-"You use" => "您使用了",
-"of the available" => "的空间,总容量为",
"Desktop and Mobile Syncing Clients" => "桌面和移动设备同步程序",
"Download" => "下载",
-"Your password got changed" => "密码已修改",
"Unable to change your password" => "无法修改密码",
"Current password" => "当前密码",
"New password" => "新密码",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index e0eeddb375e..ccf67cef035 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,17 +1,29 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "無法從 App Store 讀取清單",
"Authentication error" => "認證錯誤",
+"Group already exists" => "群組已存在",
+"Unable to add group" => "群組增加失敗",
"Email saved" => "Email已儲存",
"Invalid email" => "無效的email",
"OpenID Changed" => "OpenID 已變更",
"Invalid request" => "無效請求",
+"Unable to delete group" => "群組刪除錯誤",
+"Unable to delete user" => "使用者刪除錯誤",
"Language changed" => "語言已變更",
-"Error" => "錯誤",
+"Unable to add user to group %s" => "使用者加入群組%s錯誤",
+"Unable to remove user from group %s" => "使用者移出群組%s錯誤",
"Disable" => "停用",
"Enable" => "啟用",
"Saving..." => "儲存中...",
"__language_name__" => "__語言_名稱__",
"Security Warning" => "安全性警告",
+"Cron" => "定期執行",
+"Allow links" => "允許連結",
+"Allow users to share items to the public with links" => "允許使用者以結連公開分享檔案",
+"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" => "僅允許使用者在群組內分享",
"Log" => "紀錄",
"More" => "更多",
"Add your App" => "添加你的 App",
@@ -23,11 +35,8 @@
"Problems connecting to help database." => "連接到求助資料庫發生問題",
"Go there manually." => "手動前往",
"Answer" => "答案",
-"You use" => "你使用",
-"of the available" => "可用",
"Desktop and Mobile Syncing Clients" => "桌機與手機同步客戶端",
"Download" => "下載",
-"Your password got changed" => "你的密碼已變更",
"Unable to change your password" => "無法變更你的密碼",
"Current password" => "目前密碼",
"New password" => "新密碼",
@@ -45,6 +54,7 @@
"Create" => "創造",
"Default Quota" => "預設容量限制",
"Other" => "其他",
+"Group Admin" => "群組 管理員",
"Quota" => "容量限制",
"Delete" => "刪除"
);
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 5fa9e26c9c7..35f34489fec 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -29,16 +29,31 @@ if(!$_['htaccessworking']) {
<fieldset class="personalblock" id="backgroundjobs">
<legend><strong><?php echo $l->t('Cron');?></strong></legend>
- <input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ) { echo 'checked="checked"'; } ?>>
- <label for="backgroundjobs_ajax" title="<?php echo $l->t("execute one task with each page loaded"); ?>">AJAX</label><br />
- <input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ) { echo 'checked="checked"'; } ?>>
- <label for="backgroundjobs_webcron" title="<?php echo $l->t("cron.php is registered at a webcron service"); ?>">Webcron</label><br />
- <input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ) { echo 'checked="checked"'; } ?>>
- <label for="backgroundjobs_cron" title="<?php echo $l->t("use systems cron service"); ?>">Cron</label><br />
+ <table class="nostyle">
+ <tr>
+ <td>
+ <input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ) { echo 'checked="checked"'; } ?>>
+ <label for="backgroundjobs_ajax">AJAX</label><br />
+ <em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
+ </td>
+ </tr><tr>
+ <td>
+ <input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ) { echo 'checked="checked"'; } ?>>
+ <label for="backgroundjobs_webcron">Webcron</label><br />
+ <em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
+ </td>
+ </tr><tr>
+ <td>
+ <input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ) { echo 'checked="checked"'; } ?>>
+ <label for="backgroundjobs_cron">Cron</label><br />
+ <em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
+ </td>
+ </tr>
+ </table>
</fieldset>
<fieldset class="personalblock" id="shareAPI">
- <legend><strong><?php echo $l->t('Share API');?></strong></legend>
+ <legend><strong><?php echo $l->t('Sharing');?></strong></legend>
<table class="shareAPI nostyle">
<tr>
<td id="enable">
@@ -46,15 +61,19 @@ if(!$_['htaccessworking']) {
<label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br />
<em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
</td>
+ </tr><tr>
<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
<input type="checkbox" name="shareapi_allow_links" id="allowLinks" value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
<label for="allowLinks"><?php echo $l->t('Allow links');?></label><br />
<em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
</td>
+ </tr><tr>
<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
<label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br />
<em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
+ </td>
+ </tr><tr>
<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
<label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br />
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 30f919ac753..0662148ebf2 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -11,7 +11,7 @@
</div>
<ul id="leftcontent" class="applist">
<?php foreach($_['apps'] as $app):?>
- <li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>"
+ <li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>" <?php if ( isset( $app['ocs_id'] ) ) { echo "data-id-ocs=\"{$app['ocs_id']}\""; } ?>
data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
<a class="app<?php if(!$app['internal']) echo ' externalapp' ?>" href="?appid=<?php echo $app['id'] ?>"><?php echo htmlentities($app['name']) ?></a>
<script type="application/javascript">
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 4503f3d50b4..55ff24b4223 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -5,7 +5,7 @@
*/?>
<div id="quota" class="personalblock"><div style="width:<?php echo $_['usage_relative'];?>%;">
- <p id="quotatext"><?php echo $l->t('You use');?> <strong><?php echo $_['usage'];?></strong> <?php echo $l->t('of the available');?> <strong><?php echo $_['total_space'];?></strong></p>
+ <p id="quotatext"><?php echo $l->t('You have used <strong>%s</strong> of the available <strong>%s<strong>', array($_['usage'], $_['total_space']));?></p>
</div></div>
<div class="personalblock">
@@ -16,7 +16,7 @@
<form id="passwordform">
<fieldset class="personalblock">
- <div id="passwordchanged"><?php echo $l->t('Your password got changed');?></div>
+ <div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" />
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index b45779038ba..b2fecdc8bf7 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -249,6 +249,7 @@ class Test_Share extends UnitTestCase {
$this->assertTrue(in_array('test1.txt', $to_test));
// Remove user
+ OC_User::setUserId($this->user1);
OC_User::deleteUser($this->user1);
OC_User::setUserId($this->user2);
$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test1.txt'));
@@ -383,8 +384,15 @@ class Test_Share extends UnitTestCase {
OC_Group::addToGroup($this->user4, $this->group1);
$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+ // Unshare from self
+ $this->assertTrue(OCP\Share::unshareFromSelf('test', 'test.txt'));
+ $this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
+ OC_User::setUserId($this->user2);
+ $this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+
// Remove group
OC_Group::deleteGroup($this->group1);
+ OC_User::setUserId($this->user4);
$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
OC_User::setUserId($this->user3);
$this->assertEqual(OCP\Share::getItemsShared('test'), array());