summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-02-25 12:14:51 +0100
committerBjörn Schießle <schiessle@owncloud.com>2013-02-25 12:14:51 +0100
commit4dea6a6228390713c0296dd6a447b9f60a211767 (patch)
treee5f7840770ab4ea67f0a58d6642b6b75cfa05fda
parent6aed7abfbe4a58cec822bdd16d8c71d4bac14c28 (diff)
parent9ee5069f2a1d76c899eeef6cec0f06387764fabd (diff)
downloadnextcloud-server-4dea6a6228390713c0296dd6a447b9f60a211767.tar.gz
nextcloud-server-4dea6a6228390713c0296dd6a447b9f60a211767.zip
Merge branch 'master' into trashbin_encryption
Conflicts: apps/files_trashbin/index.php apps/files_trashbin/lib/trash.php
-rw-r--r--apps/files/ajax/upload.php3
-rw-r--r--apps/files/appinfo/info.xml2
-rw-r--r--apps/files/js/filelist.js14
-rw-r--r--apps/files/js/files.js20
-rw-r--r--apps/files/l10n/de_DE.php4
-rw-r--r--apps/files/l10n/he.php1
-rw-r--r--apps/files/l10n/hy.php6
-rw-r--r--apps/files/l10n/id.php4
-rw-r--r--apps/files/l10n/my_MM.php3
-rw-r--r--apps/files/l10n/pt_BR.php1
-rw-r--r--apps/files_encryption/l10n/id.php7
-rw-r--r--apps/files_external/appinfo/info.xml2
-rw-r--r--apps/files_external/l10n/hy.php3
-rw-r--r--apps/files_external/l10n/id.php36
-rw-r--r--apps/files_external/l10n/my_MM.php3
-rwxr-xr-xapps/files_external/lib/config.php16
-rw-r--r--apps/files_external/lib/sftp.php14
-rw-r--r--apps/files_sharing/appinfo/info.xml2
-rw-r--r--apps/files_sharing/appinfo/update.php5
-rw-r--r--apps/files_sharing/l10n/my_MM.php4
-rw-r--r--apps/files_sharing/lib/cache.php5
-rw-r--r--apps/files_sharing/lib/permissions.php3
-rw-r--r--apps/files_sharing/lib/share/file.php14
-rw-r--r--apps/files_sharing/lib/share/folder.php5
-rw-r--r--apps/files_sharing/lib/sharedstorage.php13
-rw-r--r--apps/files_sharing/public.php10
-rw-r--r--apps/files_sharing/templates/public.php20
-rw-r--r--apps/files_trashbin/ajax/delete.php2
-rw-r--r--apps/files_trashbin/ajax/undelete.php4
-rw-r--r--apps/files_trashbin/appinfo/app.php6
-rw-r--r--apps/files_trashbin/appinfo/info.xml2
-rw-r--r--apps/files_trashbin/index.php28
-rw-r--r--apps/files_trashbin/js/disableDefaultActions.js6
-rw-r--r--apps/files_trashbin/js/trash.js24
-rw-r--r--apps/files_trashbin/l10n/ar.php3
-rw-r--r--apps/files_trashbin/l10n/bg_BG.php3
-rw-r--r--apps/files_trashbin/l10n/bn_BD.php3
-rw-r--r--apps/files_trashbin/l10n/ca.php4
-rw-r--r--apps/files_trashbin/l10n/cs_CZ.php4
-rw-r--r--apps/files_trashbin/l10n/da.php4
-rw-r--r--apps/files_trashbin/l10n/de.php8
-rw-r--r--apps/files_trashbin/l10n/de_DE.php8
-rw-r--r--apps/files_trashbin/l10n/el.php4
-rw-r--r--apps/files_trashbin/l10n/eo.php3
-rw-r--r--apps/files_trashbin/l10n/es.php4
-rw-r--r--apps/files_trashbin/l10n/es_AR.php4
-rw-r--r--apps/files_trashbin/l10n/et_EE.php4
-rw-r--r--apps/files_trashbin/l10n/eu.php4
-rw-r--r--apps/files_trashbin/l10n/fa.php3
-rw-r--r--apps/files_trashbin/l10n/fi_FI.php4
-rw-r--r--apps/files_trashbin/l10n/fr.php4
-rw-r--r--apps/files_trashbin/l10n/gl.php4
-rw-r--r--apps/files_trashbin/l10n/he.php11
-rw-r--r--apps/files_trashbin/l10n/hr.php3
-rw-r--r--apps/files_trashbin/l10n/hu_HU.php4
-rw-r--r--apps/files_trashbin/l10n/hy.php3
-rw-r--r--apps/files_trashbin/l10n/ia.php3
-rw-r--r--apps/files_trashbin/l10n/id.php14
-rw-r--r--apps/files_trashbin/l10n/is.php3
-rw-r--r--apps/files_trashbin/l10n/it.php4
-rw-r--r--apps/files_trashbin/l10n/ja_JP.php4
-rw-r--r--apps/files_trashbin/l10n/ka_GE.php3
-rw-r--r--apps/files_trashbin/l10n/ko.php3
-rw-r--r--apps/files_trashbin/l10n/lb.php3
-rw-r--r--apps/files_trashbin/l10n/lt_LT.php3
-rw-r--r--apps/files_trashbin/l10n/lv.php4
-rw-r--r--apps/files_trashbin/l10n/mk.php3
-rw-r--r--apps/files_trashbin/l10n/ms_MY.php3
-rw-r--r--apps/files_trashbin/l10n/nb_NO.php3
-rw-r--r--apps/files_trashbin/l10n/nl.php4
-rw-r--r--apps/files_trashbin/l10n/nn_NO.php3
-rw-r--r--apps/files_trashbin/l10n/oc.php3
-rw-r--r--apps/files_trashbin/l10n/pl.php3
-rw-r--r--apps/files_trashbin/l10n/pt_BR.php4
-rw-r--r--apps/files_trashbin/l10n/pt_PT.php4
-rw-r--r--apps/files_trashbin/l10n/ro.php3
-rw-r--r--apps/files_trashbin/l10n/ru.php4
-rw-r--r--apps/files_trashbin/l10n/ru_RU.php4
-rw-r--r--apps/files_trashbin/l10n/si_LK.php3
-rw-r--r--apps/files_trashbin/l10n/sk_SK.php4
-rw-r--r--apps/files_trashbin/l10n/sl.php3
-rw-r--r--apps/files_trashbin/l10n/sr.php3
-rw-r--r--apps/files_trashbin/l10n/sr@latin.php3
-rw-r--r--apps/files_trashbin/l10n/sv.php4
-rw-r--r--apps/files_trashbin/l10n/ta_LK.php3
-rw-r--r--apps/files_trashbin/l10n/th_TH.php3
-rw-r--r--apps/files_trashbin/l10n/tr.php4
-rw-r--r--apps/files_trashbin/l10n/uk.php4
-rw-r--r--apps/files_trashbin/l10n/vi.php4
-rw-r--r--apps/files_trashbin/l10n/zh_CN.GB2312.php3
-rw-r--r--apps/files_trashbin/l10n/zh_CN.php3
-rw-r--r--apps/files_trashbin/l10n/zh_TW.php4
-rw-r--r--apps/files_trashbin/lib/hooks.php40
-rw-r--r--apps/files_trashbin/lib/trash.php259
-rw-r--r--apps/files_trashbin/templates/part.list.php1
-rw-r--r--apps/files_versions/ajax/rollbackVersion.php1
-rw-r--r--apps/files_versions/appinfo/info.xml2
-rw-r--r--apps/files_versions/js/versions.js4
-rw-r--r--apps/files_versions/l10n/fa.php7
-rw-r--r--apps/files_versions/l10n/id.php8
-rw-r--r--apps/files_versions/lib/hooks.php6
-rw-r--r--apps/files_versions/lib/versions.php121
-rw-r--r--apps/files_versions/templates/history.php3
-rw-r--r--apps/files_versions/templates/settings.php5
-rw-r--r--apps/user_ldap/appinfo/info.xml2
-rw-r--r--apps/user_ldap/l10n/de.php10
-rw-r--r--apps/user_ldap/l10n/de_DE.php4
-rw-r--r--apps/user_ldap/l10n/he.php1
-rw-r--r--apps/user_ldap/l10n/id.php55
-rw-r--r--apps/user_ldap/l10n/my_MM.php4
-rw-r--r--apps/user_ldap/l10n/pt_BR.php1
-rw-r--r--apps/user_ldap/lib/helper.php1
-rwxr-xr-xapps/user_webdavauth/appinfo/info.xml2
-rwxr-xr-xapps/user_webdavauth/settings.php2
-rw-r--r--core/ajax/share.php62
-rw-r--r--core/css/styles.css11
-rw-r--r--core/img/actions/caret-dark.pngbin0 -> 256 bytes
-rw-r--r--core/img/actions/caret-dark.svg102
-rw-r--r--core/js/config.php30
-rw-r--r--core/l10n/de.php18
-rw-r--r--core/l10n/de_DE.php6
-rw-r--r--core/l10n/eu.php14
-rw-r--r--core/l10n/he.php7
-rw-r--r--core/l10n/my_MM.php64
-rw-r--r--core/templates/exception.php4
-rw-r--r--core/templates/installation.php44
-rw-r--r--core/templates/layout.base.php3
-rw-r--r--core/templates/layout.guest.php6
-rw-r--r--core/templates/layout.user.php22
-rw-r--r--core/templates/update.php3
-rw-r--r--l10n/af_ZA/files_trashbin.po30
-rw-r--r--l10n/ar/core.po6
-rw-r--r--l10n/ar/files.po42
-rw-r--r--l10n/ar/files_external.po14
-rw-r--r--l10n/ar/files_trashbin.po30
-rw-r--r--l10n/ar/settings.po14
-rw-r--r--l10n/be/files_trashbin.po32
-rw-r--r--l10n/bg_BG/core.po42
-rw-r--r--l10n/bg_BG/files.po42
-rw-r--r--l10n/bg_BG/files_external.po10
-rw-r--r--l10n/bg_BG/files_trashbin.po32
-rw-r--r--l10n/bg_BG/settings.po6
-rw-r--r--l10n/bn_BD/core.po6
-rw-r--r--l10n/bn_BD/files.po42
-rw-r--r--l10n/bn_BD/files_external.po10
-rw-r--r--l10n/bn_BD/files_trashbin.po30
-rw-r--r--l10n/bn_BD/settings.po14
-rw-r--r--l10n/ca/core.po6
-rw-r--r--l10n/ca/files.po42
-rw-r--r--l10n/ca/files_external.po14
-rw-r--r--l10n/ca/files_trashbin.po32
-rw-r--r--l10n/ca/settings.po4
-rw-r--r--l10n/cs_CZ/core.po6
-rw-r--r--l10n/cs_CZ/files.po42
-rw-r--r--l10n/cs_CZ/files_external.po14
-rw-r--r--l10n/cs_CZ/files_trashbin.po32
-rw-r--r--l10n/cs_CZ/settings.po14
-rw-r--r--l10n/da/core.po6
-rw-r--r--l10n/da/files.po42
-rw-r--r--l10n/da/files_external.po10
-rw-r--r--l10n/da/files_trashbin.po32
-rw-r--r--l10n/da/settings.po14
-rw-r--r--l10n/de/core.po25
-rw-r--r--l10n/de/files.po44
-rw-r--r--l10n/de/files_external.po12
-rw-r--r--l10n/de/files_trashbin.po37
-rw-r--r--l10n/de/lib.po13
-rw-r--r--l10n/de/settings.po16
-rw-r--r--l10n/de/user_ldap.po17
-rw-r--r--l10n/de/user_webdavauth.po6
-rw-r--r--l10n/de_DE/core.po13
-rw-r--r--l10n/de_DE/files.po61
-rw-r--r--l10n/de_DE/files_external.po12
-rw-r--r--l10n/de_DE/files_trashbin.po38
-rw-r--r--l10n/de_DE/files_versions.po6
-rw-r--r--l10n/de_DE/lib.po11
-rw-r--r--l10n/de_DE/settings.po14
-rw-r--r--l10n/de_DE/user_ldap.po11
-rw-r--r--l10n/de_DE/user_webdavauth.po6
-rw-r--r--l10n/el/core.po6
-rw-r--r--l10n/el/files.po42
-rw-r--r--l10n/el/files_external.po12
-rw-r--r--l10n/el/files_trashbin.po32
-rw-r--r--l10n/el/settings.po4
-rw-r--r--l10n/eo/core.po6
-rw-r--r--l10n/eo/files.po42
-rw-r--r--l10n/eo/files_external.po14
-rw-r--r--l10n/eo/files_trashbin.po30
-rw-r--r--l10n/eo/settings.po14
-rw-r--r--l10n/es/core.po6
-rw-r--r--l10n/es/files.po42
-rw-r--r--l10n/es/files_external.po14
-rw-r--r--l10n/es/files_trashbin.po32
-rw-r--r--l10n/es/settings.po118
-rw-r--r--l10n/es_AR/core.po6
-rw-r--r--l10n/es_AR/files.po42
-rw-r--r--l10n/es_AR/files_external.po14
-rw-r--r--l10n/es_AR/files_trashbin.po32
-rw-r--r--l10n/es_AR/settings.po4
-rw-r--r--l10n/et_EE/core.po6
-rw-r--r--l10n/et_EE/files.po42
-rw-r--r--l10n/et_EE/files_external.po14
-rw-r--r--l10n/et_EE/files_trashbin.po32
-rw-r--r--l10n/et_EE/settings.po14
-rw-r--r--l10n/eu/core.po96
-rw-r--r--l10n/eu/files.po54
-rw-r--r--l10n/eu/files_external.po10
-rw-r--r--l10n/eu/files_trashbin.po32
-rw-r--r--l10n/eu/settings.po90
-rw-r--r--l10n/fa/core.po6
-rw-r--r--l10n/fa/files.po42
-rw-r--r--l10n/fa/files_external.po16
-rw-r--r--l10n/fa/files_trashbin.po30
-rw-r--r--l10n/fa/files_versions.po21
-rw-r--r--l10n/fa/settings.po14
-rw-r--r--l10n/fi_FI/core.po6
-rw-r--r--l10n/fi_FI/files.po42
-rw-r--r--l10n/fi_FI/files_external.po10
-rw-r--r--l10n/fi_FI/files_trashbin.po32
-rw-r--r--l10n/fi_FI/settings.po6
-rw-r--r--l10n/fr/core.po6
-rw-r--r--l10n/fr/files.po42
-rw-r--r--l10n/fr/files_external.po10
-rw-r--r--l10n/fr/files_trashbin.po32
-rw-r--r--l10n/fr/settings.po4
-rw-r--r--l10n/gl/core.po6
-rw-r--r--l10n/gl/files.po42
-rw-r--r--l10n/gl/files_external.po10
-rw-r--r--l10n/gl/files_trashbin.po32
-rw-r--r--l10n/gl/settings.po4
-rw-r--r--l10n/he/core.po98
-rw-r--r--l10n/he/files.po56
-rw-r--r--l10n/he/files_external.po14
-rw-r--r--l10n/he/files_trashbin.po47
-rw-r--r--l10n/he/settings.po90
-rw-r--r--l10n/he/user_ldap.po116
-rw-r--r--l10n/hi/files_trashbin.po30
-rw-r--r--l10n/hr/core.po60
-rw-r--r--l10n/hr/files.po42
-rw-r--r--l10n/hr/files_external.po14
-rw-r--r--l10n/hr/files_trashbin.po30
-rw-r--r--l10n/hr/settings.po14
-rw-r--r--l10n/hu_HU/core.po6
-rw-r--r--l10n/hu_HU/files.po42
-rw-r--r--l10n/hu_HU/files_external.po10
-rw-r--r--l10n/hu_HU/files_trashbin.po32
-rw-r--r--l10n/hu_HU/settings.po14
-rw-r--r--l10n/hy/files.po250
-rw-r--r--l10n/hy/files_external.po54
-rw-r--r--l10n/hy/files_trashbin.po76
-rw-r--r--l10n/hy/settings.po369
-rw-r--r--l10n/ia/core.po60
-rw-r--r--l10n/ia/files.po42
-rw-r--r--l10n/ia/files_external.po14
-rw-r--r--l10n/ia/files_trashbin.po30
-rw-r--r--l10n/ia/settings.po14
-rw-r--r--l10n/id/core.po6
-rw-r--r--l10n/id/files.po50
-rw-r--r--l10n/id/files_encryption.po17
-rw-r--r--l10n/id/files_external.po65
-rw-r--r--l10n/id/files_trashbin.po53
-rw-r--r--l10n/id/files_versions.po23
-rw-r--r--l10n/id/lib.po60
-rw-r--r--l10n/id/settings.po16
-rw-r--r--l10n/id/user_ldap.po227
-rw-r--r--l10n/is/core.po6
-rw-r--r--l10n/is/files.po42
-rw-r--r--l10n/is/files_external.po10
-rw-r--r--l10n/is/files_trashbin.po30
-rw-r--r--l10n/is/settings.po14
-rw-r--r--l10n/it/core.po6
-rw-r--r--l10n/it/files.po42
-rw-r--r--l10n/it/files_external.po14
-rw-r--r--l10n/it/files_trashbin.po32
-rw-r--r--l10n/it/settings.po14
-rw-r--r--l10n/ja_JP/core.po6
-rw-r--r--l10n/ja_JP/files.po42
-rw-r--r--l10n/ja_JP/files_external.po14
-rw-r--r--l10n/ja_JP/files_trashbin.po32
-rw-r--r--l10n/ja_JP/settings.po14
-rw-r--r--l10n/ka_GE/core.po6
-rw-r--r--l10n/ka_GE/files.po42
-rw-r--r--l10n/ka_GE/files_external.po14
-rw-r--r--l10n/ka_GE/files_trashbin.po30
-rw-r--r--l10n/ka_GE/settings.po14
-rw-r--r--l10n/ko/core.po6
-rw-r--r--l10n/ko/files.po42
-rw-r--r--l10n/ko/files_external.po16
-rw-r--r--l10n/ko/files_trashbin.po30
-rw-r--r--l10n/ko/settings.po14
-rw-r--r--l10n/ku_IQ/files_trashbin.po30
-rw-r--r--l10n/lb/core.po6
-rw-r--r--l10n/lb/files.po42
-rw-r--r--l10n/lb/files_external.po14
-rw-r--r--l10n/lb/files_trashbin.po30
-rw-r--r--l10n/lb/settings.po14
-rw-r--r--l10n/lt_LT/core.po6
-rw-r--r--l10n/lt_LT/files.po42
-rw-r--r--l10n/lt_LT/files_external.po14
-rw-r--r--l10n/lt_LT/files_trashbin.po30
-rw-r--r--l10n/lt_LT/settings.po14
-rw-r--r--l10n/lv/core.po6
-rw-r--r--l10n/lv/files.po42
-rw-r--r--l10n/lv/files_external.po10
-rw-r--r--l10n/lv/files_trashbin.po32
-rw-r--r--l10n/lv/settings.po14
-rw-r--r--l10n/mk/core.po6
-rw-r--r--l10n/mk/files.po42
-rw-r--r--l10n/mk/files_external.po10
-rw-r--r--l10n/mk/files_trashbin.po30
-rw-r--r--l10n/mk/settings.po14
-rw-r--r--l10n/ms_MY/core.po6
-rw-r--r--l10n/ms_MY/files.po42
-rw-r--r--l10n/ms_MY/files_external.po14
-rw-r--r--l10n/ms_MY/files_trashbin.po30
-rw-r--r--l10n/ms_MY/settings.po14
-rw-r--r--l10n/my_MM/core.po594
-rw-r--r--l10n/my_MM/files.po315
-rw-r--r--l10n/my_MM/files_encryption.po38
-rw-r--r--l10n/my_MM/files_external.po120
-rw-r--r--l10n/my_MM/files_sharing.po48
-rw-r--r--l10n/my_MM/files_trashbin.po76
-rw-r--r--l10n/my_MM/files_versions.po65
-rw-r--r--l10n/my_MM/lib.po254
-rw-r--r--l10n/my_MM/settings.po496
-rw-r--r--l10n/my_MM/user_ldap.po309
-rw-r--r--l10n/my_MM/user_webdavauth.po33
-rw-r--r--l10n/nb_NO/core.po6
-rw-r--r--l10n/nb_NO/files.po42
-rw-r--r--l10n/nb_NO/files_external.po14
-rw-r--r--l10n/nb_NO/files_trashbin.po30
-rw-r--r--l10n/nb_NO/settings.po14
-rw-r--r--l10n/nl/core.po6
-rw-r--r--l10n/nl/files.po42
-rw-r--r--l10n/nl/files_external.po10
-rw-r--r--l10n/nl/files_trashbin.po32
-rw-r--r--l10n/nl/settings.po6
-rw-r--r--l10n/nn_NO/files.po42
-rw-r--r--l10n/nn_NO/files_external.po14
-rw-r--r--l10n/nn_NO/files_trashbin.po30
-rw-r--r--l10n/nn_NO/settings.po14
-rw-r--r--l10n/oc/core.po6
-rw-r--r--l10n/oc/files.po42
-rw-r--r--l10n/oc/files_external.po14
-rw-r--r--l10n/oc/files_trashbin.po30
-rw-r--r--l10n/oc/settings.po14
-rw-r--r--l10n/pl/core.po6
-rw-r--r--l10n/pl/files.po42
-rw-r--r--l10n/pl/files_external.po14
-rw-r--r--l10n/pl/files_trashbin.po30
-rw-r--r--l10n/pl/settings.po14
-rw-r--r--l10n/pl_PL/files_trashbin.po30
-rw-r--r--l10n/pt_BR/core.po6
-rw-r--r--l10n/pt_BR/files.po47
-rw-r--r--l10n/pt_BR/files_external.po10
-rw-r--r--l10n/pt_BR/files_trashbin.po32
-rw-r--r--l10n/pt_BR/settings.po6
-rw-r--r--l10n/pt_BR/user_ldap.po6
-rw-r--r--l10n/pt_PT/core.po6
-rw-r--r--l10n/pt_PT/files.po42
-rw-r--r--l10n/pt_PT/files_external.po14
-rw-r--r--l10n/pt_PT/files_trashbin.po32
-rw-r--r--l10n/pt_PT/settings.po4
-rw-r--r--l10n/ro/core.po6
-rw-r--r--l10n/ro/files.po42
-rw-r--r--l10n/ro/files_external.po10
-rw-r--r--l10n/ro/files_trashbin.po30
-rw-r--r--l10n/ro/settings.po14
-rw-r--r--l10n/ru/core.po6
-rw-r--r--l10n/ru/files.po42
-rw-r--r--l10n/ru/files_external.po14
-rw-r--r--l10n/ru/files_trashbin.po32
-rw-r--r--l10n/ru/settings.po4
-rw-r--r--l10n/ru_RU/core.po6
-rw-r--r--l10n/ru_RU/files.po42
-rw-r--r--l10n/ru_RU/files_external.po10
-rw-r--r--l10n/ru_RU/files_trashbin.po32
-rw-r--r--l10n/ru_RU/settings.po14
-rw-r--r--l10n/si_LK/core.po6
-rw-r--r--l10n/si_LK/files.po42
-rw-r--r--l10n/si_LK/files_external.po14
-rw-r--r--l10n/si_LK/files_trashbin.po30
-rw-r--r--l10n/si_LK/settings.po14
-rw-r--r--l10n/sk/files_trashbin.po32
-rw-r--r--l10n/sk_SK/core.po6
-rw-r--r--l10n/sk_SK/files.po42
-rw-r--r--l10n/sk_SK/files_external.po10
-rw-r--r--l10n/sk_SK/files_trashbin.po32
-rw-r--r--l10n/sk_SK/settings.po6
-rw-r--r--l10n/sl/core.po6
-rw-r--r--l10n/sl/files.po42
-rw-r--r--l10n/sl/files_external.po14
-rw-r--r--l10n/sl/files_trashbin.po30
-rw-r--r--l10n/sl/settings.po14
-rw-r--r--l10n/sr/core.po6
-rw-r--r--l10n/sr/files.po42
-rw-r--r--l10n/sr/files_external.po14
-rw-r--r--l10n/sr/files_trashbin.po30
-rw-r--r--l10n/sr/settings.po14
-rw-r--r--l10n/sr@latin/files.po42
-rw-r--r--l10n/sr@latin/files_external.po14
-rw-r--r--l10n/sr@latin/files_trashbin.po30
-rw-r--r--l10n/sr@latin/settings.po14
-rw-r--r--l10n/sv/core.po6
-rw-r--r--l10n/sv/files.po42
-rw-r--r--l10n/sv/files_external.po10
-rw-r--r--l10n/sv/files_trashbin.po32
-rw-r--r--l10n/sv/settings.po14
-rw-r--r--l10n/sw_KE/files_trashbin.po30
-rw-r--r--l10n/ta_LK/core.po6
-rw-r--r--l10n/ta_LK/files.po42
-rw-r--r--l10n/ta_LK/files_external.po14
-rw-r--r--l10n/ta_LK/files_trashbin.po30
-rw-r--r--l10n/ta_LK/settings.po14
-rw-r--r--l10n/templates/core.pot80
-rw-r--r--l10n/templates/files.pot52
-rw-r--r--l10n/templates/files_encryption.pot2
-rw-r--r--l10n/templates/files_external.pot2
-rw-r--r--l10n/templates/files_sharing.pot12
-rw-r--r--l10n/templates/files_trashbin.pot28
-rw-r--r--l10n/templates/files_versions.pot4
-rw-r--r--l10n/templates/lib.pot4
-rw-r--r--l10n/templates/settings.pot76
-rw-r--r--l10n/templates/user_ldap.pot2
-rw-r--r--l10n/templates/user_webdavauth.pot2
-rw-r--r--l10n/th_TH/core.po6
-rw-r--r--l10n/th_TH/files.po42
-rw-r--r--l10n/th_TH/files_external.po10
-rw-r--r--l10n/th_TH/files_trashbin.po30
-rw-r--r--l10n/th_TH/settings.po14
-rw-r--r--l10n/tr/core.po6
-rw-r--r--l10n/tr/files.po42
-rw-r--r--l10n/tr/files_external.po4
-rw-r--r--l10n/tr/files_trashbin.po32
-rw-r--r--l10n/tr/settings.po4
-rw-r--r--l10n/uk/core.po6
-rw-r--r--l10n/uk/files.po42
-rw-r--r--l10n/uk/files_external.po14
-rw-r--r--l10n/uk/files_trashbin.po32
-rw-r--r--l10n/uk/settings.po4
-rw-r--r--l10n/vi/core.po6
-rw-r--r--l10n/vi/files.po42
-rw-r--r--l10n/vi/files_external.po10
-rw-r--r--l10n/vi/files_trashbin.po32
-rw-r--r--l10n/vi/settings.po14
-rw-r--r--l10n/zh_CN.GB2312/core.po6
-rw-r--r--l10n/zh_CN.GB2312/files.po42
-rw-r--r--l10n/zh_CN.GB2312/files_external.po14
-rw-r--r--l10n/zh_CN.GB2312/files_trashbin.po30
-rw-r--r--l10n/zh_CN.GB2312/settings.po14
-rw-r--r--l10n/zh_CN/core.po6
-rw-r--r--l10n/zh_CN/files.po42
-rw-r--r--l10n/zh_CN/files_external.po10
-rw-r--r--l10n/zh_CN/files_trashbin.po30
-rw-r--r--l10n/zh_CN/settings.po14
-rw-r--r--l10n/zh_HK/files_trashbin.po30
-rw-r--r--l10n/zh_TW/core.po6
-rw-r--r--l10n/zh_TW/files.po42
-rw-r--r--l10n/zh_TW/files_external.po14
-rw-r--r--l10n/zh_TW/files_trashbin.po30
-rw-r--r--l10n/zh_TW/settings.po4
-rw-r--r--lib/connector/sabre/directory.php12
-rw-r--r--lib/connector/sabre/file.php8
-rw-r--r--lib/connector/sabre/quotaplugin.php3
-rw-r--r--lib/files/cache/legacy.php6
-rw-r--r--lib/files/filesystem.php27
-rw-r--r--lib/files/storage/common.php8
-rw-r--r--lib/files/view.php9
-rw-r--r--lib/group.php65
-rw-r--r--lib/group/backend.php34
-rw-r--r--lib/group/database.php34
-rw-r--r--lib/helper.php11
-rw-r--r--lib/hook.php16
-rw-r--r--lib/image.php15
-rw-r--r--lib/l10n/de.php6
-rw-r--r--lib/l10n/de_DE.php4
-rw-r--r--lib/l10n/my_MM.php31
-rw-r--r--lib/public/files.php3
-rw-r--r--lib/public/share.php6
-rw-r--r--lib/public/user.php34
-rwxr-xr-xlib/request.php2
-rw-r--r--lib/search.php4
-rw-r--r--lib/setup.php13
-rw-r--r--lib/user.php2
-rw-r--r--lib/user/backend.php4
-rw-r--r--lib/user/database.php12
-rwxr-xr-xlib/util.php12
-rw-r--r--settings/ajax/changedisplayname.php66
-rw-r--r--settings/ajax/setquota.php4
-rw-r--r--settings/ajax/togglegroups.php4
-rw-r--r--settings/ajax/userlist.php6
-rw-r--r--settings/js/users.js8
-rw-r--r--settings/l10n/de.php10
-rw-r--r--settings/l10n/de_DE.php8
-rw-r--r--settings/l10n/es.php14
-rw-r--r--settings/l10n/eu.php12
-rw-r--r--settings/l10n/he.php1
-rw-r--r--settings/l10n/hy.php4
-rw-r--r--settings/l10n/id.php1
-rw-r--r--settings/l10n/my_MM.php6
-rw-r--r--settings/oauth.php21
-rw-r--r--settings/routes.php4
-rw-r--r--settings/templates/apps.php23
-rw-r--r--settings/templates/help.php18
-rw-r--r--settings/templates/personal.php15
-rw-r--r--settings/users.php6
506 files changed, 8337 insertions, 4504 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 9031c729eff..5b697777e47 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -26,8 +26,7 @@ foreach ($_FILES['files']['error'] as $error) {
UPLOAD_ERR_OK => $l->t('There is no error, the file uploaded with success'),
UPLOAD_ERR_INI_SIZE => $l->t('The uploaded file exceeds the upload_max_filesize directive in php.ini: ')
. ini_get('upload_max_filesize'),
- UPLOAD_ERR_FORM_SIZE => $l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified'
- . ' in the HTML form'),
+ UPLOAD_ERR_FORM_SIZE => $l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
UPLOAD_ERR_PARTIAL => $l->t('The uploaded file was only partially uploaded'),
UPLOAD_ERR_NO_FILE => $l->t('No file was uploaded'),
UPLOAD_ERR_NO_TMP_DIR => $l->t('Missing a temporary folder'),
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index 7c82c839dab..34800378537 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -5,7 +5,7 @@
<description>File Management</description>
<licence>AGPL</licence>
<author>Robin Appelman</author>
- <require>4.91</require>
+ <require>4.93</require>
<shipped>true</shipped>
<standalone/>
<default_enable/>
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 0bf1f79ab77..ea721059c3f 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -35,7 +35,7 @@ var FileList={
if(extension){
name_span.append($('<span></span>').addClass('extension').text(extension));
}
- //dirs can show the number of uploaded files
+ //dirs can show the number of uploaded files
if (type == 'dir') {
link_elem.append($('<span></span>').attr({
'class': 'uploadtext',
@@ -44,7 +44,7 @@ var FileList={
}
td.append(link_elem);
tr.append(td);
-
+
//size column
if(size!=t('files', 'Pending')){
simpleSize=simpleFileSize(size);
@@ -59,7 +59,7 @@ var FileList={
"style": 'color:rgb('+sizeColor+','+sizeColor+','+sizeColor+')'
}).text(simpleSize);
tr.append(td);
-
+
// date column
var modifiedColor = Math.round((Math.round((new Date()).getTime() / 1000)-lastModifiedTime)/60/60/24*5);
td = $('<td></td>').attr({ "class": "date" });
@@ -87,7 +87,7 @@ var FileList={
lastModified,
$('#permissions').val()
);
-
+
FileList.insertElement(name, 'file', tr.attr('data-file',name));
var row = $('tr').filterAttr('data-file',name);
if(loading){
@@ -101,7 +101,7 @@ var FileList={
FileActions.display(row.find('td.filename'));
},
addDir:function(name,size,lastModified,hidden){
-
+
var tr = this.createRow(
'dir',
name,
@@ -111,7 +111,7 @@ var FileList={
lastModified,
$('#permissions').val()
);
-
+
FileList.insertElement(name,'dir',tr);
var row = $('tr').filterAttr('data-file',name);
row.find('td.filename').draggable(dragOptions);
@@ -344,7 +344,7 @@ var FileList={
var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash");
deleteAction[0].outerHTML = oldHTML;
});
- }
+ }
});
}
};
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 8327460cca6..6801fb59910 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -114,7 +114,7 @@ $(document).ready(function() {
$(this).parent().children('#file_upload_start').trigger('click');
return false;
});
-
+
// Show trash bin
$('#trash a').live('click', function() {
window.location=OC.filePath('files_trashbin', '', 'index.php');
@@ -817,26 +817,26 @@ var createDragShadow = function(event){
//select dragged file
$(event.target).parents('tr').find('td input:first').prop('checked',true);
}
-
+
var selectedFiles = getSelectedFiles();
-
+
if (!isDragSelected && selectedFiles.length == 1) {
//revert the selection
$(event.target).parents('tr').find('td input:first').prop('checked',false);
}
-
+
//also update class when we dragged more than one file
if (selectedFiles.length > 1) {
$(event.target).parents('tr').addClass('selected');
}
-
+
// build dragshadow
var dragshadow = $('<table class="dragshadow"></table>');
var tbody = $('<tbody></tbody>');
dragshadow.append(tbody);
-
+
var dir=$('#dir').val();
-
+
$(selectedFiles).each(function(i,elem){
var newtr = $('<tr data-dir="'+dir+'" data-filename="'+elem.name+'">'
+'<td class="filename">'+elem.name+'</td><td class="size">'+humanFileSize(elem.size)+'</td>'
@@ -850,7 +850,7 @@ var createDragShadow = function(event){
});
}
});
-
+
return dragshadow;
}
@@ -870,9 +870,9 @@ var folderDropOptions={
if ($(event.target).parents('tr').find('td input:first').prop('checked') === true) {
return false;
}
-
+
var target=$.trim($(this).find('.nametext').text());
-
+
var files = ui.helper.find('tr');
$(files).each(function(i,row){
var dir = $(row).data('dir');
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 8d119afada4..1462efdd5d6 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -24,7 +24,7 @@
"replaced {new_name}" => "{new_name} wurde ersetzt",
"undo" => "rückgängig machen",
"replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
-"perform delete operation" => "Führe das Löschen aus",
+"perform delete operation" => "führe das Löschen aus",
"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
"File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
@@ -69,5 +69,5 @@
"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" => "Scanne",
-"Upgrading filesystem cache..." => "Aktualisiere den Dateisystem-Cache"
+"Upgrading filesystem cache..." => "Aktualisiere den Dateisystem-Cache..."
);
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 442eafe1c04..ca2cb14027c 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -8,6 +8,7 @@
"Missing a temporary folder" => "תיקייה זמנית חסרה",
"Failed to write to disk" => "הכתיבה לכונן נכשלה",
"Files" => "קבצים",
+"Delete permanently" => "מחק לצמיתות",
"Delete" => "מחיקה",
"Rename" => "שינוי שם",
"Pending" => "ממתין",
diff --git a/apps/files/l10n/hy.php b/apps/files/l10n/hy.php
new file mode 100644
index 00000000000..29c0cd8b8d0
--- /dev/null
+++ b/apps/files/l10n/hy.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Delete" => "Ջնջել",
+"Close" => "Փակել",
+"Save" => "Պահպանել",
+"Download" => "Բեռնել"
+);
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 4c4e2e0f714..aff1933e569 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -19,6 +19,10 @@
"Name" => "Nama",
"Size" => "Ukuran",
"Modified" => "Dimodifikasi",
+"1 folder" => "1 map",
+"{count} folders" => "{count} map",
+"1 file" => "1 berkas",
+"{count} files" => "{count} berkas",
"Upload" => "Unggah",
"File handling" => "Penanganan berkas",
"Maximum upload size" => "Ukuran unggah maksimum",
diff --git a/apps/files/l10n/my_MM.php b/apps/files/l10n/my_MM.php
new file mode 100644
index 00000000000..1835b434905
--- /dev/null
+++ b/apps/files/l10n/my_MM.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Files" => "ဖိုင်များ"
+);
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 3a9dafcabf9..eb66e154725 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -60,6 +60,7 @@
"Text file" => "Arquivo texto",
"Folder" => "Pasta",
"From link" => "Do link",
+"Deleted files" => "Arquivos apagados",
"Cancel upload" => "Cancelar upload",
"Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
"Download" => "Baixar",
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index 3f9a6c7d07f..6044348e72e 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,4 +1,7 @@
<?php $TRANSLATIONS = array(
-"Encryption" => "enkripsi",
-"None" => "tidak ada"
+"Encryption" => "Enkripsi",
+"File encryption is enabled." => "Enkripsi berkas aktif.",
+"The following file types will not be encrypted:" => "Tipe berkas berikut tidak akan dienkripsi:",
+"Exclude the following file types from encryption:" => "Kecualikan tipe berkas berikut dari enkripsi:",
+"None" => "Tidak ada"
);
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index 2c04216a9fb..0542b7b10a7 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -5,7 +5,7 @@
<description>Mount external storage sources</description>
<licence>AGPL</licence>
<author>Robin Appelman, Michael Gapczynski</author>
- <require>4.91</require>
+ <require>4.93</require>
<shipped>true</shipped>
<types>
<filesystem/>
diff --git a/apps/files_external/l10n/hy.php b/apps/files_external/l10n/hy.php
new file mode 100644
index 00000000000..3b80487278a
--- /dev/null
+++ b/apps/files_external/l10n/hy.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Delete" => "Ջնջել"
+);
diff --git a/apps/files_external/l10n/id.php b/apps/files_external/l10n/id.php
index 4b7850025f4..ab2d2d365f3 100644
--- a/apps/files_external/l10n/id.php
+++ b/apps/files_external/l10n/id.php
@@ -1,14 +1,26 @@
<?php $TRANSLATIONS = array(
-"Access granted" => "akses diberikan",
-"Grant access" => "berikan hak akses",
-"Fill out all required fields" => "isi semua field yang dibutuhkan",
-"External Storage" => "penyimpanan eksternal",
-"Configuration" => "konfigurasi",
-"Options" => "pilihan",
-"Applicable" => "berlaku",
-"None set" => "tidak satupun di set",
-"All Users" => "semua pengguna",
-"Groups" => "grup",
-"Users" => "pengguna",
-"Delete" => "hapus"
+"Access granted" => "Akses diberikan",
+"Error configuring Dropbox storage" => "Kesalahan dalam mengkonfigurasi penyimpanan Dropbox",
+"Grant access" => "Berikan hak akses",
+"Fill out all required fields" => "Isi semua field yang dibutuhkan",
+"Please provide a valid Dropbox app key and secret." => "Masukkan kunci dan sandi aplikasi Dropbox yang benar.",
+"Error configuring Google Drive storage" => "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Peringatan:</b> \"smbclient\" tidak terpasang. Mount direktori CIFS/SMB tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Peringatan:</b> Dukungan FTP di PHP tidak aktif atau tidak terpasang. Mount direktori FTP tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya.",
+"External Storage" => "Penyimpanan Eksternal",
+"Mount point" => "Lokasi mount",
+"Backend" => "Backend",
+"Configuration" => "Konfigurasi",
+"Options" => "Pilihan",
+"Applicable" => "Berlaku",
+"Add mount point" => "Tambah lokasi mount",
+"None set" => "Tidak satupun di set",
+"All Users" => "Semua Pengguna",
+"Groups" => "Grup",
+"Users" => "Pengguna",
+"Delete" => "Hapus",
+"Enable User External Storage" => "Aktifkan Penyimpanan Eksternal Pengguna",
+"Allow users to mount their own external storage" => "Ijinkan pengguna untuk me-mount penyimpanan eksternal mereka",
+"SSL root certificates" => "Sertifikat root SSL",
+"Import Root Certificate" => "Impor Sertifikat Root"
);
diff --git a/apps/files_external/l10n/my_MM.php b/apps/files_external/l10n/my_MM.php
new file mode 100644
index 00000000000..5acfbb0321e
--- /dev/null
+++ b/apps/files_external/l10n/my_MM.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Users" => "သုံးစွဲသူ"
+);
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index d31c2f35a68..905c5d50cde 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -38,7 +38,7 @@ class OC_Mount_Config {
* @return array
*/
public static function getBackends() {
-
+
$backends['\OC\Files\Storage\Local']=array(
'backend' => 'Local',
'configuration' => array(
@@ -77,7 +77,7 @@ class OC_Mount_Config {
'token' => '#token',
'token_secret' => '#token secret'),
'custom' => 'google');
-
+
$backends['\OC\Files\Storage\SWIFT']=array(
'backend' => 'OpenStack Swift',
'configuration' => array(
@@ -86,7 +86,7 @@ class OC_Mount_Config {
'token' => '*Token',
'root' => '&Root',
'secure' => '!Secure ftps://'));
-
+
if(OC_Mount_Config::checksmbclient()) $backends['\OC\Files\Storage\SMB']=array(
'backend' => 'SMB / CIFS',
'configuration' => array(
@@ -95,7 +95,7 @@ class OC_Mount_Config {
'password' => '*Password',
'share' => 'Share',
'root' => '&Root'));
-
+
$backends['\OC\Files\Storage\DAV']=array(
'backend' => 'ownCloud / WebDAV',
'configuration' => array(
@@ -104,13 +104,13 @@ class OC_Mount_Config {
'password' => '*Password',
'root' => '&Root',
'secure' => '!Secure https://'));
-
+
$backends['\OC\Files\Storage\SFTP']=array(
'backend' => 'SFTP',
'configuration' => array(
'host' => 'URL',
- 'user' => 'Username',
- 'password' => '*Password',
+ 'user' => 'Username',
+ 'password' => '*Password',
'root' => '&Root'));
return($backends);
@@ -378,7 +378,7 @@ class OC_Mount_Config {
}
/**
- * check if php-ftp is installed
+ * check if php-ftp is installed
*/
public static function checkphpftp() {
if(function_exists('ftp_login')) {
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index 785eb7dfc42..ede6c251fd9 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -32,7 +32,7 @@ class SFTP extends \OC\Files\Storage\Common {
$this->root = isset($params['root']) ? $this->cleanPath($params['root']) : '/';
if ($this->root[0] != '/') $this->root = '/' . $this->root;
if (substr($this->root, -1, 1) != '/') $this->root .= '/';
-
+
$host_keys = $this->read_host_keys();
$this->client = new \Net_SFTP($this->host);
@@ -50,18 +50,18 @@ class SFTP extends \OC\Files\Storage\Common {
$host_keys[$this->host] = $current_host_key;
$this->write_host_keys($host_keys);
}
-
+
if(!$this->file_exists('')){
$this->mkdir('');
}
}
-
+
public function test() {
if (!isset($params['host']) || !isset($params['user']) || !isset($params['password'])) {
throw new \Exception("Required parameters not set");
- }
+ }
}
-
+
public function getId(){
return 'sftp::' . $this->user . '@' . $this->host . '/' . $this->root;
}
@@ -109,7 +109,7 @@ class SFTP extends \OC\Files\Storage\Common {
$host_key_arr = explode("::", $line, 2);
if (count($host_key_arr) == 2) {
$hosts[] = $host_key_arr[0];
- $keys[] = $host_key_arr[1];
+ $keys[] = $host_key_arr[1];
}
}
return array_combine($hosts, $keys);
@@ -203,7 +203,7 @@ class SFTP extends \OC\Files\Storage\Common {
$tmp = \OC_Helper::tmpFile($ext);
$this->getFile($abs_path, $tmp);
return fopen($tmp, $mode);
-
+
case 'w':
case 'wb':
case 'a':
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 1f24a4dde83..9a199281a76 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -5,7 +5,7 @@
<description>File sharing between users</description>
<licence>AGPL</licence>
<author>Michael Gapczynski</author>
- <require>4.91</require>
+ <require>4.93</require>
<shipped>true</shipped>
<default_enable/>
<types>
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index 1d22b32b503..48e41e93048 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -52,7 +52,10 @@ if (version_compare($installedVersion, '0.3', '<')) {
}
catch (Exception $e) {
$update_error = true;
- OCP\Util::writeLog('files_sharing', 'Upgrade Routine: Skipping sharing "'.$row['source'].'" to "'.$shareWith.'" (error is "'.$e->getMessage().'")', OCP\Util::WARN);
+ OCP\Util::writeLog('files_sharing',
+ 'Upgrade Routine: Skipping sharing "'.$row['source'].'" to "'.$shareWith
+ .'" (error is "'.$e->getMessage().'")',
+ OCP\Util::WARN);
}
OC_Util::tearDownFS();
}
diff --git a/apps/files_sharing/l10n/my_MM.php b/apps/files_sharing/l10n/my_MM.php
new file mode 100644
index 00000000000..aa574b58b02
--- /dev/null
+++ b/apps/files_sharing/l10n/my_MM.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "စကားဝှက်",
+"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
+);
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 9655e447875..fb0f6c7b5a6 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -71,8 +71,9 @@ class Shared_Cache extends Cache {
}
} else {
$query = \OC_DB::prepare(
- 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`
- FROM `*PREFIX*filecache` WHERE `fileid` = ?');
+ 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`,'
+ .' `size`, `mtime`, `encrypted`'
+ .' FROM `*PREFIX*filecache` WHERE `fileid` = ?');
$result = $query->execute(array($file));
$data = $result->fetchRow();
$data['fileid'] = (int)$data['fileid'];
diff --git a/apps/files_sharing/lib/permissions.php b/apps/files_sharing/lib/permissions.php
index 2b068ff9350..72c1ec96c46 100644
--- a/apps/files_sharing/lib/permissions.php
+++ b/apps/files_sharing/lib/permissions.php
@@ -33,7 +33,8 @@ class Shared_Permissions extends Permissions {
if ($fileId == -1) {
return \OCP\PERMISSION_READ;
}
- $source = \OCP\Share::getItemSharedWithBySource('file', $fileId, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE, null, true);
+ $source = \OCP\Share::getItemSharedWithBySource('file', $fileId, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE,
+ null, true);
if ($source) {
return $source['permissions'];
} else {
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 6d3c55a008f..0aeb763d89a 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -72,7 +72,11 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
public function formatItems($items, $format, $parameters = null) {
if ($format == self::FORMAT_SHARED_STORAGE) {
// Only 1 item should come through for this format call
- return array('path' => $items[key($items)]['path'], 'permissions' => $items[key($items)]['permissions'], 'uid_owner' => $items[key($items)]['uid_owner']);
+ return array(
+ 'path' => $items[key($items)]['path'],
+ 'permissions' => $items[key($items)]['permissions'],
+ 'uid_owner' => $items[key($items)]['uid_owner']
+ );
} else if ($format == self::FORMAT_GET_FOLDER_CONTENTS) {
$files = array();
foreach ($items as $item) {
@@ -99,7 +103,13 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
}
$size += (int)$item['size'];
}
- return array('fileid' => -1, 'name' => 'Shared', 'mtime' => $mtime, 'mimetype' => 'httpd/unix-directory', 'size' => $size);
+ return array(
+ 'fileid' => -1,
+ 'name' => 'Shared',
+ 'mtime' => $mtime,
+ 'mimetype' => 'httpd/unix-directory',
+ 'size' => $size
+ );
} else if ($format == self::FORMAT_OPENDIR) {
$files = array();
foreach ($items as $item) {
diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index 11c8c6b1e80..4426beec636 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -33,7 +33,8 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share
}
while (!empty($parents)) {
$parents = "'".implode("','", $parents)."'";
- $query = OC_DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache` WHERE `parent` IN ('.$parents.')');
+ $query = OC_DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`'
+ .' WHERE `parent` IN ('.$parents.')');
$result = $query->execute();
$parents = array();
while ($file = $result->fetchRow()) {
@@ -47,4 +48,4 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share
return $children;
}
-} \ No newline at end of file
+}
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 65812b7e2fd..5a9864b64ba 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -240,7 +240,8 @@ class Shared extends \OC\Files\Storage\Common {
public function file_put_contents($path, $data) {
if ($source = $this->getSourcePath($path)) {
// Check if permission is granted
- if (($this->file_exists($path) && !$this->isUpdatable($path)) || ($this->is_dir($path) && !$this->isCreatable($path))) {
+ if (($this->file_exists($path) && !$this->isUpdatable($path))
+ || ($this->is_dir($path) && !$this->isCreatable($path))) {
return false;
}
$info = array(
@@ -314,7 +315,8 @@ class Shared extends \OC\Files\Storage\Common {
if ($this->isCreatable(dirname($path2))) {
$source = $this->fopen($path1, 'r');
$target = $this->fopen($path2, 'w');
- return \OC_Helper::streamCopy($source, $target);
+ list ($count, $result) = \OC_Helper::streamCopy($source, $target);
+ return $result;
}
return false;
}
@@ -390,9 +392,12 @@ class Shared extends \OC\Files\Storage\Common {
}
public static function setup($options) {
- if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user'] || \OCP\Share::getItemsSharedWith('file')) {
+ if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user']
+ || \OCP\Share::getItemsSharedWith('file')) {
$user_dir = $options['user_dir'];
- \OC\Files\Filesystem::mount('\OC\Files\Storage\Shared', array('sharedFolder' => '/Shared'), $user_dir.'/Shared/');
+ \OC\Files\Filesystem::mount('\OC\Files\Storage\Shared',
+ array('sharedFolder' => '/Shared'),
+ $user_dir.'/Shared/');
}
}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 38d598f7780..243ee668f1f 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -43,7 +43,7 @@ if (isset($_GET['t'])) {
$path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
}
}
-}
+}
if (isset($path)) {
if (!isset($linkItem['item_type'])) {
OCP\Util::writeLog('share', 'No item type set for share id: ' . $linkItem['id'], \OCP\Util::ERROR);
@@ -171,7 +171,9 @@ if (isset($path)) {
$list->assign('files', $files, false);
$list->assign('disableSharing', true);
$list->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=', false);
- $list->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=', false);
+ $list->assign('downloadURL',
+ OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=',
+ false);
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path=', false);
@@ -188,7 +190,8 @@ if (isset($path)) {
$folder->assign('usedSpacePercent', 0);
$tmpl->assign('folder', $folder->fetchPage(), false);
$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
- $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath));
+ $tmpl->assign('downloadURL',
+ OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath));
} else {
$tmpl->assign('dir', $dir);
@@ -209,4 +212,3 @@ if (isset($path)) {
header('HTTP/1.0 404 Not Found');
$tmpl = new OCP\Template('', '404', 'guest');
$tmpl->printPage();
-
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 7776fd63b3c..f9ff12679bc 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -3,15 +3,20 @@
<input type="hidden" name="filename" value="<?php echo $_['filename'] ?>" id="filename">
<input type="hidden" name="mimetype" value="<?php echo $_['mimetype'] ?>" id="mimetype">
<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 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">
<?php if (isset($_['folder'])): ?>
- <span id="details"><?php echo $l->t('%s shared the folder %s with you', array($_['displayName'], $_['fileTarget'])) ?></span>
+ <span id="details"><?php echo $l->t('%s shared the folder %s with you',
+ array($_['displayName'], $_['fileTarget'])) ?></span>
<?php else: ?>
- <span id="details"><?php echo $l->t('%s shared the file %s with you', array($_['displayName'], $_['fileTarget'])) ?></span>
+ <span id="details"><?php echo $l->t('%s shared the file %s with you',
+ array($_['displayName'], $_['fileTarget'])) ?></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>
+ <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>
@@ -27,9 +32,12 @@
<ul id="noPreview">
<li class="error">
<?php echo $l->t('No preview available for').' '.$_['fileTarget']; ?><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>
+ <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; ?>
</div>
-<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; <?php echo $l->t('web services under your control'); ?></p></footer>
+<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_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index 34f35c39ccb..1834fb54003 100644
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -20,7 +20,7 @@ foreach ($list as $file) {
$filename = $file;
$timestamp = null;
}
-
+
OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp);
if (!OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
$success[$i]['filename'] = $file;
diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index 93f2aaf1fa2..80de3c31f91 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -1,4 +1,4 @@
-<?php
+<?php
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
@@ -21,7 +21,7 @@ foreach ($list as $file) {
$filename = $path_parts['basename'];
$timestamp = null;
}
-
+
if ( !OCA\Files_Trashbin\Trashbin::restore($file, $filename, $timestamp) ) {
$error[] = $filename;
} else {
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index b1a15cd13d1..7c04e583db1 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -1,7 +1,7 @@
<?php
-OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'apps/files_trashbin/lib/hooks.php';
-OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'apps/files_trashbin/lib/trash.php';
+OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'apps/files_trashbin/lib/hooks.php';
+OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'apps/files_trashbin/lib/trash.php';
+
-
OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook");
diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml
index e4217339602..7f807da579e 100644
--- a/apps/files_trashbin/appinfo/info.xml
+++ b/apps/files_trashbin/appinfo/info.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<info>
<id>files_trashbin</id>
- <name>Trash bin</name>
+ <name>Deleted files</name>
<description>Keep a copy of deleted files so that they can be restored if needed</description>
<licence>AGPL</licence>
<author>Bjoern Schiessle</author>
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 2276fee2f81..2f1fb32f8ce 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -1,6 +1,6 @@
<?php
-// Check if we are a user
+// Check if we are a user
OCP\User::checkLoggedIn();
OCP\Util::addScript('files_trashbin', 'trash');
@@ -18,7 +18,7 @@ $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
$result = array();
if ($dir) {
- $dirlisting = true;
+ $dirlisting = true;
$fullpath = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($dir);
$dirContent = opendir($fullpath);
$i = 0;
@@ -35,10 +35,10 @@ if ($dir) {
'type' => $view->is_dir($dir.'/'.$entryName) ? 'dir' : 'file',
'location' => $dir,
);
- }
+ }
}
closedir($dirContent);
-
+
} else {
$dirlisting = false;
$query = \OC_DB::prepare('SELECT id,location,timestamp,type,mime FROM *PREFIX*files_trash WHERE user=?');
@@ -66,28 +66,28 @@ foreach ($result as $r) {
$files[] = $i;
}
-// Make breadcrumb
+// Make breadcrumb
$pathtohere = '';
-$breadcrumb = array();
-foreach (explode('/', $dir) as $i) {
+$breadcrumb = array();
+foreach (explode('/', $dir) as $i) {
if ($i != '') {
if ( preg_match('/^(.+)\.d[0-9]+$/', $i, $match) ) {
$name = $match[1];
} else {
$name = $i;
- }
- $pathtohere .= '/' . $i;
- $breadcrumb[] = array('dir' => $pathtohere, 'name' => $name);
- }
+ }
+ $pathtohere .= '/' . $i;
+ $breadcrumb[] = array('dir' => $pathtohere, 'name' => $name);
+ }
}
-$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
-$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
+$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
+$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php') . '?dir=', false);
$list = new OCP\Template('files_trashbin', 'part.list', '');
$list->assign('files', $files, false);
-$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$dir, false);
+$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$dir, false);
$list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$dir, false);
$list->assign('disableSharing', true);
$list->assign('dirlisting', $dirlisting);
diff --git a/apps/files_trashbin/js/disableDefaultActions.js b/apps/files_trashbin/js/disableDefaultActions.js
index 27c3e13db4d..df08bfb1a50 100644
--- a/apps/files_trashbin/js/disableDefaultActions.js
+++ b/apps/files_trashbin/js/disableDefaultActions.js
@@ -1,4 +1,4 @@
-/* disable download and sharing actions */
-var disableDownloadActions = true;
-var disableSharing = true;
+/* disable download and sharing actions */
+var disableDownloadActions = true;
+var disableSharing = true;
var trashBinApp = true; \ No newline at end of file
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 208cc88f0fd..7769def535e 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -19,22 +19,22 @@ $(document).ready(function() {
OC.dialogs.alert(result.data.message, 'Error');
}
});
-
+
});
};
-
+
FileActions.register('all', 'Delete', OC.PERMISSION_READ, function () {
return OC.imagePath('core', 'actions/delete');
}, function (filename) {
$('.tipsy').remove();
-
+
var tr=$('tr').filterAttr('data-file', filename);
var deleteAction = $('tr').filterAttr('data-file',filename).children("td.date").children(".action.delete");
var oldHTML = deleteAction[0].outerHTML;
var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'delete file permanently')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
var files = tr.attr('data-file');
deleteAction[0].outerHTML = newHTML;
-
+
$.post(OC.filePath('files_trashbin','ajax','delete.php'),
{files:JSON.stringify([files]), dirlisting:tr.attr('data-dirlisting') },
function(result){
@@ -46,9 +46,9 @@ $(document).ready(function() {
OC.dialogs.alert(result.data.message, 'Error');
}
});
-
+
});
-
+
// Sets the select_all checkbox behaviour :
$('#select_all').click(function() {
if($(this).attr('checked')){
@@ -91,18 +91,18 @@ $(document).ready(function() {
}
processSelection();
});
-
+
$('.undelete').click('click',function(event) {
var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
var files=getSelectedFiles('file');
var fileslist = JSON.stringify(files);
var dirlisting=getSelectedFiles('dirlisting')[0];
-
+
for (var i=0; i<files.length; i++) {
var undeleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date");
undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
}
-
+
$.post(OC.filePath('files_trashbin','ajax','undelete.php'),
{files:fileslist, dirlisting:dirlisting},
function(result){
@@ -115,19 +115,19 @@ $(document).ready(function() {
}
});
});
-
+
$('.delete').click('click',function(event) {
console.log("delete selected");
var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'Delete permanently')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
var files=getSelectedFiles('file');
var fileslist = JSON.stringify(files);
var dirlisting=getSelectedFiles('dirlisting')[0];
-
+
for (var i=0; i<files.length; i++) {
var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date");
deleteAction[0].innerHTML = deleteAction[0].innerHTML+spinner;
}
-
+
$.post(OC.filePath('files_trashbin','ajax','delete.php'),
{files:fileslist, dirlisting:dirlisting},
function(result){
diff --git a/apps/files_trashbin/l10n/ar.php b/apps/files_trashbin/l10n/ar.php
index e38130fe2d3..7b2e2863367 100644
--- a/apps/files_trashbin/l10n/ar.php
+++ b/apps/files_trashbin/l10n/ar.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"Name" => "اسم"
+"Name" => "اسم",
+"Delete" => "إلغاء"
);
diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php
index 05965c2a9ad..957f6a45aac 100644
--- a/apps/files_trashbin/l10n/bg_BG.php
+++ b/apps/files_trashbin/l10n/bg_BG.php
@@ -10,5 +10,6 @@
"1 file" => "1 файл",
"{count} files" => "{count} файла",
"Nothing in here. Your trash bin is empty!" => "Няма нищо. Кофата е празна!",
-"Restore" => "Възтановяване"
+"Restore" => "Възтановяване",
+"Delete" => "Изтриване"
);
diff --git a/apps/files_trashbin/l10n/bn_BD.php b/apps/files_trashbin/l10n/bn_BD.php
index c669eff7e1f..d61355c52c2 100644
--- a/apps/files_trashbin/l10n/bn_BD.php
+++ b/apps/files_trashbin/l10n/bn_BD.php
@@ -3,5 +3,6 @@
"1 folder" => "১টি ফোল্ডার",
"{count} folders" => "{count} টি ফোল্ডার",
"1 file" => "১টি ফাইল",
-"{count} files" => "{count} টি ফাইল"
+"{count} files" => "{count} টি ফাইল",
+"Delete" => "মুছে"
);
diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php
index 803b0c81ef0..894ed6a729d 100644
--- a/apps/files_trashbin/l10n/ca.php
+++ b/apps/files_trashbin/l10n/ca.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "No s'ha pogut restaurar %s",
"perform restore operation" => "executa l'operació de restauració",
"delete file permanently" => "esborra el fitxer permanentment",
+"Delete permanently" => "Esborra permanentment",
"Name" => "Nom",
"Deleted" => "Eliminat",
"1 folder" => "1 carpeta",
@@ -10,5 +11,6 @@
"1 file" => "1 fitxer",
"{count} files" => "{count} fitxers",
"Nothing in here. Your trash bin is empty!" => "La paperera està buida!",
-"Restore" => "Recupera"
+"Restore" => "Recupera",
+"Delete" => "Esborra"
);
diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php
index eeb27784d3e..d32af39877b 100644
--- a/apps/files_trashbin/l10n/cs_CZ.php
+++ b/apps/files_trashbin/l10n/cs_CZ.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Nelze obnovit %s",
"perform restore operation" => "provést obnovu",
"delete file permanently" => "trvale odstranit soubor",
+"Delete permanently" => "Trvale odstranit",
"Name" => "Název",
"Deleted" => "Smazáno",
"1 folder" => "1 složka",
@@ -10,5 +11,6 @@
"1 file" => "1 soubor",
"{count} files" => "{count} soubory",
"Nothing in here. Your trash bin is empty!" => "Žádný obsah. Váš koš je prázdný.",
-"Restore" => "Obnovit"
+"Restore" => "Obnovit",
+"Delete" => "Smazat"
);
diff --git a/apps/files_trashbin/l10n/da.php b/apps/files_trashbin/l10n/da.php
index 855888b3159..ca4a2e8215d 100644
--- a/apps/files_trashbin/l10n/da.php
+++ b/apps/files_trashbin/l10n/da.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Kunne ikke gendanne %s",
"perform restore operation" => "udfør gendannelsesoperation",
"delete file permanently" => "slet fil permanent",
+"Delete permanently" => "Slet permanent",
"Name" => "Navn",
"Deleted" => "Slettet",
"1 folder" => "1 mappe",
@@ -10,5 +11,6 @@
"1 file" => "1 fil",
"{count} files" => "{count} filer",
"Nothing in here. Your trash bin is empty!" => "Intet at se her. Din papirkurv er tom!",
-"Restore" => "Gendan"
+"Restore" => "Gendan",
+"Delete" => "Slet"
);
diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php
index 1271f5c313a..d1952c9635a 100644
--- a/apps/files_trashbin/l10n/de.php
+++ b/apps/files_trashbin/l10n/de.php
@@ -1,8 +1,9 @@
<?php $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Konnte %s nicht permanent löschen",
+"Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
"Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
"perform restore operation" => "Wiederherstellung ausführen",
-"delete file permanently" => "Datei permanent löschen",
+"delete file permanently" => "Datei dauerhaft löschen",
+"Delete permanently" => "Permanent löschen",
"Name" => "Name",
"Deleted" => "gelöscht",
"1 folder" => "1 Ordner",
@@ -10,5 +11,6 @@
"1 file" => "1 Datei",
"{count} files" => "{count} Dateien",
"Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, der Papierkorb ist leer!",
-"Restore" => "Wiederherstellen"
+"Restore" => "Wiederherstellen",
+"Delete" => "Löschen"
);
diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php
index 6d944b3580c..269680ca2c3 100644
--- a/apps/files_trashbin/l10n/de_DE.php
+++ b/apps/files_trashbin/l10n/de_DE.php
@@ -1,8 +1,9 @@
<?php $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Konnte %s nicht entgültig löschen",
+"Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
"Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
"perform restore operation" => "Wiederherstellung ausführen",
-"delete file permanently" => "Datei entgültig löschen",
+"delete file permanently" => "Datei dauerhaft löschen",
+"Delete permanently" => "Endgültig löschen",
"Name" => "Name",
"Deleted" => "Gelöscht",
"1 folder" => "1 Ordner",
@@ -10,5 +11,6 @@
"1 file" => "1 Datei",
"{count} files" => "{count} Dateien",
"Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!",
-"Restore" => "Wiederherstellen"
+"Restore" => "Wiederherstellen",
+"Delete" => "Löschen"
);
diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php
index bc3c2350da6..cf9471780c0 100644
--- a/apps/files_trashbin/l10n/el.php
+++ b/apps/files_trashbin/l10n/el.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Αδυναμία επαναφοράς %s",
"perform restore operation" => "εκτέλεση λειτουργία επαναφοράς",
"delete file permanently" => "μόνιμη διαγραφή αρχείου",
+"Delete permanently" => "Μόνιμη διαγραφή",
"Name" => "Όνομα",
"Deleted" => "Διαγράφηκε",
"1 folder" => "1 φάκελος",
@@ -10,5 +11,6 @@
"1 file" => "1 αρχείο",
"{count} files" => "{count} αρχεία",
"Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!",
-"Restore" => "Επαναφορά"
+"Restore" => "Επαναφορά",
+"Delete" => "Διαγραφή"
);
diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php
index f357e3c10c2..e1e5acbb5a8 100644
--- a/apps/files_trashbin/l10n/eo.php
+++ b/apps/files_trashbin/l10n/eo.php
@@ -4,5 +4,6 @@
"{count} folders" => "{count} dosierujoj",
"1 file" => "1 dosiero",
"{count} files" => "{count} dosierujoj",
-"Restore" => "Restaŭri"
+"Restore" => "Restaŭri",
+"Delete" => "Forigi"
);
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index c14b9776473..ebc01b1d21e 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "No se puede restaurar %s",
"perform restore operation" => "Restaurar",
"delete file permanently" => "Eliminar archivo permanentemente",
+"Delete permanently" => "Eliminar permanentemente",
"Name" => "Nombre",
"Deleted" => "Eliminado",
"1 folder" => "1 carpeta",
@@ -10,5 +11,6 @@
"1 file" => "1 archivo",
"{count} files" => "{count} archivos",
"Nothing in here. Your trash bin is empty!" => "Nada aqui. La papelera esta vacia!",
-"Restore" => "Recuperar"
+"Restore" => "Recuperar",
+"Delete" => "Eliminar"
);
diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php
index c7f98e38df7..bb78a39d6c3 100644
--- a/apps/files_trashbin/l10n/es_AR.php
+++ b/apps/files_trashbin/l10n/es_AR.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "No se pudo restaurar %s",
"perform restore operation" => "Restaurar",
"delete file permanently" => "Borrar archivo de manera permanente",
+"Delete permanently" => "Borrar de manera permanente",
"Name" => "Nombre",
"Deleted" => "Borrado",
"1 folder" => "1 directorio",
@@ -10,5 +11,6 @@
"1 file" => "1 archivo",
"{count} files" => "{count} archivos",
"Nothing in here. Your trash bin is empty!" => "No hay nada acá. ¡La papelera está vacía!",
-"Restore" => "Recuperar"
+"Restore" => "Recuperar",
+"Delete" => "Borrar"
);
diff --git a/apps/files_trashbin/l10n/et_EE.php b/apps/files_trashbin/l10n/et_EE.php
index 8744ab5f122..73ae9dbee18 100644
--- a/apps/files_trashbin/l10n/et_EE.php
+++ b/apps/files_trashbin/l10n/et_EE.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "%s ei saa taastada",
"perform restore operation" => "soorita taastamine",
"delete file permanently" => "kustuta fail jäädavalt",
+"Delete permanently" => "Kustuta jäädavalt",
"Name" => "Nimi",
"Deleted" => "Kustutatud",
"1 folder" => "1 kaust",
@@ -10,5 +11,6 @@
"1 file" => "1 fail",
"{count} files" => "{count} faili",
"Nothing in here. Your trash bin is empty!" => "Siin pole midagi. Sinu prügikast on tühi!",
-"Restore" => "Taasta"
+"Restore" => "Taasta",
+"Delete" => "Kustuta"
);
diff --git a/apps/files_trashbin/l10n/eu.php b/apps/files_trashbin/l10n/eu.php
index 6a4ff125454..5a565436ede 100644
--- a/apps/files_trashbin/l10n/eu.php
+++ b/apps/files_trashbin/l10n/eu.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Ezin izan da %s berreskuratu",
"perform restore operation" => "berreskuratu",
"delete file permanently" => "ezabatu fitxategia betirako",
+"Delete permanently" => "Ezabatu betirako",
"Name" => "Izena",
"Deleted" => "Ezabatuta",
"1 folder" => "karpeta bat",
@@ -10,5 +11,6 @@
"1 file" => "fitxategi bat",
"{count} files" => "{count} fitxategi",
"Nothing in here. Your trash bin is empty!" => "Ez dago ezer ez. Zure zakarrontzia hutsik dago!",
-"Restore" => "Berrezarri"
+"Restore" => "Berrezarri",
+"Delete" => "Ezabatu"
);
diff --git a/apps/files_trashbin/l10n/fa.php b/apps/files_trashbin/l10n/fa.php
index 487d1657985..7cc695215e6 100644
--- a/apps/files_trashbin/l10n/fa.php
+++ b/apps/files_trashbin/l10n/fa.php
@@ -4,5 +4,6 @@
"{count} folders" => "{ شمار} پوشه ها",
"1 file" => "1 پرونده",
"{count} files" => "{ شمار } فایل ها",
-"Restore" => "بازیابی"
+"Restore" => "بازیابی",
+"Delete" => "حذف"
);
diff --git a/apps/files_trashbin/l10n/fi_FI.php b/apps/files_trashbin/l10n/fi_FI.php
index ffdac8735b1..e18689956d0 100644
--- a/apps/files_trashbin/l10n/fi_FI.php
+++ b/apps/files_trashbin/l10n/fi_FI.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Kohteen %s palautus epäonnistui",
"perform restore operation" => "suorita palautustoiminto",
"delete file permanently" => "poista tiedosto pysyvästi",
+"Delete permanently" => "Poista pysyvästi",
"Name" => "Nimi",
"Deleted" => "Poistettu",
"1 folder" => "1 kansio",
@@ -10,5 +11,6 @@
"1 file" => "1 tiedosto",
"{count} files" => "{count} tiedostoa",
"Nothing in here. Your trash bin is empty!" => "Tyhjää täynnä! Roskakorissa ei ole mitään.",
-"Restore" => "Palauta"
+"Restore" => "Palauta",
+"Delete" => "Poista"
);
diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php
index 609b2fa9bd7..0a783785efb 100644
--- a/apps/files_trashbin/l10n/fr.php
+++ b/apps/files_trashbin/l10n/fr.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Impossible de restaurer %s",
"perform restore operation" => "effectuer l'opération de restauration",
"delete file permanently" => "effacer définitivement le fichier",
+"Delete permanently" => "Supprimer de façon définitive",
"Name" => "Nom",
"Deleted" => "Effacé",
"1 folder" => "1 dossier",
@@ -10,5 +11,6 @@
"1 file" => "1 fichier",
"{count} files" => "{count} fichiers",
"Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !",
-"Restore" => "Restaurer"
+"Restore" => "Restaurer",
+"Delete" => "Supprimer"
);
diff --git a/apps/files_trashbin/l10n/gl.php b/apps/files_trashbin/l10n/gl.php
index ad9f6802e66..4e31dd0018a 100644
--- a/apps/files_trashbin/l10n/gl.php
+++ b/apps/files_trashbin/l10n/gl.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Non foi posíbel restaurar %s",
"perform restore operation" => "realizar a operación de restauración",
"delete file permanently" => "eliminar o ficheiro permanentemente",
+"Delete permanently" => "Eliminar permanentemente",
"Name" => "Nome",
"Deleted" => "Eliminado",
"1 folder" => "1 cartafol",
@@ -10,5 +11,6 @@
"1 file" => "1 ficheiro",
"{count} files" => "{count} ficheiros",
"Nothing in here. Your trash bin is empty!" => "Aquí non hai nada. O cesto do lixo está baleiro!",
-"Restore" => "Restablecer"
+"Restore" => "Restablecer",
+"Delete" => "Eliminar"
);
diff --git a/apps/files_trashbin/l10n/he.php b/apps/files_trashbin/l10n/he.php
index d026add5d75..9c767d2222c 100644
--- a/apps/files_trashbin/l10n/he.php
+++ b/apps/files_trashbin/l10n/he.php
@@ -1,7 +1,16 @@
<?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "בלתי אפשרי למחוק את %s לצמיתות",
+"Couldn't restore %s" => "בלתי אפשרי לשחזר את %s",
+"perform restore operation" => "בצע פעולת שחזור",
+"delete file permanently" => "מחק קובץ לצמיתות",
+"Delete permanently" => "מחק לצמיתות",
"Name" => "שם",
+"Deleted" => "נמחק",
"1 folder" => "תיקייה אחת",
"{count} folders" => "{count} תיקיות",
"1 file" => "קובץ אחד",
-"{count} files" => "{count} קבצים"
+"{count} files" => "{count} קבצים",
+"Nothing in here. Your trash bin is empty!" => "שום דבר כאן. סל המחזור שלך ריק!",
+"Restore" => "שחזר",
+"Delete" => "מחיקה"
);
diff --git a/apps/files_trashbin/l10n/hr.php b/apps/files_trashbin/l10n/hr.php
index 52255c7429a..2cb86adfd40 100644
--- a/apps/files_trashbin/l10n/hr.php
+++ b/apps/files_trashbin/l10n/hr.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"Name" => "Ime"
+"Name" => "Ime",
+"Delete" => "Obriši"
);
diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php
index 931e5a7543e..9c158c2b9ec 100644
--- a/apps/files_trashbin/l10n/hu_HU.php
+++ b/apps/files_trashbin/l10n/hu_HU.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Nem sikerült %s visszaállítása",
"perform restore operation" => "a visszaállítás végrehajtása",
"delete file permanently" => "az állomány végleges törlése",
+"Delete permanently" => "Végleges törlés",
"Name" => "Név",
"Deleted" => "Törölve",
"1 folder" => "1 mappa",
@@ -10,5 +11,6 @@
"1 file" => "1 fájl",
"{count} files" => "{count} fájl",
"Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ön szemetes mappája üres!",
-"Restore" => "Visszaállítás"
+"Restore" => "Visszaállítás",
+"Delete" => "Törlés"
);
diff --git a/apps/files_trashbin/l10n/hy.php b/apps/files_trashbin/l10n/hy.php
new file mode 100644
index 00000000000..3b80487278a
--- /dev/null
+++ b/apps/files_trashbin/l10n/hy.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Delete" => "Ջնջել"
+);
diff --git a/apps/files_trashbin/l10n/ia.php b/apps/files_trashbin/l10n/ia.php
index c2581f3de17..0a51752312f 100644
--- a/apps/files_trashbin/l10n/ia.php
+++ b/apps/files_trashbin/l10n/ia.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"Name" => "Nomine"
+"Name" => "Nomine",
+"Delete" => "Deler"
);
diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php
index 1a14d8b7c21..ab5fe25ac6b 100644
--- a/apps/files_trashbin/l10n/id.php
+++ b/apps/files_trashbin/l10n/id.php
@@ -1,3 +1,15 @@
<?php $TRANSLATIONS = array(
-"Name" => "nama"
+"Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s",
+"Couldn't restore %s" => "Tidak dapat memulihkan %s",
+"perform restore operation" => "jalankan operasi pemulihan",
+"delete file permanently" => "hapus berkas secara permanen",
+"Name" => "Nama",
+"Deleted" => "Dihapus",
+"1 folder" => "1 map",
+"{count} folders" => "{count} map",
+"1 file" => "1 berkas",
+"{count} files" => "{count} berkas",
+"Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!",
+"Restore" => "Pulihkan",
+"Delete" => "Hapus"
);
diff --git a/apps/files_trashbin/l10n/is.php b/apps/files_trashbin/l10n/is.php
index 416f641a8ef..fba36c91cb5 100644
--- a/apps/files_trashbin/l10n/is.php
+++ b/apps/files_trashbin/l10n/is.php
@@ -3,5 +3,6 @@
"1 folder" => "1 mappa",
"{count} folders" => "{count} möppur",
"1 file" => "1 skrá",
-"{count} files" => "{count} skrár"
+"{count} files" => "{count} skrár",
+"Delete" => "Eyða"
);
diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php
index 8627682d088..027b22c91ac 100644
--- a/apps/files_trashbin/l10n/it.php
+++ b/apps/files_trashbin/l10n/it.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Impossibile ripristinare %s",
"perform restore operation" => "esegui operazione di ripristino",
"delete file permanently" => "elimina il file definitivamente",
+"Delete permanently" => "Elimina definitivamente",
"Name" => "Nome",
"Deleted" => "Eliminati",
"1 folder" => "1 cartella",
@@ -10,5 +11,6 @@
"1 file" => "1 file",
"{count} files" => "{count} file",
"Nothing in here. Your trash bin is empty!" => "Qui non c'è niente. Il tuo cestino è vuoto.",
-"Restore" => "Ripristina"
+"Restore" => "Ripristina",
+"Delete" => "Elimina"
);
diff --git a/apps/files_trashbin/l10n/ja_JP.php b/apps/files_trashbin/l10n/ja_JP.php
index 2bccf3f3bd5..478aa400664 100644
--- a/apps/files_trashbin/l10n/ja_JP.php
+++ b/apps/files_trashbin/l10n/ja_JP.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "%s を復元出来ませんでした",
"perform restore operation" => "復元操作を実行する",
"delete file permanently" => "ファイルを完全に削除する",
+"Delete permanently" => "完全に削除する",
"Name" => "名前",
"Deleted" => "削除済み",
"1 folder" => "1 フォルダ",
@@ -10,5 +11,6 @@
"1 file" => "1 ファイル",
"{count} files" => "{count} ファイル",
"Nothing in here. Your trash bin is empty!" => "ここには何もありません。ゴミ箱は空です!",
-"Restore" => "復元"
+"Restore" => "復元",
+"Delete" => "削除"
);
diff --git a/apps/files_trashbin/l10n/ka_GE.php b/apps/files_trashbin/l10n/ka_GE.php
index 43dba38f5c7..05068767863 100644
--- a/apps/files_trashbin/l10n/ka_GE.php
+++ b/apps/files_trashbin/l10n/ka_GE.php
@@ -3,5 +3,6 @@
"1 folder" => "1 საქაღალდე",
"{count} folders" => "{count} საქაღალდე",
"1 file" => "1 ფაილი",
-"{count} files" => "{count} ფაილი"
+"{count} files" => "{count} ფაილი",
+"Delete" => "წაშლა"
);
diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php
index 61acd1276a7..b40546e34b8 100644
--- a/apps/files_trashbin/l10n/ko.php
+++ b/apps/files_trashbin/l10n/ko.php
@@ -4,5 +4,6 @@
"{count} folders" => "폴더 {count}개",
"1 file" => "파일 1개",
"{count} files" => "파일 {count}개",
-"Restore" => "복원"
+"Restore" => "복원",
+"Delete" => "삭제"
);
diff --git a/apps/files_trashbin/l10n/lb.php b/apps/files_trashbin/l10n/lb.php
index d1bd7518663..01deea23500 100644
--- a/apps/files_trashbin/l10n/lb.php
+++ b/apps/files_trashbin/l10n/lb.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"Name" => "Numm"
+"Name" => "Numm",
+"Delete" => "Läschen"
);
diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php
index 4933e97202f..513c7626c4e 100644
--- a/apps/files_trashbin/l10n/lt_LT.php
+++ b/apps/files_trashbin/l10n/lt_LT.php
@@ -3,5 +3,6 @@
"1 folder" => "1 aplankalas",
"{count} folders" => "{count} aplankalai",
"1 file" => "1 failas",
-"{count} files" => "{count} failai"
+"{count} files" => "{count} failai",
+"Delete" => "Ištrinti"
);
diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php
index 5ecb99b9892..d3c68e2a778 100644
--- a/apps/files_trashbin/l10n/lv.php
+++ b/apps/files_trashbin/l10n/lv.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Nevarēja atjaunot %s",
"perform restore operation" => "veikt atjaunošanu",
"delete file permanently" => "dzēst datni pavisam",
+"Delete permanently" => "Dzēst pavisam",
"Name" => "Nosaukums",
"Deleted" => "Dzēsts",
"1 folder" => "1 mape",
@@ -10,5 +11,6 @@
"1 file" => "1 datne",
"{count} files" => "{count} datnes",
"Nothing in here. Your trash bin is empty!" => "Šeit nekā nav. Jūsu miskaste ir tukša!",
-"Restore" => "Atjaunot"
+"Restore" => "Atjaunot",
+"Delete" => "Dzēst"
);
diff --git a/apps/files_trashbin/l10n/mk.php b/apps/files_trashbin/l10n/mk.php
index b983c341e8c..22b288b002f 100644
--- a/apps/files_trashbin/l10n/mk.php
+++ b/apps/files_trashbin/l10n/mk.php
@@ -3,5 +3,6 @@
"1 folder" => "1 папка",
"{count} folders" => "{count} папки",
"1 file" => "1 датотека",
-"{count} files" => "{count} датотеки"
+"{count} files" => "{count} датотеки",
+"Delete" => "Избриши"
);
diff --git a/apps/files_trashbin/l10n/ms_MY.php b/apps/files_trashbin/l10n/ms_MY.php
index 73e97b496e4..381d599865e 100644
--- a/apps/files_trashbin/l10n/ms_MY.php
+++ b/apps/files_trashbin/l10n/ms_MY.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"Name" => "Nama"
+"Name" => "Nama",
+"Delete" => "Padam"
);
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index 49364753d13..dc7b8fe97c5 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -3,5 +3,6 @@
"1 folder" => "1 mappe",
"{count} folders" => "{count} mapper",
"1 file" => "1 fil",
-"{count} files" => "{count} filer"
+"{count} files" => "{count} filer",
+"Delete" => "Slett"
);
diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php
index c4a26104ba4..c576e5d81f8 100644
--- a/apps/files_trashbin/l10n/nl.php
+++ b/apps/files_trashbin/l10n/nl.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Kon %s niet herstellen",
"perform restore operation" => "uitvoeren restore operatie",
"delete file permanently" => "verwijder bestanden definitief",
+"Delete permanently" => "Verwijder definitief",
"Name" => "Naam",
"Deleted" => "Verwijderd",
"1 folder" => "1 map",
@@ -10,5 +11,6 @@
"1 file" => "1 bestand",
"{count} files" => "{count} bestanden",
"Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!",
-"Restore" => "Herstellen"
+"Restore" => "Herstellen",
+"Delete" => "Verwijder"
);
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index be60dabdf01..f8ab465ee42 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"Name" => "Namn"
+"Name" => "Namn",
+"Delete" => "Slett"
);
diff --git a/apps/files_trashbin/l10n/oc.php b/apps/files_trashbin/l10n/oc.php
index 2c705193c15..e6b939dac0c 100644
--- a/apps/files_trashbin/l10n/oc.php
+++ b/apps/files_trashbin/l10n/oc.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"Name" => "Nom"
+"Name" => "Nom",
+"Delete" => "Escafa"
);
diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
index d2ada4c9466..62eb9cef8fd 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -4,5 +4,6 @@
"{count} folders" => "{count} foldery",
"1 file" => "1 plik",
"{count} files" => "{count} pliki",
-"Restore" => "Przywróć"
+"Restore" => "Przywróć",
+"Delete" => "Usuń"
);
diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php
index 5a6fc3a86be..b9932a71023 100644
--- a/apps/files_trashbin/l10n/pt_BR.php
+++ b/apps/files_trashbin/l10n/pt_BR.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Não foi possível restaurar %s",
"perform restore operation" => "realizar operação de restauração",
"delete file permanently" => "excluir arquivo permanentemente",
+"Delete permanently" => "Excluir permanentemente",
"Name" => "Nome",
"Deleted" => "Excluído",
"1 folder" => "1 pasta",
@@ -10,5 +11,6 @@
"1 file" => "1 arquivo",
"{count} files" => "{count} arquivos",
"Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira está vazia!",
-"Restore" => "Restaurar"
+"Restore" => "Restaurar",
+"Delete" => "Excluir"
);
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index 978ab452d6e..a621587ea0b 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Não foi possível restaurar %s",
"perform restore operation" => "Restaurar",
"delete file permanently" => "Eliminar permanentemente o(s) ficheiro(s)",
+"Delete permanently" => "Eliminar permanentemente",
"Name" => "Nome",
"Deleted" => "Apagado",
"1 folder" => "1 pasta",
@@ -10,5 +11,6 @@
"1 file" => "1 ficheiro",
"{count} files" => "{count} ficheiros",
"Nothing in here. Your trash bin is empty!" => "Não ha ficheiros. O lixo está vazio",
-"Restore" => "Restaurar"
+"Restore" => "Restaurar",
+"Delete" => "Apagar"
);
diff --git a/apps/files_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php
index 6ece51e02cf..6a919b62dfb 100644
--- a/apps/files_trashbin/l10n/ro.php
+++ b/apps/files_trashbin/l10n/ro.php
@@ -3,5 +3,6 @@
"1 folder" => "1 folder",
"{count} folders" => "{count} foldare",
"1 file" => "1 fisier",
-"{count} files" => "{count} fisiere"
+"{count} files" => "{count} fisiere",
+"Delete" => "Șterge"
);
diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php
index f6c85a6800e..4cf9af1fc39 100644
--- a/apps/files_trashbin/l10n/ru.php
+++ b/apps/files_trashbin/l10n/ru.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "%s не может быть восстановлен",
"perform restore operation" => "выполнить операцию восстановления",
"delete file permanently" => "удалить файл навсегда",
+"Delete permanently" => "Удалено навсегда",
"Name" => "Имя",
"Deleted" => "Удалён",
"1 folder" => "1 папка",
@@ -10,5 +11,6 @@
"1 file" => "1 файл",
"{count} files" => "{count} файлов",
"Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
-"Restore" => "Восстановить"
+"Restore" => "Восстановить",
+"Delete" => "Удалить"
);
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
index 379ee37af83..04a899bdd5d 100644
--- a/apps/files_trashbin/l10n/ru_RU.php
+++ b/apps/files_trashbin/l10n/ru_RU.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "%s не может быть восстановлен",
"perform restore operation" => "выполнить операцию восстановления",
"delete file permanently" => "удалить файл навсегда",
+"Delete permanently" => "Удалить навсегда",
"Name" => "Имя",
"Deleted" => "Удалён",
"1 folder" => "1 папка",
@@ -10,5 +11,6 @@
"1 file" => "1 файл",
"{count} files" => "{количество} файлов",
"Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
-"Restore" => "Восстановить"
+"Restore" => "Восстановить",
+"Delete" => "Удалить"
);
diff --git a/apps/files_trashbin/l10n/si_LK.php b/apps/files_trashbin/l10n/si_LK.php
index cb351afaec9..71c56329776 100644
--- a/apps/files_trashbin/l10n/si_LK.php
+++ b/apps/files_trashbin/l10n/si_LK.php
@@ -1,5 +1,6 @@
<?php $TRANSLATIONS = array(
"Name" => "නම",
"1 folder" => "1 ෆොල්ඩරයක්",
-"1 file" => "1 ගොනුවක්"
+"1 file" => "1 ගොනුවක්",
+"Delete" => "මකා දමන්න"
);
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index b86e5d86e44..c5806a5dee8 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Nemožno obnoviť %s",
"perform restore operation" => "vykonať obnovu",
"delete file permanently" => "trvalo zmazať súbor",
+"Delete permanently" => "Zmazať trvalo",
"Name" => "Meno",
"Deleted" => "Zmazané",
"1 folder" => "1 priečinok",
@@ -10,5 +11,6 @@
"1 file" => "1 súbor",
"{count} files" => "{count} súborov",
"Nothing in here. Your trash bin is empty!" => "Žiadny obsah. Kôš je prázdny!",
-"Restore" => "Obnoviť"
+"Restore" => "Obnoviť",
+"Delete" => "Zmazať"
);
diff --git a/apps/files_trashbin/l10n/sl.php b/apps/files_trashbin/l10n/sl.php
index 2579f95c862..4765945747d 100644
--- a/apps/files_trashbin/l10n/sl.php
+++ b/apps/files_trashbin/l10n/sl.php
@@ -3,5 +3,6 @@
"1 folder" => "1 mapa",
"{count} folders" => "{count} map",
"1 file" => "1 datoteka",
-"{count} files" => "{count} datotek"
+"{count} files" => "{count} datotek",
+"Delete" => "Izbriši"
);
diff --git a/apps/files_trashbin/l10n/sr.php b/apps/files_trashbin/l10n/sr.php
index 36659e70803..2e7c139e389 100644
--- a/apps/files_trashbin/l10n/sr.php
+++ b/apps/files_trashbin/l10n/sr.php
@@ -7,5 +7,6 @@
"1 file" => "1 датотека",
"{count} files" => "{count} датотеке/а",
"Nothing in here. Your trash bin is empty!" => "Овде нема ништа. Корпа за отпатке је празна.",
-"Restore" => "Врати"
+"Restore" => "Врати",
+"Delete" => "Обриши"
);
diff --git a/apps/files_trashbin/l10n/sr@latin.php b/apps/files_trashbin/l10n/sr@latin.php
index 52255c7429a..2cb86adfd40 100644
--- a/apps/files_trashbin/l10n/sr@latin.php
+++ b/apps/files_trashbin/l10n/sr@latin.php
@@ -1,3 +1,4 @@
<?php $TRANSLATIONS = array(
-"Name" => "Ime"
+"Name" => "Ime",
+"Delete" => "Obriši"
);
diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php
index 53bb7a6ce0f..6f8c2365818 100644
--- a/apps/files_trashbin/l10n/sv.php
+++ b/apps/files_trashbin/l10n/sv.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Kunde inte återställa %s",
"perform restore operation" => "utför återställning",
"delete file permanently" => "radera filen permanent",
+"Delete permanently" => "Radera permanent",
"Name" => "Namn",
"Deleted" => "Raderad",
"1 folder" => "1 mapp",
@@ -10,5 +11,6 @@
"1 file" => "1 fil",
"{count} files" => "{count} filer",
"Nothing in here. Your trash bin is empty!" => "Ingenting här. Din papperskorg är tom!",
-"Restore" => "Återskapa"
+"Restore" => "Återskapa",
+"Delete" => "Radera"
);
diff --git a/apps/files_trashbin/l10n/ta_LK.php b/apps/files_trashbin/l10n/ta_LK.php
index a436e2344a4..f21e5fc750d 100644
--- a/apps/files_trashbin/l10n/ta_LK.php
+++ b/apps/files_trashbin/l10n/ta_LK.php
@@ -3,5 +3,6 @@
"1 folder" => "1 கோப்புறை",
"{count} folders" => "{எண்ணிக்கை} கோப்புறைகள்",
"1 file" => "1 கோப்பு",
-"{count} files" => "{எண்ணிக்கை} கோப்புகள்"
+"{count} files" => "{எண்ணிக்கை} கோப்புகள்",
+"Delete" => "நீக்குக"
);
diff --git a/apps/files_trashbin/l10n/th_TH.php b/apps/files_trashbin/l10n/th_TH.php
index 8a031fb0d70..3f5d44c763e 100644
--- a/apps/files_trashbin/l10n/th_TH.php
+++ b/apps/files_trashbin/l10n/th_TH.php
@@ -7,5 +7,6 @@
"1 file" => "1 ไฟล์",
"{count} files" => "{count} ไฟล์",
"Nothing in here. Your trash bin is empty!" => "ไม่มีอะไรอยู่ในนี้ ถังขยะของคุณยังว่างอยู่",
-"Restore" => "คืนค่า"
+"Restore" => "คืนค่า",
+"Delete" => "ลบ"
);
diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php
index cebe615a05f..c874d73316a 100644
--- a/apps/files_trashbin/l10n/tr.php
+++ b/apps/files_trashbin/l10n/tr.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "%s Geri yüklenemedi",
"perform restore operation" => "Geri yükleme işlemini gerçekleştir",
"delete file permanently" => "Dosyayı kalıcı olarak sil",
+"Delete permanently" => "Kalıcı olarak sil",
"Name" => "İsim",
"Deleted" => "Silindi",
"1 folder" => "1 dizin",
@@ -10,5 +11,6 @@
"1 file" => "1 dosya",
"{count} files" => "{count} dosya",
"Nothing in here. Your trash bin is empty!" => "Burası boş. Çöp kutun tamamen boş.",
-"Restore" => "Geri yükle"
+"Restore" => "Geri yükle",
+"Delete" => "Sil"
);
diff --git a/apps/files_trashbin/l10n/uk.php b/apps/files_trashbin/l10n/uk.php
index 06474d9b2cd..df7dd24864c 100644
--- a/apps/files_trashbin/l10n/uk.php
+++ b/apps/files_trashbin/l10n/uk.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Неможливо відновити %s",
"perform restore operation" => "виконати операцію відновлення",
"delete file permanently" => "видалити файл назавжди",
+"Delete permanently" => "Видалити назавжди",
"Name" => "Ім'я",
"Deleted" => "Видалено",
"1 folder" => "1 папка",
@@ -10,5 +11,6 @@
"1 file" => "1 файл",
"{count} files" => "{count} файлів",
"Nothing in here. Your trash bin is empty!" => "Нічого немає. Ваший кошик для сміття пустий!",
-"Restore" => "Відновити"
+"Restore" => "Відновити",
+"Delete" => "Видалити"
);
diff --git a/apps/files_trashbin/l10n/vi.php b/apps/files_trashbin/l10n/vi.php
index ac2a7be0291..165fa9cfd94 100644
--- a/apps/files_trashbin/l10n/vi.php
+++ b/apps/files_trashbin/l10n/vi.php
@@ -3,6 +3,7 @@
"Couldn't restore %s" => "Không thể khôi phục %s",
"perform restore operation" => "thực hiện phục hồi",
"delete file permanently" => "xóa file vĩnh viễn",
+"Delete permanently" => "Xóa vĩnh vễn",
"Name" => "Tên",
"Deleted" => "Đã xóa",
"1 folder" => "1 thư mục",
@@ -10,5 +11,6 @@
"1 file" => "1 tập tin",
"{count} files" => "{count} tập tin",
"Nothing in here. Your trash bin is empty!" => "Không có gì ở đây. Thùng rác của bạn rỗng!",
-"Restore" => "Khôi phục"
+"Restore" => "Khôi phục",
+"Delete" => "Xóa"
);
diff --git a/apps/files_trashbin/l10n/zh_CN.GB2312.php b/apps/files_trashbin/l10n/zh_CN.GB2312.php
index 2c6a7891e98..606d80d441b 100644
--- a/apps/files_trashbin/l10n/zh_CN.GB2312.php
+++ b/apps/files_trashbin/l10n/zh_CN.GB2312.php
@@ -3,5 +3,6 @@
"1 folder" => "1 个文件夹",
"{count} folders" => "{count} 个文件夹",
"1 file" => "1 个文件",
-"{count} files" => "{count} 个文件"
+"{count} files" => "{count} 个文件",
+"Delete" => "删除"
);
diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php
index 0060b1f31d6..327a3e24707 100644
--- a/apps/files_trashbin/l10n/zh_CN.php
+++ b/apps/files_trashbin/l10n/zh_CN.php
@@ -3,5 +3,6 @@
"1 folder" => "1个文件夹",
"{count} folders" => "{count} 个文件夹",
"1 file" => "1 个文件",
-"{count} files" => "{count} 个文件"
+"{count} files" => "{count} 个文件",
+"Delete" => "删除"
);
diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
index be61d9b0b6d..0142e901f58 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -1,7 +1,9 @@
<?php $TRANSLATIONS = array(
+"Delete permanently" => "永久刪除",
"Name" => "名稱",
"1 folder" => "1 個資料夾",
"{count} folders" => "{count} 個資料夾",
"1 file" => "1 個檔案",
-"{count} files" => "{count} 個檔案"
+"{count} files" => "{count} 個檔案",
+"Delete" => "刪除"
);
diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/hooks.php
index d6a62d447b8..9081706a2c5 100644
--- a/apps/files_trashbin/lib/hooks.php
+++ b/apps/files_trashbin/lib/hooks.php
@@ -1,23 +1,23 @@
<?php
-/**
- * ownCloud - trash bin
- *
- * @author Bjoern Schiessle
- * @copyright 2013 Bjoern Schiessle schiessle@owncloud.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
+/**
+ * ownCloud - trash bin
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2013 Bjoern Schiessle schiessle@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
/**
@@ -36,7 +36,7 @@ class Hooks {
* to copy the file to the trash bin
*/
public static function remove_hook($params) {
-
+
if ( \OCP\App::isEnabled('files_trashbin') ) {
$path = $params['path'];
Trashbin::move2trash($path);
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index f11e5c4cbfd..83fc424834c 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -1,35 +1,37 @@
<?php
-/**
- * ownCloud - trash bin
- *
- * @author Bjoern Schiessle
- * @copyright 2013 Bjoern Schiessle schiessle@owncloud.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Files_Trashbin;
-
+/**
+ * ownCloud - trash bin
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2013 Bjoern Schiessle schiessle@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Files_Trashbin;
+
class Trashbin {
-
- const DEFAULT_RETENTION_OBLIGATION=180; // how long do we keep files in the trash bin if no other value is defined in the config file (unit: days)
- const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
-
+ // how long do we keep files in the trash bin if no other value is defined in the config file (unit: days)
+ const DEFAULT_RETENTION_OBLIGATION=180;
+
+ // unit: percentage; 50% of available disk space/quota
+ const DEFAULTMAXSIZE=50;
+
/**
* move file to the trash bin
- *
+ *
* @param $file_path path to the deleted file/directory relative to the files root directory
*/
public static function move2trash($file_path) {
@@ -56,12 +58,12 @@ class Trashbin {
}
if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) {
- $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
+ $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
}
$trashbinSize += self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view);
if ( $view->file_exists('files_trashbin/files/'.$deleted.'.d'.$timestamp) ) {
- $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user) VALUES (?,?,?,?,?,?)");
+ $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user) VALUES (?,?,?,?,?,?)");
$result = $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user));
if ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin.
$view->deleteAll('files_trashbin/files/'.$deleted.'.d'.$timestamp);
@@ -79,7 +81,7 @@ class Trashbin {
$trashbinSize += $view->filesize('files_versions'.$v['path'].'.v'.$v['version']);
$view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'files_trashbin/versions'. $deleted.'.v'.$v['version'].'.d'.$timestamp);
}
- }
+ }
}
// Take care of encryption keys
@@ -97,30 +99,30 @@ class Trashbin {
} else {
\OC_Log::write('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin', \OC_log::ERROR);
}
-
- // get available disk space for user
- $quota = \OCP\Util::computerFileSize(\OC_Preferences::getValue($user, 'files', 'quota'));
- if ( $quota == null ) {
- $quota = \OCP\Util::computerFileSize(\OC_Appconfig::getValue('files', 'default_quota'));
- }
- if ( $quota == null ) {
- $quota = \OC\Files\Filesystem::free_space('/');
+
+ // get available disk space for user
+ $quota = \OCP\Util::computerFileSize(\OC_Preferences::getValue($user, 'files', 'quota'));
+ if ( $quota == null ) {
+ $quota = \OCP\Util::computerFileSize(\OC_Appconfig::getValue('files', 'default_quota'));
}
-
- // calculate available space for trash bin
- $rootInfo = $view->getFileInfo('/files');
- $free = $quota-$rootInfo['size']; // remaining free space for user
- if ( $free > 0 ) {
- $availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
- } else {
- $availableSpace = $free-$trashbinSize;
+ if ( $quota == null ) {
+ $quota = \OC\Files\Filesystem::free_space('/');
}
-
+
+ // calculate available space for trash bin
+ $rootInfo = $view->getFileInfo('/files');
+ $free = $quota-$rootInfo['size']; // remaining free space for user
+ if ( $free > 0 ) {
+ $availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
+ } else {
+ $availableSpace = $free-$trashbinSize;
+ }
+
$trashbinSize -= self::expire($availableSpace);
- \OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize);
+ \OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize);
}
-
-
+
+
/**
* restore files from trash bin
* @param $file path to the deleted file
@@ -132,22 +134,23 @@ class Trashbin {
$view = new \OC_FilesystemView('/'.$user);
if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) {
- $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
+ $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
}
if ( $timestamp ) {
- $query = \OC_DB::prepare('SELECT location,type FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?');
+ $query = \OC_DB::prepare('SELECT location,type FROM *PREFIX*files_trash'
+ .' WHERE user=? AND id=? AND timestamp=?');
$result = $query->execute(array($user,$filename,$timestamp))->fetchAll();
if ( count($result) != 1 ) {
\OC_Log::write('files_trashbin', 'trash bin database inconsistent!', \OC_Log::ERROR);
return false;
}
-
- // if location no longer exists, restore file in the root directory
- $location = $result[0]['location'];
- if ( $result[0]['location'] != '/' &&
- (!$view->is_dir('files'.$result[0]['location']) ||
- !$view->isUpdatable('files'.$result[0]['location'])) ) {
- $location = '';
+
+ // if location no longer exists, restore file in the root directory
+ $location = $result[0]['location'];
+ if ( $result[0]['location'] != '/' &&
+ (!$view->is_dir('files'.$result[0]['location']) ||
+ !$view->isUpdatable('files'.$result[0]['location'])) ) {
+ $location = '';
}
} else {
$path_parts = pathinfo($file);
@@ -160,7 +163,7 @@ class Trashbin {
$source = \OC_Filesystem::normalizePath('files_trashbin/files/'.$file);
$target = \OC_Filesystem::normalizePath('files/'.$location.'/'.$filename);
-
+
// we need a extension in case a file/dir with the same name already exists
$ext = self::getUniqueExtension($location, $filename, $view);
$mtime = $view->filemtime($source);
@@ -177,7 +180,7 @@ class Trashbin {
$versionedFile = $filename;
} else {
$versionedFile = $file;
- }
+ }
if ( $result[0]['type'] == 'dir' ) {
$trashbinSize -= self::calculateSize(new \OC_FilesystemView('/'.$user.'/'.'files_trashbin/versions/'. $file));
$view->rename(\OC_Filesystem::normalizePath('files_trashbin/versions/'. $file), \OC_Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext));
@@ -191,7 +194,7 @@ class Trashbin {
$view->rename('files_trashbin/versions/'.$versionedFile.'.v'.$v, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v);
}
}
- }
+ }
}
// Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!)
@@ -215,7 +218,7 @@ class Trashbin {
}
if ( $timestamp ) {
- $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?');
+ $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?');
$query->execute(array($user,$filename,$timestamp));
}
@@ -227,30 +230,30 @@ class Trashbin {
return false;
}
-
- /**
- * delete file from trash bin permanently
+
+ /**
+ * delete file from trash bin permanently
* @param $filename path to the file
- * @param $timestamp of deletion time
- * @return size of deleted files
- */
- public static function delete($filename, $timestamp=null) {
- $user = \OCP\User::getUser();
+ * @param $timestamp of deletion time
+ * @return size of deleted files
+ */
+ public static function delete($filename, $timestamp=null) {
+ $user = \OCP\User::getUser();
$view = new \OC_FilesystemView('/'.$user);
$size = 0;
if ( ($trashbinSize = \OCP\Config::getAppValue('files_trashbin', 'size')) === null ) {
- $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
+ $trashbinSize = self::calculateSize(new \OC_FilesystemView('/'. $user.'/files_trashbin'));
}
-
- if ( $timestamp ) {
- $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?');
- $query->execute(array($user,$filename,$timestamp));
+
+ if ( $timestamp ) {
+ $query = \OC_DB::prepare('DELETE FROM *PREFIX*files_trash WHERE user=? AND id=? AND timestamp=?');
+ $query->execute(array($user,$filename,$timestamp));
$file = $filename.'.d'.$timestamp;
} else {
$file = $filename;
}
-
+
if ( \OCP\App::isEnabled('files_versions') ) {
if ($view->is_dir('files_trashbin/versions/'.$file)) {
$size += self::calculateSize(new \OC_Filesystemview('/'.$user.'/files_trashbin/versions/'.$file));
@@ -295,8 +298,8 @@ class Trashbin {
$view->unlink('/files_trashbin/files/'.$file);
$trashbinSize -= $size;
\OCP\Config::setAppValue('files_trashbin', 'size', $trashbinSize);
-
- return $size;
+
+ return $size;
}
/**
@@ -319,21 +322,22 @@ class Trashbin {
return $view->file_exists($target);
}
- /**
+ /**
* clean up the trash bin
- * @param max. available disk space for trashbin
- */
+ * @param max. available disk space for trashbin
+ */
private static function expire($availableSpace) {
-
+
$user = \OCP\User::getUser();
$view = new \OC_FilesystemView('/'.$user);
$size = 0;
-
- $query = \OC_DB::prepare('SELECT location,type,id,timestamp FROM *PREFIX*files_trash WHERE user=?');
+
+ $query = \OC_DB::prepare('SELECT location,type,id,timestamp FROM *PREFIX*files_trash WHERE user=?');
$result = $query->execute(array($user))->fetchAll();
-
- $retention_obligation = \OC_Config::getValue('trashbin_retention_obligation', self::DEFAULT_RETENTION_OBLIGATION);
-
+
+ $retention_obligation = \OC_Config::getValue('trashbin_retention_obligation',
+ self::DEFAULT_RETENTION_OBLIGATION);
+
$limit = time() - ($retention_obligation * 86400);
foreach ( $result as $r ) {
@@ -343,11 +347,11 @@ class Trashbin {
$size += self::delete($filename, $timestamp);
}
}
-
$availableSpace = $availableSpace + $size;
// if size limit for trash bin reached, delete oldest files in trash bin
if ($availableSpace < 0) {
- $query = \OC_DB::prepare('SELECT location,type,id,timestamp FROM *PREFIX*files_trash WHERE user=? ORDER BY timestamp ASC');
+ $query = \OC_DB::prepare('SELECT location,type,id,timestamp FROM *PREFIX*files_trash'
+ .' WHERE user=? ORDER BY timestamp ASC');
$result = $query->execute(array($user))->fetchAll();
$length = count($result);
$i = 0;
@@ -356,15 +360,17 @@ class Trashbin {
$availableSpace += $tmp;
$size += $tmp;
$i++;
- }
+ }
+
+
}
-
- return $size;
+
+ return $size;
}
-
+
/**
* recursive copy to copy a whole directory
- *
+ *
* @param $source source path, relative to the users files directory
* @param $destination destination path relative to the users root directoy
* @param $view file view for the users root directory
@@ -391,7 +397,7 @@ class Trashbin {
}
return $size;
}
-
+
/**
* find all versions which belong to the file we want to restore
* @param $filename name of the file which should be restored
@@ -399,7 +405,7 @@ class Trashbin {
*/
private static function getVersionsFromTrash($filename, $timestamp) {
$view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin/versions');
- $versionsName = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($filename);
+ $versionsName = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($filename);
$versions = array();
if ($timestamp ) {
// fetch for old versions
@@ -407,20 +413,20 @@ class Trashbin {
$offset = -strlen($timestamp)-2;
} else {
$matches = glob( $versionsName.'.v*' );
- }
-
+ }
+
foreach( $matches as $ma ) {
if ( $timestamp ) {
- $parts = explode( '.v', substr($ma, 0, $offset) );
+ $parts = explode( '.v', substr($ma, 0, $offset) );
$versions[] = ( end( $parts ) );
} else {
- $parts = explode( '.v', $ma );
+ $parts = explode( '.v', $ma );
$versions[] = ( end( $parts ) );
}
}
return $versions;
}
-
+
/**
* find unique extension for restored file if a file with the same name already exists
* @param $location where the file should be restored
@@ -429,39 +435,40 @@ class Trashbin {
* @return string with unique extension
*/
private static function getUniqueExtension($location, $filename, $view) {
- $ext = '';
- if ( $view->file_exists('files'.$location.'/'.$filename) ) {
- $tmpext = '.restored';
- $ext = $tmpext;
- $i = 1;
- while ( $view->file_exists('files'.$location.'/'.$filename.$ext) ) {
- $ext = $tmpext.$i;
- $i++;
- }
+ $ext = '';
+ if ( $view->file_exists('files'.$location.'/'.$filename) ) {
+ $tmpext = '.restored';
+ $ext = $tmpext;
+ $i = 1;
+ while ( $view->file_exists('files'.$location.'/'.$filename.$ext) ) {
+ $ext = $tmpext.$i;
+ $i++;
+ }
}
return $ext;
}
- /**
+ /**
* @brief get the size from a given root folder
- * @param $view file view on the root folder
- * @return size of the folder
- */
- private static function calculateSize($view) {
- $root = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath('');
+ * @param $view file view on the root folder
+ * @return size of the folder
+ */
+ private static function calculateSize($view) {
+ $root = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath('');
if (!file_exists($root)) {
return 0;
}
- $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST);
- $size = 0;
-
+ $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root),
+ \RecursiveIteratorIterator::CHILD_FIRST);
+ $size = 0;
+
foreach ($iterator as $path) {
$relpath = substr($path, strlen($root)-1);
if ( !$view->is_dir($relpath) ) {
$size += $view->filesize($relpath);
- }
- }
- return $size;
+ }
+ }
+ return $size;
}
-
-}
+
+}
diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php
index 2de0d7ee91a..dea0a43cd4c 100644
--- a/apps/files_trashbin/templates/part.list.php
+++ b/apps/files_trashbin/templates/part.list.php
@@ -69,4 +69,3 @@
</td>
</tr>
<?php endforeach;
- \ No newline at end of file
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php
index 2970915ac63..284b46ee093 100644
--- a/apps/files_versions/ajax/rollbackVersion.php
+++ b/apps/files_versions/ajax/rollbackVersion.php
@@ -14,4 +14,3 @@ if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
$l = OC_L10N::get('files_versions');
OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
}
-
diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index 0155f8e830f..44878da5e4d 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -4,7 +4,7 @@
<name>Versions</name>
<licence>AGPL</licence>
<author>Frank Karlitschek</author>
- <require>4.91</require>
+ <require>4.93</require>
<shipped>true</shipped>
<description>Versioning of files</description>
<types>
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index dec222eefce..109829fa03f 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -64,9 +64,9 @@ function createVersionsDropdown(filename, files) {
} else {
$(html).appendTo($('thead .share'));
}
-
+
$("#makelink").click(function() {
- goToVersionPage(historyUrl);
+ goToVersionPage(historyUrl);
});
$.ajax({
diff --git a/apps/files_versions/l10n/fa.php b/apps/files_versions/l10n/fa.php
index 9b618fdd320..0e32ae0d891 100644
--- a/apps/files_versions/l10n/fa.php
+++ b/apps/files_versions/l10n/fa.php
@@ -1,4 +1,11 @@
<?php $TRANSLATIONS = array(
+"Could not revert: %s" => "بازگردانی امکان ناپذیر است: %s",
+"success" => "موفقیت",
+"failure" => "شکست",
+"No old versions available" => "هیچ نسخه قدیمی در دسترس نیست",
+"No path specified" => "هیچ مسیری مشخص نشده است",
"History" => "تاریخچه",
+"Revert a file to a previous version by clicking on its revert button" => "بازگردانی یک پرورنده به نسخه قدیمی اش از طریق دکمه بازگردانی امکان پذیر است",
+"Files Versioning" => "نسخه بندی پرونده ها",
"Enable" => "فعال"
);
diff --git a/apps/files_versions/l10n/id.php b/apps/files_versions/l10n/id.php
index 6c553327c42..6e24a05cbb8 100644
--- a/apps/files_versions/l10n/id.php
+++ b/apps/files_versions/l10n/id.php
@@ -1,5 +1,13 @@
<?php $TRANSLATIONS = array(
+"Could not revert: %s" => "Tidak dapat mengembalikan: %s",
+"success" => "sukses",
+"File %s was reverted to version %s" => "Berkas %s telah dikembalikan ke versi %s",
+"failure" => "gagal",
+"File %s could not be reverted to version %s" => "Berkas %s gagal dikembalikan ke versi %s",
+"No old versions available" => "Versi lama tidak tersedia",
+"No path specified" => "Lokasi tidak ditentukan",
"History" => "riwayat",
+"Revert a file to a previous version by clicking on its revert button" => "Kembalikan berkas ke versi sebelumnya dengan mengklik tombol kembalikan",
"Files Versioning" => "pembuatan versi file",
"Enable" => "aktifkan"
);
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index 6c87eba423d..7891b20e92f 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -41,7 +41,7 @@ class Hooks {
if($path<>'') {
Storage::delete($path);
}
-
+
}
}
@@ -59,8 +59,8 @@ class Hooks {
if($oldpath<>'' && $newpath<>'') {
Storage::rename( $oldpath, $newpath );
}
-
+
}
}
-
+
}
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index ba9f8ba41cb..adbf2c1df7e 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -19,24 +19,25 @@ class Storage {
const DEFAULTENABLED=true;
const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
-
+
private static $max_versions_per_interval = array(
- 1 => array('intervalEndsAfter' => 10, //first 10sec, one version every 2sec
- 'step' => 2),
- 2 => array('intervalEndsAfter' => 60, //next minute, one version every 10sec
- 'step' => 10),
- 3 => array('intervalEndsAfter' => 3600, //next hour, one version every minute
- 'step' => 60),
- 4 => array('intervalEndsAfter' => 86400, //next 24h, one version every hour
- 'step' => 3600),
- 5 => array('intervalEndsAfter' => 2592000, //next 30days, one version per day
- 'step' => 86400),
- 6 => array('intervalEndsAfter' => -1, //until the end one version per week
- 'step' => 604800),
- );
+ //first 10sec, one version every 2sec
+ 1 => array('intervalEndsAfter' => 10, 'step' => 2),
+ //next minute, one version every 10sec
+ 2 => array('intervalEndsAfter' => 60, 'step' => 10),
+ //next hour, one version every minute
+ 3 => array('intervalEndsAfter' => 3600, 'step' => 60),
+ //next 24h, one version every hour
+ 4 => array('intervalEndsAfter' => 86400, 'step' => 3600),
+ //next 30days, one version per day
+ 5 => array('intervalEndsAfter' => 2592000, 'step' => 86400),
+ //until the end one version per week
+ 6 => array('intervalEndsAfter' => -1, 'step' => 604800),
+ );
private static function getUidAndFilename($filename) {
$uid = \OC\Files\Filesystem::getOwner($filename);
+ \OC\Files\Filesystem::initMountPoints($uid);
if ( $uid != \OCP\User::getUser() ) {
$info = \OC\Files\Filesystem::getFileInfo($filename);
$ownerView = new \OC\Files\View('/'.$uid.'/files');
@@ -44,14 +45,14 @@ class Storage {
}
return array($uid, $filename);
}
-
+
/**
* store a new version of a file.
*/
public static function store($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
list($uid, $filename) = self::getUidAndFilename($filename);
-
+
$files_view = new \OC\Files\View('/'.$uid .'/files');
$users_view = new \OC\Files\View('/'.$uid);
@@ -78,10 +79,10 @@ class Storage {
$versionsSize = self::calculateSize($uid);
}
$versionsSize += $users_view->filesize('files'.$filename);
-
+
// expire old revisions if necessary
$newSize = self::expire($filename, $versionsSize);
-
+
if ( $newSize != $versionsSize ) {
\OCP\Config::setAppValue('files_versions', 'size', $versionsSize);
}
@@ -95,7 +96,7 @@ class Storage {
public static function delete($filename) {
list($uid, $filename) = self::getUidAndFilename($filename);
$versions_fileview = new \OC\Files\View('/'.$uid .'/files_versions');
-
+
$abs_path = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$filename.'.v';
if( ($versions = self::getVersions($uid, $filename)) ) {
if ( ($versionsSize = \OCP\Config::getAppValue('files_versions', 'size')) === null ) {
@@ -108,7 +109,7 @@ class Storage {
\OCP\Config::setAppValue('files_versions', 'size', $versionsSize);
}
}
-
+
/**
* rename versions of a file
*/
@@ -118,7 +119,7 @@ class Storage {
$versions_view = new \OC\Files\View('/'.$uid .'/files_versions');
$files_view = new \OC\Files\View('/'.$uid .'/files');
$abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_view->getAbsolutePath('').$newpath;
-
+
if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) {
$versions_view->rename($oldpath, $newpath);
} else if ( ($versions = Storage::getVersions($uid, $oldpath)) ) {
@@ -129,7 +130,7 @@ class Storage {
}
}
}
-
+
/**
* rollback to an old version of a file.
*/
@@ -139,14 +140,14 @@ class Storage {
list($uid, $filename) = self::getUidAndFilename($filename);
$users_view = new \OC\Files\View('/'.$uid);
$versionCreated = false;
-
+
//first create a new version
$version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename);
if ( !$users_view->file_exists($version)) {
$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
$versionCreated = true;
}
-
+
// rollback
if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
$users_view->touch('files'.$filename, $revision);
@@ -177,7 +178,7 @@ class Storage {
$versions = array();
// fetch for old versions
$matches = glob( $versionsName.'.v*' );
-
+
if ( !$matches ) {
return $versions;
}
@@ -237,22 +238,25 @@ class Storage {
if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
$versionsRoot = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('');
-
- $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($versionsRoot), \RecursiveIteratorIterator::CHILD_FIRST);
-
+
+ $iterator = new \RecursiveIteratorIterator(
+ new \RecursiveDirectoryIterator($versionsRoot),
+ \RecursiveIteratorIterator::CHILD_FIRST
+ );
+
$size = 0;
-
+
foreach ($iterator as $path) {
if ( preg_match('/^.+\.v(\d+)$/', $path, $match) ) {
$relpath = substr($path, strlen($versionsRoot)-1);
$size += $versions_fileview->filesize($relpath);
}
}
-
+
return $size;
}
}
-
+
/**
* @brief returns all stored file versions from a given user
* @param $uid id to the user
@@ -262,24 +266,27 @@ class Storage {
if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
$versionsRoot = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('');
-
- $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($versionsRoot), \RecursiveIteratorIterator::CHILD_FIRST);
-
+
+ $iterator = new \RecursiveIteratorIterator(
+ new \RecursiveDirectoryIterator($versionsRoot),
+ \RecursiveIteratorIterator::CHILD_FIRST
+ );
+
$versions = array();
-
+
foreach ($iterator as $path) {
if ( preg_match('/^.+\.v(\d+)$/', $path, $match) ) {
$relpath = substr($path, strlen($versionsRoot)-1);
$versions[$match[1].'#'.$relpath] = array('path' => $relpath, 'timestamp' => $match[1]);
}
}
-
+
ksort($versions);
-
+
$i = 0;
-
+
$result = array();
-
+
foreach( $versions as $key => $value ) {
$i++;
$size = $versions_fileview->filesize($value['path']);
@@ -288,14 +295,14 @@ class Storage {
$result['all'][$key]['version'] = $value['timestamp'];
$result['all'][$key]['path'] = $filename;
$result['all'][$key]['size'] = $size;
-
+
$filename = substr($value['path'], 0, -strlen($value['timestamp'])-2);
$result['by_file'][$filename][$key]['version'] = $value['timestamp'];
$result['by_file'][$filename][$key]['path'] = $filename;
$result['by_file'][$filename][$key]['size'] = $size;
-
+
}
-
+
return $result;
}
}
@@ -305,9 +312,9 @@ class Storage {
*/
private static function expire($filename, $versionsSize = null) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
- list($uid, $filename) = self::getUidAndFilename($filename);
+ list($uid, $filename) = self::getUidAndFilename($filename);
$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
-
+
// get available disk space for user
$quota = \OCP\Util::computerFileSize(\OC_Preferences::getValue($uid, 'files', 'quota'));
if ( $quota == null ) {
@@ -316,7 +323,7 @@ class Storage {
if ( $quota == null ) {
$quota = \OC\Files\Filesystem::free_space('/');
}
-
+
// make sure that we have the current size of the version history
if ( $versionsSize === null ) {
if ( ($versionsSize = \OCP\Config::getAppValue('files_versions', 'size')) === null ) {
@@ -332,9 +339,9 @@ class Storage {
$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
} else {
$availableSpace = $free-$versionsSize;
- }
+ }
- // after every 1000s run reduce the number of all versions not only for the current file
+ // after every 1000s run reduce the number of all versions not only for the current file
$random = rand(0, 1000);
if ($random == 0) {
$result = Storage::getAllVersions($uid);
@@ -344,29 +351,29 @@ class Storage {
$all_versions = Storage::getVersions($uid, $filename);
$versions_by_file[$filename] = $all_versions;
}
-
+
$time = time();
-
+
// it is possible to expire versions from more than one file
// iterate through all given files
foreach ($versions_by_file as $filename => $versions) {
$versions = array_reverse($versions); // newest version first
-
+
$interval = 1;
- $step = Storage::$max_versions_per_interval[$interval]['step'];
+ $step = Storage::$max_versions_per_interval[$interval]['step'];
if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1) {
$nextInterval = -1;
} else {
$nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
}
-
+
$firstVersion = reset($versions);
$firstKey = key($versions);
$prevTimestamp = $firstVersion['version'];
$nextVersion = $firstVersion['version'] - $step;
$remaining_versions[$firstKey] = $firstVersion;
unset($versions[$firstKey]);
-
+
foreach ($versions as $key => $version) {
$newInterval = true;
while ( $newInterval ) {
@@ -396,11 +403,11 @@ class Storage {
$prevTimestamp = $version['version'];
}
}
-
+
// check if enough space is available after versions are rearranged.
// if not we delete the oldest versions until we meet the size limit for versions
$numOfVersions = count($all_versions);
- $i = 0;
+ $i = 0;
while ($availableSpace < 0) {
if ($i = $numOfVersions-2) break; // keep at least the last version
$versions_fileview->unlink($all_versions[$i]['path'].'.v'.$all_versions[$i]['version']);
@@ -408,10 +415,10 @@ class Storage {
$availableSpace += $all_versions[$i]['size'];
$i++;
}
-
+
return $versionsSize; // finally return the new size of the version history
}
-
+
return false;
}
}
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 850ece89c98..c450af66ad5 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -22,7 +22,8 @@ if( isset( $_['message'] ) ) {
foreach ( $_['versions'] as $v ) {
echo ' ';
echo OCP\Util::formatDate( doubleval($v['version']) );
- echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php', array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />';
+ echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php',
+ array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />';
if ( $v['cur'] ) {
echo ' (<b>Current</b>)';
}
diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php
index bfca8366f5d..3b8e4baf119 100644
--- a/apps/files_versions/templates/settings.php
+++ b/apps/files_versions/templates/settings.php
@@ -1,6 +1,9 @@
<form id="versionssettings">
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Files Versioning');?></strong></legend>
- <input type="checkbox" name="versions" id="versions" value="1" <?php if (OCP\Config::getSystemValue('versions', 'true')=='true') echo ' checked="checked"'; ?> /> <label for="versions"><?php echo $l->t('Enable'); ?></label> <br/>
+ <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/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index 53269edfb34..03a4fa52332 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -7,7 +7,7 @@
This app is not compatible to the WebDAV user backend.</description>
<licence>AGPL</licence>
<author>Dominik Schmidt and Arthur Schiwon</author>
- <require>4.91</require>
+ <require>4.93</require>
<shipped>true</shipped>
<types>
<authentication/>
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 182025e8fb9..6217a6d4821 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -12,7 +12,7 @@
"Do you really want to delete the current Server Configuration?" => "Wollen Sie die aktuelle Serverkonfiguration wirklich löschen?",
"Confirm Deletion" => "Löschung bestätigen",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren.",
"Server configuration" => "Serverkonfiguration",
"Add Server Configuration" => "Serverkonfiguration hinzufügen",
"Host" => "Host",
@@ -38,12 +38,12 @@
"When unchecked, this configuration will be skipped." => "Konfiguration wird übersprungen wenn deaktiviert",
"Port" => "Port",
"Backup (Replica) Host" => "Backup Host (Kopie)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Gib einen optionalen Backup Host an. Es muss sich um eine kopie des Haupt LDAP/AD Servers handeln.",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.",
"Backup (Replica) Port" => "Backup Port",
"Disable Main Server" => "Hauptserver deaktivieren",
-"When switched on, ownCloud will only connect to the replica server." => "Wenn aktiviert wird ownCloud ausschließlich den Backupserver verwenden",
+"When switched on, ownCloud will only connect to the replica server." => "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden.",
"Use TLS" => "Nutze TLS",
-"Do not use it additionally for LDAPS connections, it will fail." => "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern.",
+"Do not use it additionally for LDAPS connections, it will fail." => "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen.",
"Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
"Turn off SSL certificate validation." => "Schalte die SSL-Zertifikatsprüfung aus.",
"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.",
@@ -55,7 +55,7 @@
"Base User Tree" => "Basis-Benutzerbaum",
"One User Base DN per line" => "Ein Benutzer Base DN pro Zeile",
"User Search Attributes" => "Benutzersucheigenschaften",
-"Optional; one attribute per line" => "Optional, eine Eigenschaft pro Zeile",
+"Optional; one attribute per line" => "Optional; eine Eigenschaft pro Zeile",
"Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe",
"The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ",
"Base Group Tree" => "Basis-Gruppenbaum",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 9bee0a219ae..c88ed22b4fa 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -43,7 +43,7 @@
"Disable Main Server" => "Hauptserver deaktivieren",
"When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet wird sich die ownCloud nur mit dem Replikat-Server verbinden.",
"Use TLS" => "Nutze TLS",
-"Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht zusätzlich für LDAPS Verbindungen, es wird fehlschlagen.",
+"Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen.",
"Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
"Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.",
"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.",
@@ -55,7 +55,7 @@
"Base User Tree" => "Basis-Benutzerbaum",
"One User Base DN per line" => "Ein Benutzer Base DN pro Zeile",
"User Search Attributes" => "Benutzer-Suche Eigenschaften",
-"Optional; one attribute per line" => "Optional; Ein Attribut pro Zeile",
+"Optional; one attribute per line" => "Optional; ein Attribut pro Zeile",
"Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe",
"The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ",
"Base Group Tree" => "Basis-Gruppenbaum",
diff --git a/apps/user_ldap/l10n/he.php b/apps/user_ldap/l10n/he.php
index 5c563b7b6f3..c9b0e282f1d 100644
--- a/apps/user_ldap/l10n/he.php
+++ b/apps/user_ldap/l10n/he.php
@@ -7,6 +7,7 @@
"User Login Filter" => "סנן כניסת משתמש",
"User List Filter" => "סנן רשימת משתמשים",
"Group Filter" => "סנן קבוצה",
+"Port" => "פורט",
"in seconds. A change empties the cache." => "בשניות. שינוי מרוקן את המטמון.",
"in bytes" => "בבתים",
"Help" => "עזרה"
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index c07892386d6..5912789c856 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -1,14 +1,69 @@
<?php $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Gagal menghapus konfigurasi server",
+"The configuration is valid and the connection could be established!" => "Konfigurasi valid dan koneksi dapat dilakukan!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Konfigurasi salah. Silakan lihat log ownCloud untuk lengkapnya.",
"Deletion failed" => "penghapusan gagal",
+"Take over settings from recent server configuration?" => "Ambil alih pengaturan dari konfigurasi server saat ini?",
+"Keep settings?" => "Biarkan pengaturan?",
+"Cannot add server configuration" => "Gagal menambah konfigurasi server",
+"Connection test succeeded" => "Tes koneksi sukses",
+"Connection test failed" => "Tes koneksi gagal",
+"Do you really want to delete the current Server Configuration?" => "Anda ingin menghapus Konfigurasi Server saat ini?",
+"Confirm Deletion" => "Konfirmasi Penghapusan",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Peringatan:/b> Aplikasi user_ldap dan user_webdavauth tidak kompatibel. Anda mungkin akan mengalami kejadian yang tidak diharapkan. Silakan minta administrator sistem untuk menonaktifkan salah satunya.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.",
+"Server configuration" => "Konfigurasi server",
+"Add Server Configuration" => "Tambah Konfigurasi Server",
"Host" => "host",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://",
+"Base DN" => "Base DN",
+"One Base DN per line" => "Satu Base DN per baris",
+"You can specify Base DN for users and groups in the Advanced tab" => "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
+"User DN" => "User DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong.",
"Password" => "kata kunci",
+"For anonymous access, leave DN and Password empty." => "Untuk akses anonim, biarkan DN dan Kata sandi kosong.",
"User Login Filter" => "gunakan saringan login",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "gunakan pengganti %%uid, mis. \"uid=%%uid\"",
+"User List Filter" => "Daftar Filter Pengguna",
+"Defines the filter to apply, when retrieving users." => "Definisikan filter untuk diterapkan saat menerima pengguna.",
+"without any placeholder, e.g. \"objectClass=person\"." => "tanpa pengganti apapun, mis. \"objectClass=seseorang\".",
"Group Filter" => "saringan grup",
+"Defines the filter to apply, when retrieving groups." => "Definisikan filter untuk diterapkan saat menerima grup.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\".",
+"Connection Settings" => "Pengaturan Koneksi",
+"Configuration Active" => "Konfigurasi Aktif",
+"When unchecked, this configuration will be skipped." => "Jika tidak dicentang, konfigurasi ini dilewati.",
"Port" => "port",
+"Backup (Replica) Host" => "Host Cadangan (Replika)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama.",
+"Backup (Replica) Port" => "Port Cadangan (Replika)",
+"Disable Main Server" => "Nonaktifkan Server Utama",
+"When switched on, ownCloud will only connect to the replica server." => "Saat diaktifkan, ownCloud hanya akan terhubung ke server replika.",
"Use TLS" => "gunakan TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal.",
+"Case insensitve LDAP server (Windows)" => "Server LDAP dengan kapitalisasi tidak sensitif (Windows)",
"Turn off SSL certificate validation." => "matikan validasi sertivikat SSL",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda.",
"Not recommended, use for testing only." => "tidak disarankan, gunakan hanya untuk pengujian.",
"in seconds. A change empties the cache." => "dalam detik. perubahan mengosongkan cache",
+"Directory Settings" => "Pengaturan Direktori",
+"User Display Name Field" => "Bidang Tampilan Nama Pengguna",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP yang digunakan untuk menghasilkan nama pengguna ownCloud.",
+"Base User Tree" => "Pohon Pengguna Dasar",
+"One User Base DN per line" => "Satu Pengguna Base DN per baris",
+"User Search Attributes" => "Atribut Pencarian Pengguna",
+"Optional; one attribute per line" => "Pilihan; satu atribut per baris",
+"Group Display Name Field" => "Bidang Tampilan Nama Grup",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP yang digunakan untuk menghasilkan nama grup ownCloud.",
+"Base Group Tree" => "Pohon Grup Dasar",
+"One Group Base DN per line" => "Satu Grup Base DN per baris",
+"Group Search Attributes" => "Atribut Pencarian Grup",
+"Group-Member association" => "asosiasi Anggota-Grup",
+"Special Attributes" => "Atribut Khusus",
"in bytes" => "dalam bytes",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.",
"Help" => "bantuan"
);
diff --git a/apps/user_ldap/l10n/my_MM.php b/apps/user_ldap/l10n/my_MM.php
new file mode 100644
index 00000000000..ee8d3dd26fa
--- /dev/null
+++ b/apps/user_ldap/l10n/my_MM.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "စကားဝှက်",
+"Help" => "အကူအညီ"
+);
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index c86263d52a8..e3d2da463cc 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -4,6 +4,7 @@
"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais.",
"The configuration is invalid. Please look in the ownCloud log for further details." => "A configuração é inválida. Leia o \"log\" do ownCloud para mais detalhes.",
"Deletion failed" => "Remoção falhou",
+"Take over settings from recent server configuration?" => "Tomar parámetros de recente configuração de servidor?",
"Keep settings?" => "Manter ajustes?",
"Cannot add server configuration" => "Não foi possível adicionar a configuração do servidor",
"Connection test succeeded" => "Teste de conexão bem sucedido",
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index 29ce998dae7..45c379445af 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -102,4 +102,3 @@ class Helper {
return true;
}
}
-
diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
index f62f03577e8..76b314e48aa 100755
--- a/apps/user_webdavauth/appinfo/info.xml
+++ b/apps/user_webdavauth/appinfo/info.xml
@@ -7,7 +7,7 @@
This app is not compatible to the LDAP user and group backend.</description>
<licence>AGPL</licence>
<author>Frank Karlitschek</author>
- <require>4.91</require>
+ <require>4.93</require>
<shipped>true</shipped>
<types>
<authentication/>
diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php
index 7eabb0d48cc..ae9cb7e4c92 100755
--- a/apps/user_webdavauth/settings.php
+++ b/apps/user_webdavauth/settings.php
@@ -26,7 +26,7 @@ OC_Util::checkAdminUser();
if($_POST) {
// CSRF check
OCP\JSON::callCheck();
-
+
if(isset($_POST['webdav_url'])) {
OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
}
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 6704a00c5a2..332b6a0bed8 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -34,7 +34,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
$shareWith = null;
}
- $token = OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], $shareType, $shareWith, $_POST['permissions']);
+ $token = OCP\Share::shareItem(
+ $_POST['itemType'],
+ $_POST['itemSource'],
+ $shareType,
+ $shareWith,
+ $_POST['permissions']
+ );
if (is_string($token)) {
OC_JSON::success(array('data' => array('token' => $token)));
@@ -59,7 +65,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
break;
case 'setPermissions':
if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
- $return = OCP\Share::setPermissions($_POST['itemType'], $_POST['itemSource'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
+ $return = OCP\Share::setPermissions(
+ $_POST['itemType'],
+ $_POST['itemSource'],
+ $_POST['shareType'],
+ $_POST['shareWith'],
+ $_POST['permissions']
+ );
($return) ? OC_JSON::success() : OC_JSON::error();
}
break;
@@ -86,9 +98,11 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
if ($type === 'dir')
$subject = (string)$l->t('User %s shared a folder with you', $displayName);
- $text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($displayName, $file, $link));
+ $text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s',
+ array($displayName, $file, $link));
if ($type === 'dir')
- $text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($displayName, $file, $link));
+ $text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s',
+ array($displayName, $file, $link));
$default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply');
@@ -112,14 +126,29 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
}
break;
case 'getItem':
- if (isset($_GET['itemType']) && isset($_GET['itemSource']) && isset($_GET['checkReshare']) && isset($_GET['checkShares'])) {
+ if (isset($_GET['itemType'])
+ && isset($_GET['itemSource'])
+ && isset($_GET['checkReshare'])
+ && isset($_GET['checkShares'])) {
if ($_GET['checkReshare'] == 'true') {
- $reshare = OCP\Share::getItemSharedWithBySource($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
+ $reshare = OCP\Share::getItemSharedWithBySource(
+ $_GET['itemType'],
+ $_GET['itemSource'],
+ OCP\Share::FORMAT_NONE,
+ null,
+ true
+ );
} else {
$reshare = false;
}
if ($_GET['checkShares'] == 'true') {
- $shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
+ $shares = OCP\Share::getItemShared(
+ $_GET['itemType'],
+ $_GET['itemSource'],
+ OCP\Share::FORMAT_NONE,
+ null,
+ true
+ );
} else {
$shares = false;
}
@@ -165,8 +194,15 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
}
$offset += $limit;
foreach ($users as $uid => $displayName) {
- if ((!isset($_GET['itemShares']) || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]) || !in_array($uid, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])) && $uid != OC_User::getUser()) {
- $shareWith[] = array('label' => $displayName, 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER, 'shareWith' => $uid));
+ if ((!isset($_GET['itemShares'])
+ || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])
+ || !in_array($uid, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]))
+ && $uid != OC_User::getUser()) {
+ $shareWith[] = array(
+ 'label' => $displayName,
+ 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER,
+ 'shareWith' => $uid)
+ );
$count++;
}
}
@@ -179,7 +215,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
|| !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) {
- $shareWith[] = array('label' => $group.' (group)', 'value' => array('shareType' => OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => $group));
+ $shareWith[] = array(
+ 'label' => $group.' (group)',
+ 'value' => array(
+ 'shareType' => OCP\Share::SHARE_TYPE_GROUP,
+ 'shareWith' => $group
+ )
+ );
$count++;
}
} else {
diff --git a/core/css/styles.css b/core/css/styles.css
index 8a01211d8b0..0c16b36873f 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -36,8 +36,8 @@ filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endC
.header-right > * { vertical-align:middle; }
/* INPUTS */
-input[type="text"], input[type="password"] { cursor:text; }
-input[type="text"], input[type="password"], input[type="search"],
+input[type="text"], input[type="password"], input[type="number"] { cursor:text; }
+input[type="text"], input[type="password"], input[type="search"], input[type="number"],
textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
width:10em; margin:.3em; padding:.6em .5em .4em;
font-size:1em; font-family:Arial, Verdana, sans-serif;
@@ -46,10 +46,11 @@ textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
}
input[type="hidden"] { height:0; width:0; }
-input[type="text"], input[type="password"], input[type="search"], textarea { background:#f8f8f8; color:#555; cursor:text; }
-input[type="text"], input[type="password"], input[type="search"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; }
+input[type="text"], input[type="password"], input[type="search"], input[type="number"], textarea { background:#f8f8f8; color:#555; cursor:text; }
+input[type="text"], input[type="password"], input[type="search"], input[type="number"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; }
input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,
input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active,
+input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:active,
.searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active,
textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; }
@@ -196,7 +197,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
#show, #personal-show { display:none; }
#show + label { right:1em; top:1.25em!important; }
#show:checked + label, #personal-show:checked + label { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
-#show + label, #personal-show + label {
+#show + label, #personal-show + label {
position:absolute!important; height:14px; width:24px;
background-image:url("../img/actions/toggle.png"); background-repeat:no-repeat;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3;
diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png
new file mode 100644
index 00000000000..ce7e1e69802
--- /dev/null
+++ b/core/img/actions/caret-dark.png
Binary files differ
diff --git a/core/img/actions/caret-dark.svg b/core/img/actions/caret-dark.svg
new file mode 100644
index 00000000000..abb1dc192d2
--- /dev/null
+++ b/core/img/actions/caret-dark.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.0"
+ width="10"
+ height="10"
+ id="svg2403"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="caret.svg"
+ inkscape:export-filename="caret.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1280"
+ inkscape:window-height="773"
+ id="namedview3047"
+ showgrid="false"
+ inkscape:zoom="25.279067"
+ inkscape:cx="-3.063006"
+ inkscape:cy="6.0978375"
+ inkscape:window-x="0"
+ inkscape:window-y="-1"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2403"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ <metadata
+ id="metadata15">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs2405">
+ <linearGradient
+ x1="11.644068"
+ y1="2.4988678"
+ x2="11.644068"
+ y2="15.00281"
+ id="linearGradient2392"
+ xlink:href="#linearGradient3678"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1.0000001,1.1920928e-8)" />
+ <linearGradient
+ x1="8.4964771"
+ y1="-0.061573759"
+ x2="8.4964771"
+ y2="8.083209"
+ id="linearGradient2395"
+ xlink:href="#linearGradient3678"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0526316,0,0,0.9843625,0.5789474,0.06024281)" />
+ <linearGradient
+ id="linearGradient3678">
+ <stop
+ id="stop3680"
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3682"
+ style="stop-color:#e6e6e6;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ </defs>
+ <path
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0"
+ id="path3768"
+ d="M 1,2 5,10 9,2.011 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <path
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#999999;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="M 1,1 5,9 9,1.011 z"
+ id="path3716"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" />
+</svg>
diff --git a/core/js/config.php b/core/js/config.php
index 9069175ed6f..0aaa4482287 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -29,8 +29,33 @@ $array = array(
"oc_current_user" => "\"".OC_User::getUser(). "\"",
"oc_requesttoken" => "\"".OC_Util::callRegister(). "\"",
"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
- "dayNames" => json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))),
- "monthNames" => json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))),
+ "dayNames" => json_encode(
+ array(
+ (string)$l->t('Sunday'),
+ (string)$l->t('Monday'),
+ (string)$l->t('Tuesday'),
+ (string)$l->t('Wednesday'),
+ (string)$l->t('Thursday'),
+ (string)$l->t('Friday'),
+ (string)$l->t('Saturday')
+ )
+ ),
+ "monthNames" => json_encode(
+ array(
+ (string)$l->t('January'),
+ (string)$l->t('February'),
+ (string)$l->t('March'),
+ (string)$l->t('April'),
+ (string)$l->t('May'),
+ (string)$l->t('June'),
+ (string)$l->t('July'),
+ (string)$l->t('August'),
+ (string)$l->t('September'),
+ (string)$l->t('October'),
+ (string)$l->t('November'),
+ (string)$l->t('December')
+ )
+ ),
"firstDay" => json_encode($l->l('firstday', 'firstday')) ,
);
@@ -38,4 +63,3 @@ $array = array(
foreach ($array as $setting => $value) {
echo("var ". $setting ."=".$value.";\n");
}
-?> \ No newline at end of file
diff --git a/core/l10n/de.php b/core/l10n/de.php
index f1e892fee47..e60f061ff3c 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,8 +1,8 @@
<?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Der Nutzer %s hat eine Datei mit dir geteilt",
-"User %s shared a folder with you" => "%s hat ein Verzeichnis mit dir geteilt",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit dir geteilt. Sie ist hier zum Download verfügbar: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit dir geteilt. Er ist hier zum Download verfügbar: %s",
+"User %s shared a file with you" => "Der Nutzer %s hat eine Datei mit Dir geteilt",
+"User %s shared a folder with you" => "%s hat ein Verzeichnis mit Dir geteilt",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit Dir geteilt. Sie ist hier zum Download verfügbar: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit Dir geteilt. Er ist hier zum Download verfügbar: %s",
"Category type not provided." => "Kategorie nicht angegeben.",
"No category to add?" => "Keine Kategorie hinzuzufügen?",
"This category already exists: %s" => "Die Kategorie '%s' existiert bereits.",
@@ -58,10 +58,10 @@
"Error while sharing" => "Fehler beim Teilen",
"Error while unsharing" => "Fehler beim Aufheben der Teilung",
"Error while changing permissions" => "Fehler beim Ändern der Rechte",
-"Shared with you and the group {group} by {owner}" => "{owner} hat dies mit dir und der Gruppe {group} geteilt",
-"Shared with you by {owner}" => "{owner} hat dies mit dir geteilt",
+"Shared with you and the group {group} by {owner}" => "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
+"Shared with you by {owner}" => "{owner} hat dies mit Dir geteilt",
"Share with" => "Teilen mit",
-"Share with link" => "Über einen Link teilen",
+"Share with link" => "Über einen Link freigegeben",
"Password protect" => "Passwortschutz",
"Password" => "Passwort",
"Email link to person" => "Link per E-Mail verschicken",
@@ -72,7 +72,7 @@
"No people found" => "Niemand gefunden",
"Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
"Shared in {item} with {user}" => "Für {user} in {item} freigegeben",
-"Unshare" => "Teilung aufheben",
+"Unshare" => "Freigabe aufheben",
"can edit" => "kann bearbeiten",
"access control" => "Zugriffskontrolle",
"create" => "erstellen",
@@ -109,7 +109,7 @@
"Security Warning" => "Sicherheitswarnung",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktiviere die PHP-Erweiterung für OpenSSL.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Konten zu übernehmen.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Sie Ihren Server konfigurieren.",
"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
"Advanced" => "Fortgeschritten",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 34305258944..9a975ddcb87 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -72,7 +72,7 @@
"No people found" => "Niemand gefunden",
"Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt",
"Shared in {item} with {user}" => "Freigegeben in {item} von {user}",
-"Unshare" => "Teilung aufheben",
+"Unshare" => "Freigabe aufheben",
"can edit" => "kann bearbeiten",
"access control" => "Zugriffskontrolle",
"create" => "erstellen",
@@ -84,7 +84,7 @@
"Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
"Sending ..." => "Sende ...",
"Email sent" => "Email gesendet",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Gemeinschaft</a>.",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
"ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
"Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
@@ -109,7 +109,7 @@
"Security Warning" => "Sicherheitshinweis",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Ihr Konto zu übernehmen.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Sie Ihren Server konfigurieren.",
"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
"Advanced" => "Fortgeschritten",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 8c36254caf8..834af44b382 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,8 +1,8 @@
<?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "%s erabiltzaileak zurekin fitxategi bat partekatu du ",
-"User %s shared a folder with you" => "%s erabiltzaileak zurekin karpeta bat partekatu du ",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" fitxategia zurekin partekatu du. Hemen duzu eskuragarri: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" karpeta zurekin partekatu du. Hemen duzu eskuragarri: %s",
+"User %s shared a file with you" => "%s erabiltzaileak zurekin fitxategi bat elkarbanatu du ",
+"User %s shared a folder with you" => "%s erabiltzaileak zurekin karpeta bat elkarbanatu du ",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" fitxategia zurekin elkarbanatu du. Hemen duzu eskuragarri: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" karpeta zurekin elkarbanatu du. Hemen duzu eskuragarri: %s",
"Category type not provided." => "Kategoria mota ez da zehaztu.",
"No category to add?" => "Ez dago gehitzeko kategoriarik?",
"This category already exists: %s" => "Kategoria hau dagoeneko existitzen da: %s",
@@ -58,8 +58,8 @@
"Error while sharing" => "Errore bat egon da elkarbanatzean",
"Error while unsharing" => "Errore bat egon da elkarbanaketa desegitean",
"Error while changing permissions" => "Errore bat egon da baimenak aldatzean",
-"Shared with you and the group {group} by {owner}" => "{owner}-k zu eta {group} taldearekin partekatuta",
-"Shared with you by {owner}" => "{owner}-k zurekin partekatuta",
+"Shared with you and the group {group} by {owner}" => "{owner}-k zu eta {group} taldearekin elkarbanatuta",
+"Shared with you by {owner}" => "{owner}-k zurekin elkarbanatuta",
"Share with" => "Elkarbanatu honekin",
"Share with link" => "Elkarbanatu lotura batekin",
"Password protect" => "Babestu pasahitzarekin",
@@ -71,7 +71,7 @@
"Share via email:" => "Elkarbanatu eposta bidez:",
"No people found" => "Ez da inor aurkitu",
"Resharing is not allowed" => "Berriz elkarbanatzea ez dago baimendua",
-"Shared in {item} with {user}" => "{user}ekin {item}-n partekatuta",
+"Shared in {item} with {user}" => "{user}ekin {item}-n elkarbanatuta",
"Unshare" => "Ez elkarbanatu",
"can edit" => "editatu dezake",
"access control" => "sarrera kontrola",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 75c378ceceb..1db5820bdf7 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -5,6 +5,7 @@
"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את התיקייה „%s“. ניתן להוריד את התיקייה מכאן: %s",
"Category type not provided." => "סוג הקטגוריה לא סופק.",
"No category to add?" => "אין קטגוריה להוספה?",
+"This category already exists: %s" => "הקטגוריה הבאה כבר קיימת: %s",
"Object type not provided." => "סוג הפריט לא סופק.",
"%s ID not provided." => "מזהה %s לא סופק.",
"Error adding %s to favorites." => "אירעה שגיאה בעת הוספת %s למועדפים.",
@@ -52,6 +53,7 @@
"Error" => "שגיאה",
"The app name is not specified." => "שם היישום לא צוין.",
"The required file {file} is not installed!" => "הקובץ הנדרש {file} אינו מותקן!",
+"Shared" => "שותף",
"Share" => "שתף",
"Error while sharing" => "שגיאה במהלך השיתוף",
"Error while unsharing" => "שגיאה במהלך ביטול השיתוף",
@@ -82,6 +84,8 @@
"Error setting expiration date" => "אירעה שגיאה בעת הגדרת תאריך התפוגה",
"Sending ..." => "מתבצעת שליחה ...",
"Email sent" => "הודעת הדוא״ל נשלחה",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "תהליך העדכון לא הושלם בהצלחה. נא דווח את הבעיה ב<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">קהילת ownCloud</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
"ownCloud password reset" => "איפוס הססמה של ownCloud",
"Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
"You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
@@ -105,6 +109,8 @@
"Security Warning" => "אזהרת אבטחה",
"No secure random number generator is available, please enable the PHP OpenSSL extension." => "אין מחולל מספרים אקראיים מאובטח, נא להפעיל את ההרחבה OpenSSL ב־PHP.",
"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ללא מחולל מספרים אקראיים מאובטח תוקף יכול לנבא את מחרוזות איפוס הססמה ולהשתלט על החשבון שלך.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "לקבלת מידע להגדרה נכונה של השרת שלך, ראה את ה<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">תיעוד</a>.",
"Create an <strong>admin account</strong>" => "יצירת <strong>חשבון מנהל</strong>",
"Advanced" => "מתקדם",
"Data folder" => "תיקיית נתונים",
@@ -124,6 +130,7 @@
"Lost your password?" => "שכחת את ססמתך?",
"remember" => "שמירת הססמה",
"Log in" => "כניסה",
+"Alternative Logins" => "כניסות אלטרנטיביות",
"prev" => "הקודם",
"next" => "הבא",
"Updating ownCloud to version %s, this may take a while." => "מעדכן את ownCloud אל גרסא %s, זה עלול לקחת זמן מה."
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
new file mode 100644
index 00000000000..97631d4df58
--- /dev/null
+++ b/core/l10n/my_MM.php
@@ -0,0 +1,64 @@
+<?php $TRANSLATIONS = array(
+"No category to add?" => "ထည့်ရန်ခေါင်းစဉ်မရှိဘူးလား",
+"No categories selected for deletion." => "ဖျက်ရန်အတွက်ခေါင်းစဉ်မရွေးထားပါ",
+"January" => "ဇန်နဝါရီ",
+"February" => "ဖေဖော်ဝါရီ",
+"March" => "မတ်",
+"April" => "ဧပြီ",
+"May" => "မေ",
+"June" => "ဇွန်",
+"July" => "ဇူလိုင်",
+"August" => "ဩဂုတ်",
+"September" => "စက်တင်ဘာ",
+"October" => "အောက်တိုဘာ",
+"November" => "နိုဝင်ဘာ",
+"December" => "ဒီဇင်ဘာ",
+"seconds ago" => "စက္ကန့်အနည်းငယ်က",
+"1 minute ago" => "၁ မိနစ်အရင်က",
+"1 hour ago" => "၁ နာရီ အရင်က",
+"today" => "ယနေ့",
+"yesterday" => "မနေ့က",
+"last month" => "ပြီးခဲ့သောလ",
+"last year" => "မနှစ်က",
+"years ago" => "နှစ် အရင်က",
+"Choose" => "ရွေးချယ်",
+"Cancel" => "ပယ်ဖျက်မည်",
+"No" => "မဟုတ်ဘူး",
+"Yes" => "ဟုတ်",
+"Ok" => "အိုကေ",
+"Password" => "စကားဝှက်",
+"Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
+"Expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်",
+"Share via email:" => "အီးမေးလ်ဖြင့်ဝေမျှမည် -",
+"Resharing is not allowed" => "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ",
+"can edit" => "ပြင်ဆင်နိုင်",
+"create" => "ဖန်တီးမည်",
+"delete" => "ဖျက်မည်",
+"share" => "ဝေမျှမည်",
+"Password protected" => "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
+"You will receive a link to reset your password via Email." => "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
+"Username" => "သုံးစွဲသူအမည်",
+"Your password was reset" => "သင်၏စကားဝှက်ကိုပြန်ဖော်ပြီးပါပြီ။",
+"To login page" => "ဝင်ရောက်သည့်စာမျက်နှာသို့",
+"New password" => "စကားဝှက်အသစ်",
+"Users" => "သုံးစွဲသူ",
+"Apps" => "Apps",
+"Admin" => "အက်ဒမင်",
+"Help" => "အကူအညီ",
+"Cloud not found" => "မတွေ့ရှိမိပါ",
+"Add" => "ပေါင်းထည့်",
+"Security Warning" => "လုံခြုံရေးသတိပေးချက်",
+"Create an <strong>admin account</strong>" => "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
+"Advanced" => "အဆင့်မြင့်",
+"Data folder" => "အချက်အလက်ဖိုလ်ဒါလ်",
+"Database user" => "Database သုံးစွဲသူ",
+"Database password" => "Database စကားဝှက်",
+"Database name" => "Database အမည်",
+"Finish setup" => "တပ်ဆင်ခြင်းပြီးပါပြီ။",
+"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
+"Lost your password?" => "သင်၏စကားဝှက်ပျောက်သွားပြီလား။",
+"remember" => "မှတ်မိစေသည်",
+"Log in" => "ဝင်ရောက်ရန်",
+"prev" => "ယခင်",
+"next" => "နောက်သို့"
+);
diff --git a/core/templates/exception.php b/core/templates/exception.php
index 62d6cf2ade5..4059c7e047d 100644
--- a/core/templates/exception.php
+++ b/core/templates/exception.php
@@ -5,7 +5,9 @@
<p class="exception">
<?php
if($_['showsysinfo'] == true) {
- echo 'If you would like to support ownCloud\'s developers and report this error in our <a href="https://github.com/owncloud/core">bug tracker</a>, please copy the following informations into the description. <br><br><textarea readonly>';
+ echo 'If you would like to support ownCloud\'s developers and'
+ .' report this error in our <a href="https://github.com/owncloud/core">bug tracker</a>,'
+ .' please copy the following informations into the description. <br><br><textarea readonly>';
echo 'Message: ' . $_['message'] . "\n";
echo 'Error Code: ' . $_['code'] . "\n";
echo 'File: ' . $_['file'] . "\n";
diff --git a/core/templates/installation.php b/core/templates/installation.php
index b3b7cfc4b8b..c48d2f764e7 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -22,7 +22,7 @@
<fieldset class="warning">
<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
<p><?php echo $l->t('No secure random number generator is available, please enable the PHP OpenSSL extension.');?><br/>
- <?php echo $l->t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.');?></p>
+ <?php echo $l->t('Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account.');?></p>
</fieldset>
<?php endif; ?>
<?php if(!$_['htaccessWorking']): ?>
@@ -35,12 +35,14 @@
<fieldset id="adminaccount">
<legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend>
<p class="infield grouptop">
- <input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />
+ <input type="text" name="adminlogin" id="adminlogin"
+ value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />
<label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label>
<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
</p>
<p class="infield groupbottom">
- <input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" />
+ <input type="password" name="adminpass" data-typetoggle="#show" id="adminpass"
+ value="<?php print OC_Helper::init_var('adminpass'); ?>" />
<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
<img class="svg" id="adminpass-icon" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
<input type="checkbox" id="show" name="show" />
@@ -49,15 +51,17 @@
</fieldset>
<fieldset id="datadirField">
- <legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> <img class="svg" src="<?php echo image_path('', 'actions/triangle-s.svg'); ?>" /></a></legend>
+ <legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> <img class="svg" src="<?php echo image_path('', 'actions/caret-dark.svg'); ?>" /></a></legend>
<div id="datadirContent">
<label for="directory"><?php echo $l->t( 'Data folder' ); ?></label>
- <input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" />
+ <input type="text" name="directory" id="directory"
+ value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" />
</div>
</fieldset>
<fieldset id='databaseField'>
- <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
+ <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
+ $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
<legend><?php echo $l->t( 'Configure the database' ); ?></legend>
<div id="selectDbType">
<?php if($_['hasSQLite']): ?>
@@ -66,7 +70,8 @@
<p>SQLite <?php echo $l->t( 'will be used' ); ?>.</p>
<input type="hidden" id="dbtype" name="dbtype" value="sqlite" />
<?php else: ?>
- <input type="radio" name="dbtype" value="sqlite" id="sqlite" <?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/>
+ <input type="radio" name="dbtype" value="sqlite" id="sqlite"
+ <?php OC_Helper::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/>
<label class="sqlite" for="sqlite">SQLite</label>
<?php endif; ?>
<?php endif; ?>
@@ -77,7 +82,8 @@
<p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p>
<input type="hidden" id="dbtype" name="dbtype" value="mysql" />
<?php else: ?>
- <input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/>
+ <input type="radio" name="dbtype" value="mysql" id="mysql"
+ <?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/>
<label class="mysql" for="mysql">MySQL</label>
<?php endif; ?>
<?php endif; ?>
@@ -88,7 +94,8 @@
<input type="hidden" id="dbtype" name="dbtype" value="pgsql" />
<?php else: ?>
<label class="pgsql" for="pgsql">PostgreSQL</label>
- <input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/>
+ <input type="radio" name="dbtype" value='pgsql' id="pgsql"
+ <?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/>
<?php endif; ?>
<?php endif; ?>
@@ -98,7 +105,8 @@
<input type="hidden" id="dbtype" name="dbtype" value="oci" />
<?php else: ?>
<label class="oci" for="oci">Oracle</label>
- <input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
+ <input type="radio" name="dbtype" value='oci' id="oci"
+ <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
<?php endif; ?>
<?php endif; ?>
</div>
@@ -107,15 +115,19 @@
<div id="use_other_db">
<p class="infield grouptop">
<label for="dbuser" class="infield"><?php echo $l->t( 'Database user' ); ?></label>
- <input type="text" name="dbuser" id="dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" autocomplete="off" />
+ <input type="text" name="dbuser" id="dbuser"
+ value="<?php print OC_Helper::init_var('dbuser'); ?>" autocomplete="off" />
</p>
<p class="infield groupmiddle">
<label for="dbpass" class="infield"><?php echo $l->t( 'Database password' ); ?></label>
- <input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" />
+ <input type="password" name="dbpass" id="dbpass"
+ value="<?php print OC_Helper::init_var('dbpass'); ?>" />
</p>
<p class="infield groupmiddle">
<label for="dbname" class="infield"><?php echo $l->t( 'Database name' ); ?></label>
- <input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_-]+" />
+ <input type="text" name="dbname" id="dbname"
+ value="<?php print OC_Helper::init_var('dbname'); ?>"
+ autocomplete="off" pattern="[0-9a-zA-Z$_-]+" />
</p>
</div>
<?php endif; ?>
@@ -123,13 +135,15 @@
<div id="use_oracle_db">
<p class="infield groupmiddle">
<label for="dbtablespace" class="infield"><?php echo $l->t( 'Database tablespace' ); ?></label>
- <input type="text" name="dbtablespace" id="dbtablespace" value="<?php print OC_Helper::init_var('dbtablespace'); ?>" autocomplete="off" />
+ <input type="text" name="dbtablespace" id="dbtablespace"
+ value="<?php print OC_Helper::init_var('dbtablespace'); ?>" autocomplete="off" />
</p>
</div>
<?php endif; ?>
<p class="infield groupbottom">
<label for="dbhost" class="infield" id="dbhostlabel"><?php echo $l->t( 'Database host' ); ?></label>
- <input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" />
+ <input type="text" name="dbhost" id="dbhost"
+ value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" />
</p>
</fieldset>
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 2049bcb36da..4233fd8300e 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -3,7 +3,8 @@
<head>
<title>ownCloud</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+ <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" />
+ <link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
<?php foreach ($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 69330aa9fce..b26020b766b 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -4,7 +4,8 @@
<title>ownCloud</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="apple-itunes-app" content="app-id=543672169">
- <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+ <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" />
+ <link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
<?php foreach($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>
@@ -30,6 +31,7 @@
</div></header>
<?php echo $_['content']; ?>
</div>
- <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; <?php echo $l->t( 'web services under your control' ); ?></p></footer>
+ <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash;
+ <?php echo $l->t( 'web services under your control' ); ?></p></footer>
</body>
</html>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2d00bdb5c8e..d0869cb8404 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -1,10 +1,12 @@
<!DOCTYPE html>
<html>
<head>
- <title><?php echo !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?></title>
+ <title><?php echo !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud
+ <?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="apple-itunes-app" content="app-id=543672169">
- <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+ <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" />
+ <link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
<?php foreach($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>
@@ -27,7 +29,8 @@
<div id="notification"></div>
</div>
<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 href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg"
+ src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
<ul id="settings" class="svg">
<span id="expand">
@@ -37,7 +40,8 @@
<div id="expanddiv">
<?php foreach($_['settingsnavigation'] as $entry):?>
<li>
- <a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
+ <a href="<?php echo $entry['href']; ?>" title=""
+ <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
<img class="svg" alt="" src="<?php echo $entry['icon']; ?>">
<?php echo $entry['name'] ?>
</a>
@@ -45,14 +49,17 @@
<?php endforeach; ?>
<li>
<a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true">
- <img class="svg" alt="" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /> <?php echo $l->t('Log out');?>
+ <img class="svg" alt="" src="<?php echo image_path('', 'actions/logout.svg'); ?>" />
+ <?php echo $l->t('Log out');?>
</a>
</li>
</div>
</ul>
<form class="searchbox" 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 />
+ <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>
</div></header>
@@ -60,7 +67,8 @@
<ul id="apps" class="svg">
<?php foreach($_['navigation'] as $entry): ?>
<li data-id="<?php echo $entry['id']; ?>">
- <a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
+ <a href="<?php echo $entry['href']; ?>" title=""
+ <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
<img class="icon svg" src="<?php echo $entry['icon']; ?>"/>
<?php echo $entry['name']; ?>
</a>
diff --git a/core/templates/update.php b/core/templates/update.php
index ae714dcfb92..685a5536d06 100644
--- a/core/templates/update.php
+++ b/core/templates/update.php
@@ -1,5 +1,6 @@
<ul>
<li class='update'>
- <?php echo $l->t('Updating ownCloud to version %s, this may take a while.', array($_['version'])); ?><br /><br />
+ <?php echo $l->t('Updating ownCloud to version %s, this may take a while.',
+ array($_['version'])); ?><br /><br />
</li>
</ul>
diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po
index 6fd4dfb314f..a79bcc39407 100644
--- a/l10n/af_ZA/files_trashbin.po
+++ b/l10n/af_ZA/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 23:14+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr ""
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 5da0c711520..a937cafae05 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -388,7 +388,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "إعادة تعيين كلمة سر ownCloud"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 35fd5981edb..f05e15fa3ce 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -91,8 +91,8 @@ msgstr "محذوف"
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr ""
@@ -150,74 +150,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr ""
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "إغلق"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr ""
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "الاسم"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "حجم"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "معدل"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr ""
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr ""
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr ""
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr ""
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index a4a00601d16..7bb867f5152 100644
--- a/l10n/ar/files_external.po
+++ b/l10n/ar/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -41,13 +41,13 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -99,7 +99,7 @@ msgid "Users"
msgstr "المستخدمين"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "حذف"
@@ -111,10 +111,10 @@ msgstr ""
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index 174bde4c7f5..3f60e93c503 100644
--- a/l10n/ar/files_trashbin.po
+++ b/l10n/ar/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "اسم"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "إلغاء"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index b4b4bf6b248..56602f28cb1 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -148,23 +148,23 @@ msgstr "مدير المجموعة"
msgid "Delete"
msgstr "حذف"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
diff --git a/l10n/be/files_trashbin.po b/l10n/be/files_trashbin.po
index c9d67b5a277..83bee5fbbdd 100644
--- a/l10n/be/files_trashbin.po
+++ b/l10n/be/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-01-31 16:03+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 23:14+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: be\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr ""
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 06b082dffc5..4b1cd9d3cbc 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 10:30+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -164,55 +164,55 @@ msgstr ""
msgid "Settings"
msgstr "Настройки"
-#: js/js.js:766
+#: js/js.js:767
msgid "seconds ago"
msgstr "преди секунди"
-#: js/js.js:767
+#: js/js.js:768
msgid "1 minute ago"
msgstr "преди 1 минута"
-#: js/js.js:768
+#: js/js.js:769
msgid "{minutes} minutes ago"
msgstr ""
-#: js/js.js:769
+#: js/js.js:770
msgid "1 hour ago"
msgstr "преди 1 час"
-#: js/js.js:770
+#: js/js.js:771
msgid "{hours} hours ago"
msgstr ""
-#: js/js.js:771
+#: js/js.js:772
msgid "today"
msgstr "днес"
-#: js/js.js:772
+#: js/js.js:773
msgid "yesterday"
msgstr "вчера"
-#: js/js.js:773
+#: js/js.js:774
msgid "{days} days ago"
msgstr ""
-#: js/js.js:774
+#: js/js.js:775
msgid "last month"
msgstr "последният месец"
-#: js/js.js:775
+#: js/js.js:776
msgid "{months} months ago"
msgstr ""
-#: js/js.js:776
+#: js/js.js:777
msgid "months ago"
msgstr ""
-#: js/js.js:777
+#: js/js.js:778
msgid "last year"
msgstr "последната година"
-#: js/js.js:778
+#: js/js.js:779
msgid "years ago"
msgstr "последните години"
@@ -255,14 +255,14 @@ msgstr ""
msgid "The required file {file} is not installed!"
msgstr ""
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Share"
-msgstr "Споделяне"
-
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+#: js/share.js:29 js/share.js:43 js/share.js:90
msgid "Shared"
msgstr ""
+#: js/share.js:93
+msgid "Share"
+msgstr "Споделяне"
+
#: js/share.js:141 js/share.js:622
msgid "Error while sharing"
msgstr ""
@@ -390,7 +390,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr ""
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 449ff417fa1..36e54d43675 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -92,8 +92,8 @@ msgstr "Изтриване"
msgid "Rename"
msgstr "Преименуване"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Чакащо"
@@ -151,74 +151,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Възникна грешка при качването"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Затвори"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr ""
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Качването е спряно."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Име"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Размер"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Променено"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 папка"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} папки"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 файл"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} файла"
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index 66a058cb877..730475e3a93 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 10:20+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -42,13 +42,13 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:405
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:406
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -116,6 +116,6 @@ msgstr "Позволено е на потребителите да ползва
msgid "SSL root certificates"
msgstr "SSL основни сертификати"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Импортиране на основен сертификат"
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index f46acd62e56..dd306b39a67 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 17:50+0000\n"
-"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Невъзможно изтриване на %s завинаги"
@@ -28,35 +28,39 @@ msgstr "Невъзможно изтриване на %s завинаги"
msgid "Couldn't restore %s"
msgstr "Невъзможно възтановяване на %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "извършване на действие по възтановяване"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "изтриване на файла завинаги"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Име"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Изтрито"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 папка"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} папки"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 файл"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} файла"
@@ -67,3 +71,7 @@ msgstr "Няма нищо. Кофата е празна!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Възтановяване"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Изтриване"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index c68881f51e6..7bd0ad9f68c 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 17:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -164,7 +164,7 @@ msgstr ""
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 924aa6894fe..4bac9a5d5fb 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -388,7 +388,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud কূটশব্দ পূনঃনির্ধারণ"
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 929307cb9cb..48aea946563 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -91,8 +91,8 @@ msgstr "মুছে ফেল"
msgid "Rename"
msgstr "পূনঃনামকরণ"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "মুলতুবি"
@@ -150,74 +150,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "আপনার ফাইলটি আপলোড করা সম্ভব হলো না, কেননা এটি হয় একটি ফোল্ডার কিংবা এর আকার ০ বাইট"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "আপলোড করতে সমস্যা "
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "বন্ধ"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "১টি ফাইল আপলোড করা হচ্ছে"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} টি ফাইল আপলোড করা হচ্ছে"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "আপলোড বাতিল করা হয়েছে।"
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।"
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL ফাঁকা রাখা যাবে না।"
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud এর জন্য সংরক্ষিত।"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "নাম"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "আকার"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "পরিবর্তিত"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "১টি ফোল্ডার"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} টি ফোল্ডার"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "১টি ফাইল"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} টি ফাইল"
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index fc11b94750f..f8a2b408783 100644
--- a/l10n/bn_BD/files_external.po
+++ b/l10n/bn_BD/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 10:28+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -41,13 +41,13 @@ msgstr "দয়া করে সঠিক এবং বৈধ Dropbox app key and
msgid "Error configuring Google Drive storage"
msgstr "Google Drive সংরক্ষণাগার নির্ধারণ করতে সমস্যা "
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -115,6 +115,6 @@ msgstr "ব্যবহারকারীদেরকে তাদের নি
msgid "SSL root certificates"
msgstr "SSL রুট সনদপত্র"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "রুট সনদপত্রটি আমদানি করুন"
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index b2577e03d2d..d6a3063e74d 100644
--- a/l10n/bn_BD/files_trashbin.po
+++ b/l10n/bn_BD/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "রাম"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "১টি ফোল্ডার"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} টি ফোল্ডার"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "১টি ফাইল"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} টি ফাইল"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "মুছে"
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index a188eabb80b..5850b134d9e 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -146,23 +146,23 @@ msgstr "গোষ্ঠী প্রশাসক"
msgid "Delete"
msgstr "মুছে ফেল"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 54541ac94e7..9e4d8021767 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -389,7 +389,7 @@ msgstr "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "L'actualització ha estat correcte. Ara sou redireccionat a ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "estableix de nou la contrasenya Owncloud"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index e1b0cc93f87..081664ec16b 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-17 00:24+0100\n"
-"PO-Revision-Date: 2013-02-16 11:00+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -97,8 +97,8 @@ msgstr "Suprimeix"
msgid "Rename"
msgstr "Reanomena"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Pendents"
@@ -156,74 +156,74 @@ msgstr "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden ac
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Error en la pujada"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Tanca"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 fitxer pujant"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} fitxers en pujada"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "La pujada s'ha cancel·lat."
-#: js/files.js:496
+#: js/files.js:497
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:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "La URL no pot ser buida"
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nom"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Mida"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 carpeta"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} carpetes"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 fitxer"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} fitxers"
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index 6d1515e0ba9..f8321df44f6 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
-"PO-Revision-Date: 2012-12-13 09:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -42,13 +42,13 @@ msgstr "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox"
msgid "Error configuring Google Drive storage"
msgstr "Error en configurar l'emmagatzemament Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Avís:</b> \"smbclient\" no està instal·lat. No es pot muntar la compartició CIFS/SMB. Demaneu a l'administrador del sistema que l'instal·li."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -100,7 +100,7 @@ msgid "Users"
msgstr "Usuaris"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Elimina"
@@ -112,10 +112,10 @@ msgstr "Habilita l'emmagatzemament extern d'usuari"
msgid "Allow users to mount their own external storage"
msgstr "Permet als usuaris muntar el seu emmagatzemament extern propi"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "Certificats SSL root"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importa certificat root"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index 7f76de9cd68..616424f0f79 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:50+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "No s'ha pogut esborrar permanentment %s"
@@ -28,35 +28,39 @@ msgstr "No s'ha pogut esborrar permanentment %s"
msgid "Couldn't restore %s"
msgstr "No s'ha pogut restaurar %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "executa l'operació de restauració"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "esborra el fitxer permanentment"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Esborra permanentment"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nom"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Eliminat"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 carpeta"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} carpetes"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 fitxer"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} fitxers"
@@ -67,3 +71,7 @@ msgstr "La paperera està buida!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Recupera"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Esborra"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 1086f12301d..48636fedb10 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 11:54+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index a4e90321e76..b8c1d4424b3 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+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"
@@ -390,7 +390,7 @@ msgstr "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a hre
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizace byla úspěšná. Přesměrovávám na ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Obnovení hesla pro ownCloud"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 6ce25474a98..5ec7e84e4f3 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-16 00:04+0100\n"
-"PO-Revision-Date: 2013-02-15 06:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+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"
@@ -93,8 +93,8 @@ msgstr "Smazat"
msgid "Rename"
msgstr "Přejmenovat"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Čekající"
@@ -152,74 +152,74 @@ msgstr "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubo
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Vaše úložiště je téměř plné ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké může to chvíli trvat."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Chyba odesílání"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Zavřít"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "odesílá se 1 soubor"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "odesílám {count} souborů"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Odesílání zrušeno."
-#: js/files.js:496
+#: js/files.js:497
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:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL nemůže být prázdná"
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Neplatný název složky. Použití 'Shared' je rezervováno pro vnitřní potřeby Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Název"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Velikost"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Změněno"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 složka"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} složky"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 soubor"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} soubory"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 240ba178d3b..288ea865c54 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.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-12-14 00:16+0100\n"
-"PO-Revision-Date: 2012-12-13 08:56+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+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"
@@ -45,13 +45,13 @@ msgstr "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbo
msgid "Error configuring Google Drive storage"
msgstr "Chyba při nastavení úložiště Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Varování:</b> není nainstalován program \"smbclient\". Není možné připojení oddílů CIFS/SMB. Prosím požádejte svého správce systému ať jej nainstaluje."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -103,7 +103,7 @@ msgid "Users"
msgstr "Uživatelé"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Smazat"
@@ -115,10 +115,10 @@ msgstr "Zapnout externí uživatelské úložiště"
msgid "Allow users to mount their own external storage"
msgstr "Povolit uživatelům připojení jejich vlastních externích úložišť"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "Kořenové certifikáty SSL"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importovat kořenového certifikátu"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index 2052a139930..49cec94198c 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Nelze trvale odstranit %s"
@@ -28,35 +28,39 @@ msgstr "Nelze trvale odstranit %s"
msgid "Couldn't restore %s"
msgstr "Nelze obnovit %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "provést obnovu"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "trvale odstranit soubor"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Trvale odstranit"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Název"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Smazáno"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 složka"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} složky"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 soubor"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} soubory"
@@ -67,3 +71,7 @@ msgstr "Žádný obsah. Váš koš je prázdný."
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Obnovit"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Smazat"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 53e522dab19..d67441fb22d 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: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -151,23 +151,23 @@ msgstr "Správa skupiny"
msgid "Delete"
msgstr "Smazat"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr "přidat skupinu"
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr "Musíte zadat platné uživatelské jméno"
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr "Chyba při vytváření užiatele"
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr "Musíte zadat platné heslo"
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Česky"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 47ae7bf3dd1..78d2ab1b2a7 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: Frederik Lassen <frederiklassen@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -396,7 +396,7 @@ msgstr "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Nulstil ownCloud kodeord"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 963b1c45578..ccddf0d9c47 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -99,8 +99,8 @@ msgstr "Slet"
msgid "Rename"
msgstr "Omdøb"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Afventer"
@@ -158,74 +158,74 @@ msgstr "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkron
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Kunne ikke uploade din fil, da det enten er en mappe eller er tom"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Fejl ved upload"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Luk"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 fil uploades"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} filer uploades"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Upload afbrudt."
-#: js/files.js:496
+#: js/files.js:497
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:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URLen kan ikke være tom."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Navn"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Størrelse"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Ændret"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 mappe"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} mapper"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 fil"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} filer"
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index d21b07f05e6..3771fc373df 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-24 00:10+0100\n"
-"PO-Revision-Date: 2012-12-23 21:47+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: cronner <cronner@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -44,13 +44,13 @@ msgstr "Angiv venligst en valid Dropbox app nøgle og hemmelighed"
msgid "Error configuring Google Drive storage"
msgstr "Fejl ved konfiguration af Google Drive plads"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b> Advarsel: </ b> \"smbclient\" ikke er installeret. Montering af CIFS / SMB delinger er ikke muligt. Spørg din systemadministrator om at installere det."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -118,6 +118,6 @@ msgstr "Tillad brugere at montere deres egne eksterne opbevaring"
msgid "SSL root certificates"
msgstr "SSL-rodcertifikater"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importer rodcertifikat"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 4e37f67f5b4..0c0c7a71eb3 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Frederik Lassen <frederiklassen@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Kunne ikke slette %s permanent"
@@ -28,35 +28,39 @@ msgstr "Kunne ikke slette %s permanent"
msgid "Couldn't restore %s"
msgstr "Kunne ikke gendanne %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "udfør gendannelsesoperation"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "slet fil permanent"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Slet permanent"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Navn"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Slettet"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 mappe"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} mapper"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 fil"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} filer"
@@ -67,3 +71,7 @@ msgstr "Intet at se her. Din papirkurv er tom!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Gendan"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Slet"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index a5284005df8..13bcee3ab4e 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -156,23 +156,23 @@ msgstr "Gruppe Administrator"
msgid "Delete"
msgstr "Slet"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Dansk"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index bb7deec1e67..7439a612da6 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -19,12 +19,13 @@
# Susi <>, 2012.
# <thomas.mueller@tmit.eu>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
+# Tristan <blobbyjj@ymail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 14:10+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -36,26 +37,26 @@ msgstr ""
#: ajax/share.php:85
#, php-format
msgid "User %s shared a file with you"
-msgstr "Der Nutzer %s hat eine Datei mit dir geteilt"
+msgstr "Der Nutzer %s hat eine Datei mit Dir geteilt"
#: ajax/share.php:87
#, php-format
msgid "User %s shared a folder with you"
-msgstr "%s hat ein Verzeichnis mit dir geteilt"
+msgstr "%s hat ein Verzeichnis mit Dir geteilt"
#: ajax/share.php:89
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr "%s hat die Datei \"%s\" mit dir geteilt. Sie ist hier zum Download verfügbar: %s"
+msgstr "%s hat die Datei \"%s\" mit Dir geteilt. Sie ist hier zum Download verfügbar: %s"
#: ajax/share.php:91
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr "%s hat den Ordner \"%s\" mit dir geteilt. Er ist hier zum Download verfügbar: %s"
+msgstr "%s hat den Ordner \"%s\" mit Dir geteilt. Er ist hier zum Download verfügbar: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -289,11 +290,11 @@ msgstr "Fehler beim Ändern der Rechte"
#: js/share.js:168
msgid "Shared with you and the group {group} by {owner}"
-msgstr "{owner} hat dies mit dir und der Gruppe {group} geteilt"
+msgstr "{owner} hat dies mit Dir und der Gruppe {group} geteilt"
#: js/share.js:170
msgid "Shared with you by {owner}"
-msgstr "{owner} hat dies mit dir geteilt"
+msgstr "{owner} hat dies mit Dir geteilt"
#: js/share.js:175
msgid "Share with"
@@ -301,7 +302,7 @@ msgstr "Teilen mit"
#: js/share.js:180
msgid "Share with link"
-msgstr "Über einen Link teilen"
+msgstr "Über einen Link freigegeben"
#: js/share.js:183
msgid "Password protect"
@@ -345,7 +346,7 @@ msgstr "Für {user} in {item} freigegeben"
#: js/share.js:313
msgid "Unshare"
-msgstr "Teilung aufheben"
+msgstr "Freigabe aufheben"
#: js/share.js:325
msgid "can edit"
@@ -402,7 +403,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud-Passwort zurücksetzen"
@@ -503,7 +504,7 @@ msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage di
msgid ""
"Your data directory and files are probably accessible from the internet "
"because the .htaccess file does not work."
-msgstr "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
+msgstr "Dein Datenverzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
#: templates/installation.php:32
msgid ""
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 2acad72935f..845953894a2 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -28,9 +28,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 13:50+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -111,8 +111,8 @@ msgstr "Löschen"
msgid "Rename"
msgstr "Umbenennen"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Ausstehend"
@@ -170,74 +170,74 @@ msgstr "Ihr Speicherplatz ist voll, Dateien können nicht mehr aktualisiert oder
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ihr Speicherplatz ist fast aufgebraucht ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist."
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Fehler beim Upload"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Schließen"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "Eine Datei wird hoch geladen"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} Dateien werden hochgeladen"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Upload abgebrochen."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "Die URL darf nicht leer sein."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten."
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Name"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Größe"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Bearbeitet"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 Ordner"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} Ordner"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 Datei"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} Dateien"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index c8d7b8f8e41..afa4bd90b6d 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -12,10 +12,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 13:57+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -46,13 +46,13 @@ msgstr "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein."
msgid "Error configuring Google Drive storage"
msgstr "Fehler beim Einrichten von Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Administrator, dies zu installieren."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -120,6 +120,6 @@ msgstr "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden"
msgid "SSL root certificates"
msgstr "SSL-Root-Zertifikate"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index 1aa1fd8154b..4d4dac598fb 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.po
@@ -5,14 +5,15 @@
# Translators:
# I Robot <owncloud-bot@tmit.eu>, 2013.
# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
+# Tristan <blobbyjj@ymail.com>, 2013.
# <wachhund@wachhund.to>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 14:23+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,45 +21,49 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
-msgstr "Konnte %s nicht permanent löschen"
+msgstr "Konnte %s nicht dauerhaft löschen"
#: ajax/undelete.php:41
#, php-format
msgid "Couldn't restore %s"
msgstr "Konnte %s nicht wiederherstellen"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "Wiederherstellung ausführen"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
-msgstr "Datei permanent löschen"
+msgstr "Datei dauerhaft löschen"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Permanent löschen"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Name"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "gelöscht"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 Ordner"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} Ordner"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 Datei"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} Dateien"
@@ -69,3 +74,7 @@ msgstr "Nichts zu löschen, der Papierkorb ist leer!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Wiederherstellen"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Löschen"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index ba89f5ea5fe..65f4c411198 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -10,13 +10,14 @@
# Phi Lieb <>, 2012.
# <thomas.mueller@tmit.eu>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
+# Tristan <blobbyjj@ymail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 14:10+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 22:10+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -66,7 +67,7 @@ msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
#: helper.php:228
msgid "couldn't be determined"
-msgstr "Konnte nicht festgestellt werden"
+msgstr "konnte nicht festgestellt werden"
#: json.php:28
msgid "Application is not enabled"
@@ -102,7 +103,7 @@ msgstr "Setze Administrator Passwort"
#: setup.php:40
msgid "Specify a data folder."
-msgstr "Datei-Verzeichnis angeben"
+msgstr "Datei-Verzeichnis angeben."
#: setup.php:53
#, php-format
@@ -171,7 +172,7 @@ msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
#: setup.php:280
msgid "Drop this user from MySQL."
-msgstr "Lösche diesen Benutzer von MySQL."
+msgstr "Lösche diesen Benutzer aus MySQL."
#: setup.php:553 setup.php:585
#, php-format
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 736ddb0719b..f9622c98eb5 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -26,9 +26,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 14:31+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -195,7 +195,7 @@ msgid ""
"strongly suggest that you configure your webserver in a way that the data "
"directory is no longer accessible or you move the data directory outside the"
" webserver document root."
-msgstr "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass du deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass du dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst."
+msgstr "Dein Datenverzeichnis und Deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass Du Deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass Du Dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst."
#: templates/admin.php:29
msgid "Setup Warning"
@@ -246,7 +246,7 @@ msgid ""
"remote and sending of notification emails might also not work. We suggest to"
" enable internet connection for this server if you want to have all features"
" of ownCloud."
-msgstr "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen."
+msgstr "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Du alle Funktionen von ownCloud nutzen möchtest."
#: templates/admin.php:89
msgid "Cron"
@@ -278,7 +278,7 @@ msgstr "Aktiviere Sharing-API"
#: templates/admin.php:132
msgid "Allow apps to use the Share API"
-msgstr "Erlaube Apps die Nutzung der Sharing-API"
+msgstr "Erlaube Apps die Nutzung der Share-API"
#: templates/admin.php:139
msgid "Allow links"
@@ -329,7 +329,7 @@ msgstr "Log"
#: templates/admin.php:193
msgid "Log level"
-msgstr "Logtiefe"
+msgstr "Loglevel"
#: templates/admin.php:220
msgid "More"
@@ -404,7 +404,7 @@ msgstr "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>"
#: templates/personal.php:14
msgid "Get the apps to sync your files"
-msgstr "Laden Sie die Apps zur Synchronisierung ihrer Daten herunter"
+msgstr "Lade die Apps zur Synchronisierung Deiner Daten herunter"
#: templates/personal.php:25
msgid "Show First Run Wizard again"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 431c6be2aee..5bab82f9cbf 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -12,13 +12,14 @@
# Phi Lieb <>, 2012.
# Susi <>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
+# Tristan <blobbyjj@ymail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 14:20+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 22:10+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -89,7 +90,7 @@ msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkom
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
-msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte deinen Systemadministrator das Modul zu installieren."
+msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren."
#: templates/settings.php:15
msgid "Server configuration"
@@ -203,7 +204,7 @@ msgstr "Backup Host (Kopie)"
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
-msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine kopie des Haupt LDAP/AD Servers handeln."
+msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
#: templates/settings.php:60
msgid "Backup (Replica) Port"
@@ -215,7 +216,7 @@ msgstr "Hauptserver deaktivieren"
#: templates/settings.php:61
msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Wenn aktiviert wird ownCloud ausschließlich den Backupserver verwenden"
+msgstr "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden."
#: templates/settings.php:62
msgid "Use TLS"
@@ -223,7 +224,7 @@ msgstr "Nutze TLS"
#: templates/settings.php:62
msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr "Benutze es nicht zusätzlich für LDAPS Verbindungen, es wird scheitern."
+msgstr "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen."
#: templates/settings.php:63
msgid "Case insensitve LDAP server (Windows)"
@@ -273,7 +274,7 @@ msgstr "Benutzersucheigenschaften"
#: templates/settings.php:71 templates/settings.php:74
msgid "Optional; one attribute per line"
-msgstr "Optional, eine Eigenschaft pro Zeile"
+msgstr "Optional; eine Eigenschaft pro Zeile"
#: templates/settings.php:72
msgid "Group Display Name Field"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index 139f573438e..d2653f16859 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 13:50+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 22:10+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index b471458f11d..c0688e3ecc4 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -22,12 +22,13 @@
# Susi <>, 2013.
# <thomas.mueller@tmit.eu>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
+# Tristan <blobbyjj@ymail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-17 00:25+0100\n"
-"PO-Revision-Date: 2013-02-16 23:00+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
@@ -348,7 +349,7 @@ msgstr "Freigegeben in {item} von {user}"
#: js/share.js:313
msgid "Unshare"
-msgstr "Teilung aufheben"
+msgstr "Freigabe aufheben"
#: js/share.js:325
msgid "can edit"
@@ -399,13 +400,13 @@ msgid ""
"The update was unsuccessful. Please report this issue to the <a "
"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
"community</a>."
-msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Gemeinschaft</a>."
+msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
#: js/update.js:18
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud-Passwort zurücksetzen"
@@ -506,7 +507,7 @@ msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, d
msgid ""
"Your data directory and files are probably accessible from the internet "
"because the .htaccess file does not work."
-msgstr "Dein Daten-Verzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
+msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
#: templates/installation.php:32
msgid ""
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 192ed3dbb85..770efa36492 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -28,13 +28,14 @@
# <thomas.mueller@tmit.eu>, 2012.
# Thomas Müller <>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
+# Tristan <blobbyjj@ymail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-17 00:24+0100\n"
-"PO-Revision-Date: 2013-02-16 16:30+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-02-23 00:04+0100\n"
+"PO-Revision-Date: 2013-02-22 23:00+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -75,27 +76,27 @@ msgid ""
"the HTML form"
msgstr "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
-#: ajax/upload.php:31
+#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
msgstr "Die Datei wurde nur teilweise hochgeladen."
-#: ajax/upload.php:32
+#: ajax/upload.php:31
msgid "No file was uploaded"
msgstr "Es wurde keine Datei hochgeladen."
-#: ajax/upload.php:33
+#: ajax/upload.php:32
msgid "Missing a temporary folder"
msgstr "Der temporäre Ordner fehlt."
-#: ajax/upload.php:34
+#: ajax/upload.php:33
msgid "Failed to write to disk"
msgstr "Fehler beim Schreiben auf die Festplatte"
-#: ajax/upload.php:52
+#: ajax/upload.php:51
msgid "Not enough storage available"
msgstr "Nicht genug Speicher vorhanden."
-#: ajax/upload.php:83
+#: ajax/upload.php:82
msgid "Invalid directory."
msgstr "Ungültiges Verzeichnis."
@@ -115,8 +116,8 @@ msgstr "Löschen"
msgid "Rename"
msgstr "Umbenennen"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Ausstehend"
@@ -150,7 +151,7 @@ msgstr "{old_name} wurde ersetzt durch {new_name}"
#: js/filelist.js:322
msgid "perform delete operation"
-msgstr "Führe das Löschen aus"
+msgstr "führe das Löschen aus"
#: js/files.js:52
msgid "'.' is an invalid file name."
@@ -174,74 +175,74 @@ msgstr "Ihr Speicher ist voll. Daher können keine Dateien mehr aktualisiert ode
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien einen Moment dauern."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist."
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Fehler beim Upload"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Schließen"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 Datei wird hochgeladen"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} Dateien wurden hochgeladen"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Upload abgebrochen."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "Die URL darf nicht leer sein."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Name"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Größe"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Bearbeitet"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 Ordner"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} Ordner"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 Datei"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} Dateien"
@@ -337,4 +338,4 @@ msgstr "Scanne"
#: templates/upgrade.php:2
msgid "Upgrading filesystem cache..."
-msgstr "Aktualisiere den Dateisystem-Cache"
+msgstr "Aktualisiere den Dateisystem-Cache..."
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 6567207b387..d3157565c01 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -12,10 +12,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 13:57+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
+"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -46,13 +46,13 @@ msgstr "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein."
msgid "Error configuring Google Drive storage"
msgstr "Fehler beim Einrichten von Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -120,6 +120,6 @@ msgstr "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden"
msgid "SSL root certificates"
msgstr "SSL-Root-Zertifikate"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index 0a68526442b..c07b5d37fdd 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -3,18 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Andreas Tangemann <a.tangemann@web.de>, 2013.
# I Robot <owncloud-bot@tmit.eu>, 2013.
# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
# Phillip Schichtel <quick_wango@code-infection.de>, 2013.
# <stefan.niedermann@googlemail.com>, 2013.
# Susi <>, 2013.
+# Tristan <blobbyjj@ymail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-17 00:24+0100\n"
-"PO-Revision-Date: 2013-02-16 13:51+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-02-23 00:04+0100\n"
+"PO-Revision-Date: 2013-02-22 23:00+0000\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,45 +24,49 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
-msgstr "Konnte %s nicht entgültig löschen"
+msgstr "Konnte %s nicht dauerhaft löschen"
#: ajax/undelete.php:41
#, php-format
msgid "Couldn't restore %s"
msgstr "Konnte %s nicht wiederherstellen"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "Wiederherstellung ausführen"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
-msgstr "Datei entgültig löschen"
+msgstr "Datei dauerhaft löschen"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Endgültig löschen"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Name"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Gelöscht"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 Ordner"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} Ordner"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 Datei"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} Dateien"
@@ -71,3 +77,7 @@ msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Wiederherstellen"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Löschen"
diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po
index a9ddf034b67..e28090ad621 100644
--- a/l10n/de_DE/files_versions.po
+++ b/l10n/de_DE/files_versions.po
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-17 00:24+0100\n"
-"PO-Revision-Date: 2013-02-16 23:10+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 22:16+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 1d9413b7ea7..1cbf04792da 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -13,13 +13,14 @@
# <stefan.niedermann@googlemail.com>, 2013.
# <thomas.mueller@tmit.eu>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
+# Tristan <blobbyjj@ymail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-16 23:30+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 22:20+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -165,7 +166,7 @@ msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
#: setup.php:274
msgid "Drop this user from MySQL"
-msgstr "Lösche diesen Benutzer von MySQL"
+msgstr "Lösche diesen Benutzer aus MySQL"
#: setup.php:279
#, php-format
@@ -174,7 +175,7 @@ msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
#: setup.php:280
msgid "Drop this user from MySQL."
-msgstr "Lösche diesen Benutzer von MySQL."
+msgstr "Lösche diesen Benutzer aus MySQL."
#: setup.php:553 setup.php:585
#, php-format
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index ad5f7571a56..50671e6da64 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -30,9 +30,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 14:18+0000\n"
-"Last-Translator: robN <robert.neumann01@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -236,7 +236,7 @@ msgid ""
"\"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with"
" certain characters in file names. We strongly suggest to install the "
"required packages on your system to support en_US.UTF-8/en_US.UTF8."
-msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf ihrem System zu installieren."
+msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen im Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf Ihrem System zu installieren."
#: templates/admin.php:72
msgid "Internet connection not working"
@@ -250,7 +250,7 @@ msgid ""
"remote and sending of notification emails might also not work. We suggest to"
" enable internet connection for this server if you want to have all features"
" of ownCloud."
-msgstr "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen."
+msgstr "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen."
#: templates/admin.php:89
msgid "Cron"
@@ -278,11 +278,11 @@ msgstr "Teilen"
#: templates/admin.php:131
msgid "Enable Share API"
-msgstr "Teilen-API aktivieren"
+msgstr "Share-API aktivieren"
#: templates/admin.php:132
msgid "Allow apps to use the Share API"
-msgstr "Erlaube es Anwendungen, die Teilen-API zu benutzen"
+msgstr "Erlaube es Anwendungen, die Share-API zu benutzen"
#: templates/admin.php:139
msgid "Allow links"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 90f63eae9cd..ad21db5c687 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -15,13 +15,14 @@
# Susi <>, 2013.
# <transifex-2.7.mensaje@spamgourmet.com>, 2012.
# <transifex.3.mensaje@spamgourmet.com>, 2012.
+# Tristan <blobbyjj@ymail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 14:19+0000\n"
-"Last-Translator: robN <robert.neumann01@gmail.com>\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 22:20+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -226,7 +227,7 @@ msgstr "Nutze TLS"
#: templates/settings.php:62
msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr "Benutzen Sie es nicht zusätzlich für LDAPS Verbindungen, es wird fehlschlagen."
+msgstr "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen."
#: templates/settings.php:63
msgid "Case insensitve LDAP server (Windows)"
@@ -276,7 +277,7 @@ msgstr "Benutzer-Suche Eigenschaften"
#: templates/settings.php:71 templates/settings.php:74
msgid "Optional; one attribute per line"
-msgstr "Optional; Ein Attribut pro Zeile"
+msgstr "Optional; ein Attribut pro Zeile"
#: templates/settings.php:72
msgid "Group Display Name Field"
diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po
index 3592cedb142..d9d63ec77e5 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-17 00:24+0100\n"
-"PO-Revision-Date: 2013-02-16 14:00+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 22:13+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index acf7f9910bb..b3849cc5963 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 12:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -395,7 +395,7 @@ msgstr "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ σ
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Επαναφορά συνθηματικού ownCloud"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 0a760250dd7..dff58d767e8 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 12:10+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -98,8 +98,8 @@ msgstr "Διαγραφή"
msgid "Rename"
msgstr "Μετονομασία"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Εκκρεμεί"
@@ -157,74 +157,74 @@ msgstr "Ο αποθηκευτικός σας χώρος είναι γεμάτο
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Σφάλμα Αποστολής"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Κλείσιμο"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 αρχείο ανεβαίνει"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} αρχεία ανεβαίνουν"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Η αποστολή ακυρώθηκε."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "Η URL δεν πρέπει να είναι κενή."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Όνομα"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Μέγεθος"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Τροποποιήθηκε"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 φάκελος"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} φάκελοι"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 αρχείο"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} αρχεία"
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index f72135ae53a..4f5d78808b0 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-22 00:24+0100\n"
-"PO-Revision-Date: 2012-12-21 13:41+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -47,13 +47,13 @@ msgstr "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox κα
msgid "Error configuring Google Drive storage"
msgstr "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive "
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Προσοχή:</b> Ο \"smbclient\" δεν εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση CIFS/SMB. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -121,6 +121,6 @@ msgstr "Να επιτρέπεται στους χρήστες να προσαρ
msgid "SSL root certificates"
msgstr "Πιστοποιητικά SSL root"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Εισαγωγή Πιστοποιητικού Root"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index e8ac463bd2b..3976247d3e6 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Dimitris M. <monopatis@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Αδύνατη η μόνιμη διαγραφή του %s"
@@ -28,35 +28,39 @@ msgstr "Αδύνατη η μόνιμη διαγραφή του %s"
msgid "Couldn't restore %s"
msgstr "Αδυναμία επαναφοράς %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "εκτέλεση λειτουργία επαναφοράς"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "μόνιμη διαγραφή αρχείου"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Μόνιμη διαγραφή"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Όνομα"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Διαγράφηκε"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 φάκελος"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} φάκελοι"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 αρχείο"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} αρχεία"
@@ -67,3 +71,7 @@ msgstr "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είνα
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Επαναφορά"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Διαγραφή"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index d86b53331ac..4867a90baf0 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
-"PO-Revision-Date: 2013-02-19 22:10+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index d1572f084cb..e53e6244654 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -389,7 +389,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "La pasvorto de ownCloud restariĝis."
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 928c408fa28..e1072165f6a 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -93,8 +93,8 @@ msgstr "Forigi"
msgid "Rename"
msgstr "Alinomigi"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Traktotaj"
@@ -152,74 +152,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Alŝuta eraro"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Fermi"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 dosiero estas alŝutata"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} dosieroj alŝutatas"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "La alŝuto nuliĝis."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL ne povas esti malplena."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud."
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nomo"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Grando"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Modifita"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 dosierujo"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} dosierujoj"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 dosiero"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} dosierujoj"
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index 5d494ccfa34..42a43799650 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -42,13 +42,13 @@ msgstr "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan."
msgid "Error configuring Google Drive storage"
msgstr "Eraro dum agordado de la memorservo Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -100,7 +100,7 @@ msgid "Users"
msgstr "Uzantoj"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Forigi"
@@ -112,10 +112,10 @@ msgstr "Kapabligi malenan memorilon de uzanto"
msgid "Allow users to mount their own external storage"
msgstr "Permesi al uzantoj surmeti siajn proprajn malenajn memorilojn"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "Radikaj SSL-atestoj"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Enporti radikan ateston"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index ba5bf42fbc6..54c8bebce85 100644
--- a/l10n/eo/files_trashbin.po
+++ b/l10n/eo/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nomo"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 dosierujo"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} dosierujoj"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 dosiero"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} dosierujoj"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Restaŭri"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Forigi"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index ef4116c62d6..e12b2d0e342 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -148,23 +148,23 @@ msgstr "Grupadministranto"
msgid "Delete"
msgstr "Forigi"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Esperanto"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 3796ea9a99c..4c2b388f90a 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: juanman <juanma@kde.org.ar>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -400,7 +400,7 @@ msgstr "La actualización ha fracasado. Por favor, informe este problema a la <a
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La actualización se ha realizado correctamente. Redireccionando a ownCloud ahora."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Reiniciar contraseña de ownCloud"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index b6eac42de36..580d2e0c89e 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -101,8 +101,8 @@ msgstr "Eliminar"
msgid "Rename"
msgstr "Renombrar"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Pendiente"
@@ -160,74 +160,74 @@ msgstr "Su almacenamiento esta lleno, los archivos no pueden ser mas actualizado
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Su almacenamiento esta lleno en un ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Error al subir el archivo"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "cerrrar"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "subiendo 1 archivo"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "Subiendo {count} archivos"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Subida cancelada."
-#: js/files.js:496
+#: js/files.js:497
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:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "La URL no puede estar vacía."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nombre"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 carpeta"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} carpetas"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 archivo"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} archivos"
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index 6d0ea098b1b..b25998742c9 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.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-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:44+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -45,13 +45,13 @@ msgstr "Por favor , proporcione un secreto y una contraseña válida de la app D
msgid "Error configuring Google Drive storage"
msgstr "Error configurando el almacenamiento de Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -103,7 +103,7 @@ msgid "Users"
msgstr "Usuarios"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Eliiminar"
@@ -115,10 +115,10 @@ msgstr "Habilitar almacenamiento de usuario externo"
msgid "Allow users to mount their own external storage"
msgstr "Permitir a los usuarios montar su propio almacenamiento externo"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "Raíz de certificados SSL "
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importar certificado raíz"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index a2db3d575ee..25c84423257 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: msvladimir <vladimirmartinezsierra@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "No se puede eliminar %s permanentemente"
@@ -28,35 +28,39 @@ msgstr "No se puede eliminar %s permanentemente"
msgid "Couldn't restore %s"
msgstr "No se puede restaurar %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "Restaurar"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "Eliminar archivo permanentemente"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Eliminar permanentemente"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nombre"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Eliminado"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 carpeta"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} carpetas"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 archivo"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} archivos"
@@ -67,3 +71,7 @@ msgstr "Nada aqui. La papelera esta vacia!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Recuperar"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Eliminar"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 468cd0acfc3..23e3b3bd63f 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -4,11 +4,13 @@
#
# Translators:
# Art O. Pal <artopal@fastmail.fm>, 2012.
+# Daniel Manterola <daniel_manterola@dfml.cl>, 2013.
# <davidlopez.david@gmail.com>, 2012.
# Javier Llorente <javier@opensuse.org>, 2012.
# <juanma@kde.org.ar>, 2011-2012.
# <monty_2731@hotmail.com>, 2011.
# oSiNaReF <>, 2012.
+# <pedro.navia@etecsa.cu>, 2013.
# <pggx999@gmail.com>, 2012.
# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
# <rodrigo.calvo@gmail.com>, 2012.
@@ -20,9 +22,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-23 00:04+0100\n"
+"PO-Revision-Date: 2013-02-22 20:50+0000\n"
+"Last-Translator: dfml <daniel_manterola@dfml.cl>\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"
@@ -34,8 +36,8 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Imposible cargar la lista desde el App Store"
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Error de autenticación"
@@ -83,12 +85,12 @@ msgstr "Solicitud no válida"
msgid "Admins can't remove themself from the admin group"
msgstr "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador"
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
#, php-format
msgid "Unable to add user to group %s"
msgstr "Imposible añadir el usuario al grupo %s"
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
#, php-format
msgid "Unable to remove user from group %s"
msgstr "Imposible eliminar al usuario del grupo %s"
@@ -143,7 +145,7 @@ msgstr "deshacer"
#: js/users.js:62
msgid "Unable to remove user"
-msgstr ""
+msgstr "No se puede quitar el usuario"
#: js/users.js:75 templates/users.php:26 templates/users.php:80
#: templates/users.php:105
@@ -158,23 +160,23 @@ msgstr "Grupo admin"
msgid "Delete"
msgstr "Eliminar"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
-msgstr ""
+msgstr "Añadir Grupo"
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
-msgstr ""
+msgstr "Se debe usar un nombre de usuario valido"
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
-msgstr ""
+msgstr "Error al crear usuario"
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
-msgstr ""
+msgstr "Se debe usar una contraseña valida"
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Castellano"
@@ -189,11 +191,11 @@ 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 "Su directorio de datos y sus archivos están probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Sugerimos fuertemente que configure su servidor web de manera que el directorio de datos ya no esté accesible o mueva el directorio de datos fuera del documento raíz de su servidor web."
+msgstr "Su directorio de datos y sus archivos son probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Sugerimos fuertemente que configure su servidor web de manera que el directorio de datos ya no esté accesible o mueva el directorio de datos fuera del documento raíz de su servidor web."
#: templates/admin.php:29
msgid "Setup Warning"
-msgstr ""
+msgstr "Advertencia de Configuración"
#: templates/admin.php:32
msgid ""
@@ -208,13 +210,13 @@ msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a
#: templates/admin.php:44
msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Modulo 'fileinfo' perdido"
#: templates/admin.php:47
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
-msgstr ""
+msgstr "El modulo PHP 'fileinfo' no se encuentra. Sugerimos habilitar este modulo para tener mejorres resultados con la detección mime-type"
#: templates/admin.php:58
msgid "Locale not working"
@@ -230,7 +232,7 @@ msgstr ""
#: templates/admin.php:72
msgid "Internet connection not working"
-msgstr ""
+msgstr "La conexion a internet no esta funcionando"
#: templates/admin.php:75
msgid ""
@@ -240,7 +242,7 @@ msgid ""
"remote and sending of notification emails might also not work. We suggest to"
" enable internet connection for this server if you want to have all features"
" of ownCloud."
-msgstr ""
+msgstr "Este servidor ownCloud no tiene conexion de internet. Esto quiere decir que algunas caracteristicas como montar almacenamiento externo, notificaciones sobre actualizaciones o la instalacion de apps de terceros no funcionaran. Es posible que no pueda acceder remotamente a los archivos ni enviar notificaciones por correo. Sugerimos habilitar la conexión a internet para este servidor si quiere tener todas las caracteristicas de ownCloud."
#: templates/admin.php:89
msgid "Cron"
@@ -264,7 +266,7 @@ msgstr ""
#: templates/admin.php:125
msgid "Sharing"
-msgstr ""
+msgstr "Compartiendo"
#: templates/admin.php:131
msgid "Enable Share API"
@@ -329,11 +331,11 @@ msgstr ""
msgid "More"
msgstr "Más"
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:227 templates/personal.php:102
msgid "Version"
msgstr "Version"
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:230 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -343,51 +345,51 @@ msgid ""
"License\">AGPL</abbr></a>."
msgstr "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <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
+#: templates/apps.php:11
msgid "Add your App"
msgstr "Añade tu aplicación"
-#: templates/apps.php:11
+#: templates/apps.php:12
msgid "More Apps"
msgstr "Más aplicaciones"
-#: templates/apps.php:24
+#: templates/apps.php:28
msgid "Select an App"
msgstr "Seleccionar una aplicación"
-#: templates/apps.php:28
+#: templates/apps.php:34
msgid "See application page at apps.owncloud.com"
msgstr "Echa un vistazo a la web de aplicaciones apps.owncloud.com"
-#: templates/apps.php:29
+#: templates/apps.php:36
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
-#: templates/apps.php:31
+#: templates/apps.php:38
msgid "Update"
msgstr "Actualizar"
-#: templates/help.php:3
+#: templates/help.php:4
msgid "User Documentation"
msgstr "Documentación del usuario"
-#: templates/help.php:4
+#: templates/help.php:6
msgid "Administrator Documentation"
msgstr "Documentación del adminsitrador"
-#: templates/help.php:6
+#: templates/help.php:9
msgid "Online Documentation"
msgstr "Documentación en linea"
-#: templates/help.php:7
+#: templates/help.php:11
msgid "Forum"
msgstr "Foro"
-#: templates/help.php:9
+#: templates/help.php:14
msgid "Bugtracker"
msgstr "Rastreador de Bugs"
-#: templates/help.php:11
+#: templates/help.php:17
msgid "Commercial Support"
msgstr "Soporte Comercial"
@@ -396,79 +398,79 @@ msgstr "Soporte Comercial"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Ha usado <strong>%s</strong> de <strong>%s</strong> disponibles"
-#: templates/personal.php:14
+#: templates/personal.php:15
msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Obtener las apps para sincronizar sus archivos"
-#: templates/personal.php:25
+#: templates/personal.php:26
msgid "Show First Run Wizard again"
msgstr "Mostrar asistente para iniciar otra vez"
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Contraseña"
-#: templates/personal.php:37
+#: templates/personal.php:38
msgid "Your password was changed"
msgstr "Su contraseña ha sido cambiada"
-#: templates/personal.php:38
+#: templates/personal.php:39
msgid "Unable to change your password"
msgstr "No se ha podido cambiar tu contraseña"
-#: templates/personal.php:39
+#: templates/personal.php:40
msgid "Current password"
msgstr "Contraseña actual"
-#: templates/personal.php:40
+#: templates/personal.php:42
msgid "New password"
msgstr "Nueva contraseña:"
-#: templates/personal.php:42
+#: templates/personal.php:44
msgid "Change password"
msgstr "Cambiar contraseña"
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Nombre a mostrar"
-#: templates/personal.php:55
+#: templates/personal.php:57
msgid "Your display name was changed"
msgstr "Su nombre fue cambiado"
-#: templates/personal.php:56
+#: templates/personal.php:58
msgid "Unable to change your display name"
msgstr "Incapaz de cambiar su nombre"
-#: templates/personal.php:59
+#: templates/personal.php:61
msgid "Change display name"
msgstr "Cambiar nombre"
-#: templates/personal.php:68
+#: templates/personal.php:70
msgid "Email"
msgstr "Correo electrónico"
-#: templates/personal.php:69
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Tu dirección de correo"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Escribe una dirección de correo electrónico para restablecer la contraseña"
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Idioma"
-#: templates/personal.php:82
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Ayúdanos a traducir"
-#: templates/personal.php:87
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:89
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 0e2ac46282a..7a12fa0ee59 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -389,7 +389,7 @@ msgstr "La actualización no pudo ser completada. Por favor, reportá el inconve
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Restablecer contraseña de ownCloud"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 6421f04d5fb..4cd4573e1e0 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-16 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:10+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: Javier Victor Mariano Bruno <koryyyy@gmail.com>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -94,8 +94,8 @@ msgstr "Borrar"
msgid "Rename"
msgstr "Cambiar nombre"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Pendiente"
@@ -153,74 +153,74 @@ msgstr "El almacenamiento está lleno, los archivos no se pueden seguir actualiz
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Error al subir el archivo"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Cerrar"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "Subiendo 1 archivo"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "Subiendo {count} archivos"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "La subida fue cancelada"
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "La URL no puede estar vacía"
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nombre"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 directorio"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} directorios"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 archivo"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} archivos"
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index 591c481a648..d26da0e0826 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:47+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -43,13 +43,13 @@ msgstr "Por favor, proporcioná un secreto y una contraseña válida para la apl
msgid "Error configuring Google Drive storage"
msgstr "Error al configurar el almacenamiento de Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -101,7 +101,7 @@ msgid "Users"
msgstr "Usuarios"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Borrar"
@@ -113,10 +113,10 @@ msgstr "Habilitar almacenamiento de usuario externo"
msgid "Allow users to mount their own external storage"
msgstr "Permitir a los usuarios montar su propio almacenamiento externo"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "certificados SSL raíz"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importar certificado raíz"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 138bd484b72..a539d4424ec 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "No fue posible borrar %s de manera permanente"
@@ -28,35 +28,39 @@ msgstr "No fue posible borrar %s de manera permanente"
msgid "Couldn't restore %s"
msgstr "No se pudo restaurar %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "Restaurar"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "Borrar archivo de manera permanente"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Borrar de manera permanente"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nombre"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Borrado"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 directorio"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} directorios"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 archivo"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} archivos"
@@ -67,3 +71,7 @@ msgstr "No hay nada acá. ¡La papelera está vacía!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Recuperar"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Borrar"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 968b373574a..eb8e12d824c 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 10:20+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 8f4f783545a..c8618287276 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 18:20+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -387,7 +387,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud parooli taastamine"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index c8749572697..b859ff99da3 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -92,8 +92,8 @@ msgstr "Kustuta"
msgid "Rename"
msgstr "ümber"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Ootel"
@@ -151,74 +151,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Üleslaadimise viga"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Sulge"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 faili üleslaadimisel"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} faili üleslaadimist"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Üleslaadimine tühistati."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL ei saa olla tühi."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nimi"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Suurus"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Muudetud"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 kaust"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} kausta"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 fail"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} faili"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index c290d3f9140..22525aeb4d9 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -42,13 +42,13 @@ msgstr "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna."
msgid "Error configuring Google Drive storage"
msgstr "Viga Google Drive'i salvestusruumi seadistamisel"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -100,7 +100,7 @@ msgid "Users"
msgstr "Kasutajad"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Kustuta"
@@ -112,10 +112,10 @@ msgstr "Luba kasutajatele väline salvestamine"
msgid "Allow users to mount their own external storage"
msgstr "Luba kasutajatel ühendada külge nende enda välised salvestusseadmed"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "SSL root sertifikaadid"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Impordi root sertifikaadid"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index 72073ead874..77281fb6fd6 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 18:01+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "%s jäädavalt kustutamine ebaõnnestus"
@@ -28,35 +28,39 @@ msgstr "%s jäädavalt kustutamine ebaõnnestus"
msgid "Couldn't restore %s"
msgstr "%s ei saa taastada"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "soorita taastamine"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "kustuta fail jäädavalt"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Kustuta jäädavalt"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nimi"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Kustutatud"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 kaust"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} kausta"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 fail"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} faili"
@@ -67,3 +71,7 @@ msgstr "Siin pole midagi. Sinu prügikast on tühi!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Taasta"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Kustuta"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 03ab0d4ca7c..c1e036c3631 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -147,23 +147,23 @@ msgstr "Grupi admin"
msgid "Delete"
msgstr "Kustuta"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr "lisa grupp"
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr "Viga kasutaja loomisel"
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Eesti"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index eede87d9e5a..5b1a990636a 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 21:40+0000\n"
+"POT-Creation-Date: 2013-02-23 00:04+0100\n"
+"PO-Revision-Date: 2013-02-22 22:30+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"
@@ -21,29 +21,29 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:85
+#: ajax/share.php:97
#, php-format
msgid "User %s shared a file with you"
-msgstr "%s erabiltzaileak zurekin fitxategi bat partekatu du "
+msgstr "%s erabiltzaileak zurekin fitxategi bat elkarbanatu du "
-#: ajax/share.php:87
+#: ajax/share.php:99
#, php-format
msgid "User %s shared a folder with you"
-msgstr "%s erabiltzaileak zurekin karpeta bat partekatu du "
+msgstr "%s erabiltzaileak zurekin karpeta bat elkarbanatu du "
-#: ajax/share.php:89
+#: ajax/share.php:101
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr "%s erabiltzaileak \"%s\" fitxategia zurekin partekatu du. Hemen duzu eskuragarri: %s"
+msgstr "%s erabiltzaileak \"%s\" fitxategia zurekin elkarbanatu du. Hemen duzu eskuragarri: %s"
-#: ajax/share.php:91
+#: ajax/share.php:104
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr "%s erabiltzaileak \"%s\" karpeta zurekin partekatu du. Hemen duzu eskuragarri: %s"
+msgstr "%s erabiltzaileak \"%s\" karpeta zurekin elkarbanatu du. Hemen duzu eskuragarri: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -84,79 +84,79 @@ msgstr "Ez da ezabatzeko kategoriarik hautatu."
msgid "Error removing %s from favorites."
msgstr "Errorea gertatu da %s gogokoetatik ezabatzean."
-#: js/config.php:32
+#: js/config.php:34
msgid "Sunday"
msgstr "Igandea"
-#: js/config.php:32
+#: js/config.php:35
msgid "Monday"
msgstr "Astelehena"
-#: js/config.php:32
+#: js/config.php:36
msgid "Tuesday"
msgstr "Asteartea"
-#: js/config.php:32
+#: js/config.php:37
msgid "Wednesday"
msgstr "Asteazkena"
-#: js/config.php:32
+#: js/config.php:38
msgid "Thursday"
msgstr "Osteguna"
-#: js/config.php:32
+#: js/config.php:39
msgid "Friday"
msgstr "Ostirala"
-#: js/config.php:32
+#: js/config.php:40
msgid "Saturday"
msgstr "Larunbata"
-#: js/config.php:33
+#: js/config.php:45
msgid "January"
msgstr "Urtarrila"
-#: js/config.php:33
+#: js/config.php:46
msgid "February"
msgstr "Otsaila"
-#: js/config.php:33
+#: js/config.php:47
msgid "March"
msgstr "Martxoa"
-#: js/config.php:33
+#: js/config.php:48
msgid "April"
msgstr "Apirila"
-#: js/config.php:33
+#: js/config.php:49
msgid "May"
msgstr "Maiatza"
-#: js/config.php:33
+#: js/config.php:50
msgid "June"
msgstr "Ekaina"
-#: js/config.php:33
+#: js/config.php:51
msgid "July"
msgstr "Uztaila"
-#: js/config.php:33
+#: js/config.php:52
msgid "August"
msgstr "Abuztua"
-#: js/config.php:33
+#: js/config.php:53
msgid "September"
msgstr "Iraila"
-#: js/config.php:33
+#: js/config.php:54
msgid "October"
msgstr "Urria"
-#: js/config.php:33
+#: js/config.php:55
msgid "November"
msgstr "Azaroa"
-#: js/config.php:33
+#: js/config.php:56
msgid "December"
msgstr "Abendua"
@@ -277,11 +277,11 @@ msgstr "Errore bat egon da baimenak aldatzean"
#: js/share.js:168
msgid "Shared with you and the group {group} by {owner}"
-msgstr "{owner}-k zu eta {group} taldearekin partekatuta"
+msgstr "{owner}-k zu eta {group} taldearekin elkarbanatuta"
#: js/share.js:170
msgid "Shared with you by {owner}"
-msgstr "{owner}-k zurekin partekatuta"
+msgstr "{owner}-k zurekin elkarbanatuta"
#: js/share.js:175
msgid "Share with"
@@ -295,7 +295,7 @@ msgstr "Elkarbanatu lotura batekin"
msgid "Password protect"
msgstr "Babestu pasahitzarekin"
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:46 templates/login.php:35
msgid "Password"
msgstr "Pasahitza"
@@ -329,7 +329,7 @@ msgstr "Berriz elkarbanatzea ez dago baimendua"
#: js/share.js:292
msgid "Shared in {item} with {user}"
-msgstr "{user}ekin {item}-n partekatuta"
+msgstr "{user}ekin {item}-n elkarbanatuta"
#: js/share.js:313
msgid "Unshare"
@@ -390,7 +390,7 @@ msgstr "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud-en pasahitza berrezarri"
@@ -410,7 +410,7 @@ msgstr "Berrezartzeko eposta bidali da."
msgid "Request failed!"
msgstr "Eskariak huts egin du!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:40
#: templates/login.php:28
msgid "Username"
msgstr "Erabiltzaile izena"
@@ -504,52 +504,52 @@ msgstr "Zure zerbitzaria ongi konfiguratzeko informazioa eskuratzeko, begiratu
msgid "Create an <strong>admin account</strong>"
msgstr "Sortu <strong>kudeatzaile kontu<strong> bat"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Advanced"
msgstr "Aurreratua"
-#: templates/installation.php:54
+#: templates/installation.php:56
msgid "Data folder"
msgstr "Datuen karpeta"
-#: templates/installation.php:61
+#: templates/installation.php:65
msgid "Configure the database"
msgstr "Konfiguratu datu basea"
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: templates/installation.php:70 templates/installation.php:82
+#: templates/installation.php:93 templates/installation.php:104
msgid "will be used"
msgstr "erabiliko da"
-#: templates/installation.php:109
+#: templates/installation.php:117
msgid "Database user"
msgstr "Datubasearen erabiltzailea"
-#: templates/installation.php:113
+#: templates/installation.php:122
msgid "Database password"
msgstr "Datubasearen pasahitza"
-#: templates/installation.php:117
+#: templates/installation.php:127
msgid "Database name"
msgstr "Datubasearen izena"
-#: templates/installation.php:125
+#: templates/installation.php:137
msgid "Database tablespace"
msgstr "Datu basearen taula-lekua"
-#: templates/installation.php:131
+#: templates/installation.php:144
msgid "Database host"
msgstr "Datubasearen hostalaria"
-#: templates/installation.php:136
+#: templates/installation.php:150
msgid "Finish setup"
msgstr "Bukatu konfigurazioa"
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:35
msgid "web services under your control"
msgstr "web zerbitzuak zure kontrolpean"
-#: templates/layout.user.php:48
+#: templates/layout.user.php:53
msgid "Log out"
msgstr "Saioa bukatu"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 0e4427c982b..9beb7020e0c 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 12:30+0000\n"
+"POT-Creation-Date: 2013-02-23 00:04+0100\n"
+"PO-Revision-Date: 2013-02-22 22:30+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"
@@ -54,27 +54,27 @@ msgid ""
"the HTML form"
msgstr "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da"
-#: ajax/upload.php:31
+#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
msgstr "Igotako fitxategiaren zati bat baino gehiago ez da igo"
-#: ajax/upload.php:32
+#: ajax/upload.php:31
msgid "No file was uploaded"
msgstr "Ez da fitxategirik igo"
-#: ajax/upload.php:33
+#: ajax/upload.php:32
msgid "Missing a temporary folder"
msgstr "Aldi baterako karpeta falta da"
-#: ajax/upload.php:34
+#: ajax/upload.php:33
msgid "Failed to write to disk"
msgstr "Errore bat izan da diskoan idazterakoan"
-#: ajax/upload.php:52
+#: ajax/upload.php:51
msgid "Not enough storage available"
msgstr "Ez dago behar aina leku erabilgarri,"
-#: ajax/upload.php:83
+#: ajax/upload.php:82
msgid "Invalid directory."
msgstr "Baliogabeko karpeta."
@@ -94,8 +94,8 @@ msgstr "Ezabatu"
msgid "Rename"
msgstr "Berrizendatu"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Zain"
@@ -153,74 +153,74 @@ msgstr "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. "
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Igotzean errore bat suertatu da"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Itxi"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "fitxategi 1 igotzen"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} fitxategi igotzen"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Igoera ezeztatuta"
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URLa ezin da hutsik egon."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Izena"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Tamaina"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Aldatuta"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "karpeta bat"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} karpeta"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "fitxategi bat"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} fitxategi"
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index 285a6bad98d..70267b886ab 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 20:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+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"
@@ -42,13 +42,13 @@ msgstr "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua"
msgid "Error configuring Google Drive storage"
msgstr "Errore bat egon da Google Drive biltegiratzea konfiguratzean"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Abisua:</b> \"smbclient\" ez dago instalatuta. CIFS/SMB partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -116,6 +116,6 @@ msgstr "Baimendu erabiltzaileak bere kanpo biltegiratzeak muntatzen"
msgid "SSL root certificates"
msgstr "SSL erro ziurtagiriak"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Inportatu Erro Ziurtagiria"
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index 405582e4205..b9a97c88fe9 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 22:00+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Ezin izan da %s betirako ezabatu"
@@ -28,35 +28,39 @@ msgstr "Ezin izan da %s betirako ezabatu"
msgid "Couldn't restore %s"
msgstr "Ezin izan da %s berreskuratu"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "berreskuratu"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "ezabatu fitxategia betirako"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Ezabatu betirako"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Izena"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Ezabatuta"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "karpeta bat"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} karpeta"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "fitxategi bat"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} fitxategi"
@@ -67,3 +71,7 @@ msgstr "Ez dago ezer ez. Zure zakarrontzia hutsik dago!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Berrezarri"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Ezabatu"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 7a56399da99..6cbb7081815 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 12:30+0000\n"
+"POT-Creation-Date: 2013-02-23 00:04+0100\n"
+"PO-Revision-Date: 2013-02-22 22:30+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"
@@ -25,8 +25,8 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "Ezin izan da App Dendatik zerrenda kargatu"
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "Autentifikazio errorea"
@@ -74,12 +74,12 @@ msgstr "Baliogabeko eskaria"
msgid "Admins can't remove themself from the admin group"
msgstr "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik"
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
#, php-format
msgid "Unable to add user to group %s"
msgstr "Ezin izan da erabiltzailea %s taldera gehitu"
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
#, php-format
msgid "Unable to remove user from group %s"
msgstr "Ezin izan da erabiltzailea %s taldetik ezabatu"
@@ -259,11 +259,11 @@ msgstr "Partekatzea"
#: templates/admin.php:131
msgid "Enable Share API"
-msgstr "Gaitu Partekatze APIa"
+msgstr "Gaitu Elkarbanatze APIa"
#: templates/admin.php:132
msgid "Allow apps to use the Share API"
-msgstr "Baimendu aplikazioak Partekatze APIa erabiltzeko"
+msgstr "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko"
#: templates/admin.php:139
msgid "Allow links"
@@ -271,7 +271,7 @@ msgstr "Baimendu loturak"
#: templates/admin.php:140
msgid "Allow users to share items to the public with links"
-msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki partekatzen"
+msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen"
#: templates/admin.php:147
msgid "Allow resharing"
@@ -279,15 +279,15 @@ msgstr "Baimendu birpartekatzea"
#: templates/admin.php:148
msgid "Allow users to share items shared with them again"
-msgstr "Baimendu erabiltzaileak haiekin partekatutako fitxategiak berriz ere partekatzen"
+msgstr "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen"
#: templates/admin.php:155
msgid "Allow users to share with anyone"
-msgstr "Baimendu erabiltzaileak edonorekin partekatzen"
+msgstr "Baimendu erabiltzaileak edonorekin elkarbanatzen"
#: templates/admin.php:158
msgid "Allow users to only share with users in their groups"
-msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin partekatzen"
+msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen"
#: templates/admin.php:165
msgid "Security"
@@ -320,11 +320,11 @@ msgstr "Erregistro maila"
msgid "More"
msgstr "Gehiago"
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:227 templates/personal.php:102
msgid "Version"
msgstr "Bertsioa"
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:230 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -334,51 +334,51 @@ msgid ""
"License\">AGPL</abbr></a>."
msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>."
-#: templates/apps.php:10
+#: templates/apps.php:11
msgid "Add your App"
msgstr "Gehitu zure aplikazioa"
-#: templates/apps.php:11
+#: templates/apps.php:12
msgid "More Apps"
msgstr "App gehiago"
-#: templates/apps.php:24
+#: templates/apps.php:28
msgid "Select an App"
msgstr "Aukeratu programa bat"
-#: templates/apps.php:28
+#: templates/apps.php:34
msgid "See application page at apps.owncloud.com"
msgstr "Ikusi programen orria apps.owncloud.com en"
-#: templates/apps.php:29
+#: templates/apps.php:36
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>"
-#: templates/apps.php:31
+#: templates/apps.php:38
msgid "Update"
msgstr "Eguneratu"
-#: templates/help.php:3
+#: templates/help.php:4
msgid "User Documentation"
msgstr "Erabiltzaile dokumentazioa"
-#: templates/help.php:4
+#: templates/help.php:6
msgid "Administrator Documentation"
msgstr "Administradore dokumentazioa"
-#: templates/help.php:6
+#: templates/help.php:9
msgid "Online Documentation"
msgstr "Online dokumentazioa"
-#: templates/help.php:7
+#: templates/help.php:11
msgid "Forum"
msgstr "Foroa"
-#: templates/help.php:9
+#: templates/help.php:14
msgid "Bugtracker"
msgstr "Bugtracker"
-#: templates/help.php:11
+#: templates/help.php:17
msgid "Commercial Support"
msgstr "Babes komertziala"
@@ -387,79 +387,79 @@ msgstr "Babes komertziala"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik"
-#: templates/personal.php:14
+#: templates/personal.php:15
msgid "Get the apps to sync your files"
msgstr "Lortu aplikazioak zure fitxategiak sinkronizatzeko"
-#: templates/personal.php:25
+#: templates/personal.php:26
msgid "Show First Run Wizard again"
msgstr "Erakutsi berriz Lehenengo Aldiko Morroia"
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "Pasahitza"
-#: templates/personal.php:37
+#: templates/personal.php:38
msgid "Your password was changed"
msgstr "Zere pasahitza aldatu da"
-#: templates/personal.php:38
+#: templates/personal.php:39
msgid "Unable to change your password"
msgstr "Ezin izan da zure pasahitza aldatu"
-#: templates/personal.php:39
+#: templates/personal.php:40
msgid "Current password"
msgstr "Uneko pasahitza"
-#: templates/personal.php:40
+#: templates/personal.php:42
msgid "New password"
msgstr "Pasahitz berria"
-#: templates/personal.php:42
+#: templates/personal.php:44
msgid "Change password"
msgstr "Aldatu pasahitza"
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr "Bistaratze Izena"
-#: templates/personal.php:55
+#: templates/personal.php:57
msgid "Your display name was changed"
msgstr "Zure bistaratze izena aldatu da"
-#: templates/personal.php:56
+#: templates/personal.php:58
msgid "Unable to change your display name"
msgstr "Ezin izan da zure bistaratze izena aldatu"
-#: templates/personal.php:59
+#: templates/personal.php:61
msgid "Change display name"
msgstr "Aldatu bistaratze izena"
-#: templates/personal.php:68
+#: templates/personal.php:70
msgid "Email"
msgstr "E-Posta"
-#: templates/personal.php:69
+#: templates/personal.php:72
msgid "Your email address"
msgstr "Zure e-posta"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "Hizkuntza"
-#: templates/personal.php:82
+#: templates/personal.php:86
msgid "Help translate"
msgstr "Lagundu itzultzen"
-#: templates/personal.php:87
+#: templates/personal.php:91
msgid "WebDAV"
msgstr "WebDAV"
-#: templates/personal.php:89
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 068bba91488..3e7f4200b8e 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 11:00+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -388,7 +388,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "پسورد ابرهای شما تغییرکرد"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 478ca3405cb..63405415621 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -94,8 +94,8 @@ msgstr "پاک کردن"
msgid "Rename"
msgstr "تغییرنام"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "در انتظار"
@@ -153,74 +153,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "خطا در بار گذاری"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "بستن"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 پرونده آپلود شد."
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{ شمار } فایل های در حال آپلود"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "بار گذاری لغو شد"
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. "
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL نمی تواند خالی باشد."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است."
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "نام"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "اندازه"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "تغییر یافته"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 پوشه"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{ شمار} پوشه ها"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 پرونده"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{ شمار } فایل ها"
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index 075c47b4356..1ad0bfb3ce3 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-04 00:04+0100\n"
-"PO-Revision-Date: 2013-02-03 05:40+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -26,11 +26,11 @@ msgstr ""
msgid "Error configuring Dropbox storage"
msgstr ""
-#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:41
+#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
msgid "Grant access"
msgstr ""
-#: js/dropbox.js:73 js/google.js:73
+#: js/dropbox.js:73 js/google.js:72
msgid "Fill out all required fields"
msgstr ""
@@ -38,17 +38,17 @@ msgstr ""
msgid "Please provide a valid Dropbox app key and secret."
msgstr ""
-#: js/google.js:26 js/google.js:74 js/google.js:79
+#: js/google.js:26 js/google.js:73 js/google.js:78
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:405
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:406
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -116,6 +116,6 @@ msgstr ""
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index 435d45e463f..962fcc1a0a4 100644
--- a/l10n/fa/files_trashbin.po
+++ b/l10n/fa/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "نام"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 پوشه"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{ شمار} پوشه ها"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 پرونده"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{ شمار } فایل ها"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "بازیابی"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "حذف"
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index a2a96bc6ec1..428d3b17be6 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/files_versions.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Amir Reza Asadi <amirreza.asadi@live.com>, 2013.
# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-21 18:00+0000\n"
+"Last-Translator: Amir Reza Asadi <amirreza.asadi@live.com>\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"
@@ -22,11 +23,11 @@ msgstr ""
#: ajax/rollbackVersion.php:15
#, php-format
msgid "Could not revert: %s"
-msgstr ""
+msgstr "بازگردانی امکان ناپذیر است: %s"
#: history.php:40
msgid "success"
-msgstr ""
+msgstr "موفقیت"
#: history.php:42
#, php-format
@@ -35,7 +36,7 @@ msgstr ""
#: history.php:49
msgid "failure"
-msgstr ""
+msgstr "شکست"
#: history.php:51
#, php-format
@@ -44,11 +45,11 @@ msgstr ""
#: history.php:68
msgid "No old versions available"
-msgstr ""
+msgstr "هیچ نسخه قدیمی در دسترس نیست"
#: history.php:73
msgid "No path specified"
-msgstr ""
+msgstr "هیچ مسیری مشخص نشده است"
#: js/versions.js:16
msgid "History"
@@ -56,11 +57,11 @@ msgstr "تاریخچه"
#: templates/history.php:20
msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "بازگردانی یک پرورنده به نسخه قدیمی اش از طریق دکمه بازگردانی امکان پذیر است"
#: templates/settings.php:3
msgid "Files Versioning"
-msgstr ""
+msgstr "نسخه بندی پرونده ها"
#: templates/settings.php:4
msgid "Enable"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 9f1935684b7..3e3a60dd53a 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -150,23 +150,23 @@ msgstr ""
msgid "Delete"
msgstr "پاک کردن"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 80e0cb1870d..24d915c35e7 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 14:00+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+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"
@@ -393,7 +393,7 @@ msgstr "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud-salasanan nollaus"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 60fc1271eb0..f447308e8c7 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-17 00:24+0100\n"
-"PO-Revision-Date: 2013-02-16 10:40+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+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"
@@ -95,8 +95,8 @@ msgstr "Poista"
msgid "Rename"
msgstr "Nimeä uudelleen"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Odottaa"
@@ -154,74 +154,74 @@ msgstr "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkro
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Tallennustila on melkein loppu ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Lähetysvirhe."
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Sulje"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr ""
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Lähetys peruttu."
-#: js/files.js:496
+#: js/files.js:497
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:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "Verkko-osoite ei voi olla tyhjä"
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nimi"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Koko"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Muutettu"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 kansio"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} kansiota"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 tiedosto"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} tiedostoa"
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 1ccd529b50f..bd212d4925b 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 13:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+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"
@@ -44,13 +44,13 @@ msgstr "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus."
msgid "Error configuring Google Drive storage"
msgstr "Virhe Google Drive levyn asetuksia tehtäessä"
-#: lib/config.php:413
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Varoitus:</b> \"smbclient\" ei ole asennettuna. CIFS-/SMB-jakojen liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan smbclient."
-#: lib/config.php:414
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -118,6 +118,6 @@ msgstr "Salli käyttäjien liittää omia erillisiä tallennusvälineitä"
msgid "SSL root certificates"
msgstr "SSL-juurivarmenteet"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Tuo juurivarmenne"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index e64f9fdafb6..749b49636c7 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 07:40+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Kohdetta %s ei voitu poistaa pysyvästi"
@@ -28,35 +28,39 @@ msgstr "Kohdetta %s ei voitu poistaa pysyvästi"
msgid "Couldn't restore %s"
msgstr "Kohteen %s palautus epäonnistui"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "suorita palautustoiminto"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "poista tiedosto pysyvästi"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Poista pysyvästi"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nimi"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Poistettu"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 kansio"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} kansiota"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 tiedosto"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} tiedostoa"
@@ -67,3 +71,7 @@ msgstr "Tyhjää täynnä! Roskakorissa ei ole mitään."
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Palauta"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Poista"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index e1db3812734..cfa2c3ba7af 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 07:30+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+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"
@@ -164,7 +164,7 @@ msgstr "Virhe käyttäjää luotaessa"
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "_kielen_nimi_"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index ab6b14e8396..bb1f9dc5fe7 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: Robert Di Rosa <>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -400,7 +400,7 @@ msgstr "La mise à jour a échoué. Veuillez signaler ce problème à la <a href
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Réinitialisation de votre mot de passe Owncloud"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 9370bbceb44..f6a61735b8d 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -22,8 +22,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 11:12+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -105,8 +105,8 @@ msgstr "Supprimer"
msgid "Rename"
msgstr "Renommer"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "En cours"
@@ -164,74 +164,74 @@ msgstr "Votre espage de stockage est plein, les fichiers ne peuvent plus être t
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet."
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Erreur de chargement"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Fermer"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 fichier en cours de téléchargement"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} fichiers téléversés"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Chargement annulé."
-#: js/files.js:496
+#: js/files.js:497
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:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "L'URL ne peut-être vide"
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nom"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Taille"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Modifié"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 dossier"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} dossiers"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 fichier"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} fichiers"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 02af3bd71fb..b9fb1d7794a 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 10:41+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -43,13 +43,13 @@ msgstr "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de pas
msgid "Error configuring Google Drive storage"
msgstr "Erreur lors de la configuration du support de stockage Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Attention : </b> \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas disponible. Contactez votre administrateur système pour l'installer."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -117,6 +117,6 @@ msgstr "Autoriser les utilisateurs à monter leur propre stockage externe"
msgid "SSL root certificates"
msgstr "Certificats racine SSL"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importer un certificat racine"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index 7f4f4cbbf7d..38e193af759 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:50+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,7 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Impossible d'effacer %s de façon permanente"
@@ -29,35 +29,39 @@ msgstr "Impossible d'effacer %s de façon permanente"
msgid "Couldn't restore %s"
msgstr "Impossible de restaurer %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "effectuer l'opération de restauration"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "effacer définitivement le fichier"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Supprimer de façon définitive"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nom"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Effacé"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 dossier"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} dossiers"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 fichier"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} fichiers"
@@ -68,3 +72,7 @@ msgstr "Il n'y a rien ici. Votre corbeille est vide !"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Restaurer"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Supprimer"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 7eb6c479f21..f4fc7a81c28 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -25,8 +25,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 14:18+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index a21a74f87d5..20bf7af29ee 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
-"PO-Revision-Date: 2013-02-19 12:10+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -390,7 +390,7 @@ msgstr "A actualización non foi satisfactoria, informe deste problema á <a hr
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Restabelecer o contrasinal de ownCloud"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 42f77c08b62..fad20c08414 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
-"PO-Revision-Date: 2013-02-19 12:10+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -93,8 +93,8 @@ msgstr "Eliminar"
msgid "Rename"
msgstr "Renomear"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Pendentes"
@@ -152,74 +152,74 @@ msgstr "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Non foi posíbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Produciuse un erro no envío"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Pechar"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "Enviándose 1 ficheiro"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "Enviandose {count} ficheiros"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Envío cancelado."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "O URL non pode quedar baleiro."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nome de cartafol incorrecto. O uso de «Shared» está reservado por Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nome"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Tamaño"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 cartafol"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} cartafoles"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 ficheiro"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} ficheiros"
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index c16b5b97935..b98c8ff3133 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 12:31+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -43,13 +43,13 @@ msgstr "Forneza unha chave correcta e segreda do Dropbox."
msgid "Error configuring Google Drive storage"
msgstr "Produciuse un erro ao configurar o almacenamento en Google Drive"
-#: lib/config.php:413
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Aviso:</b> «smbclient» non está instalado. Non é posibel a montaxe de comparticións CIFS/SMB. Consulte co administrador do sistema para instalalo."
-#: lib/config.php:414
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -117,6 +117,6 @@ msgstr "Permitir aos usuarios montar os seus propios almacenamentos externos"
msgid "SSL root certificates"
msgstr "Certificados SSL root"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importar o certificado root"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index 2f1e3e6d86c..4ea502436cf 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Non foi posíbel eliminar %s permanente"
@@ -28,35 +28,39 @@ msgstr "Non foi posíbel eliminar %s permanente"
msgid "Couldn't restore %s"
msgstr "Non foi posíbel restaurar %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "realizar a operación de restauración"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "eliminar o ficheiro permanentemente"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Eliminar permanentemente"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nome"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Eliminado"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 cartafol"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} cartafoles"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 ficheiro"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} ficheiros"
@@ -67,3 +71,7 @@ msgstr "Aquí non hai nada. O cesto do lixo está baleiro!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Restablecer"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Eliminar"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index a05c2158b55..cc0488bc450 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 19:20+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index a1478aafdaf..612d193348f 100644
--- a/l10n/he/core.po
+++ b/l10n/he/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: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
+"PO-Revision-Date: 2013-02-24 12:10+0000\n"
+"Last-Translator: Gilad Naaman <gilad.doom@gmail.com>\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,24 +22,24 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:85
+#: ajax/share.php:97
#, php-format
msgid "User %s shared a file with you"
msgstr "המשתמש %s שיתף אתך קובץ"
-#: ajax/share.php:87
+#: ajax/share.php:99
#, php-format
msgid "User %s shared a folder with you"
msgstr "המשתמש %s שיתף אתך תיקייה"
-#: ajax/share.php:89
+#: ajax/share.php:101
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
msgstr "המשתמש %s שיתף אתך את הקובץ „%s“. ניתן להוריד את הקובץ מכאן: %s"
-#: ajax/share.php:91
+#: ajax/share.php:104
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
@@ -57,7 +57,7 @@ msgstr "אין קטגוריה להוספה?"
#: ajax/vcategories/add.php:37
#, php-format
msgid "This category already exists: %s"
-msgstr ""
+msgstr "הקטגוריה הבאה כבר קיימת: %s"
#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
#: ajax/vcategories/favorites.php:24
@@ -85,79 +85,79 @@ msgstr "לא נבחרו קטגוריות למחיקה"
msgid "Error removing %s from favorites."
msgstr "שגיאה בהסרת %s מהמועדפים."
-#: js/config.php:32
+#: js/config.php:34
msgid "Sunday"
msgstr "יום ראשון"
-#: js/config.php:32
+#: js/config.php:35
msgid "Monday"
msgstr "יום שני"
-#: js/config.php:32
+#: js/config.php:36
msgid "Tuesday"
msgstr "יום שלישי"
-#: js/config.php:32
+#: js/config.php:37
msgid "Wednesday"
msgstr "יום רביעי"
-#: js/config.php:32
+#: js/config.php:38
msgid "Thursday"
msgstr "יום חמישי"
-#: js/config.php:32
+#: js/config.php:39
msgid "Friday"
msgstr "יום שישי"
-#: js/config.php:32
+#: js/config.php:40
msgid "Saturday"
msgstr "שבת"
-#: js/config.php:33
+#: js/config.php:45
msgid "January"
msgstr "ינואר"
-#: js/config.php:33
+#: js/config.php:46
msgid "February"
msgstr "פברואר"
-#: js/config.php:33
+#: js/config.php:47
msgid "March"
msgstr "מרץ"
-#: js/config.php:33
+#: js/config.php:48
msgid "April"
msgstr "אפריל"
-#: js/config.php:33
+#: js/config.php:49
msgid "May"
msgstr "מאי"
-#: js/config.php:33
+#: js/config.php:50
msgid "June"
msgstr "יוני"
-#: js/config.php:33
+#: js/config.php:51
msgid "July"
msgstr "יולי"
-#: js/config.php:33
+#: js/config.php:52
msgid "August"
msgstr "אוגוסט"
-#: js/config.php:33
+#: js/config.php:53
msgid "September"
msgstr "ספטמבר"
-#: js/config.php:33
+#: js/config.php:54
msgid "October"
msgstr "אוקטובר"
-#: js/config.php:33
+#: js/config.php:55
msgid "November"
msgstr "נובמבר"
-#: js/config.php:33
+#: js/config.php:56
msgid "December"
msgstr "דצמבר"
@@ -258,7 +258,7 @@ msgstr "הקובץ הנדרש {file} אינו מותקן!"
#: js/share.js:29 js/share.js:43 js/share.js:90
msgid "Shared"
-msgstr ""
+msgstr "שותף"
#: js/share.js:93
msgid "Share"
@@ -296,7 +296,7 @@ msgstr "שיתוף עם קישור"
msgid "Password protect"
msgstr "הגנה בססמה"
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:46 templates/login.php:35
msgid "Password"
msgstr "ססמה"
@@ -385,13 +385,13 @@ msgid ""
"The update was unsuccessful. Please report this issue to the <a "
"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
"community</a>."
-msgstr ""
+msgstr "תהליך העדכון לא הושלם בהצלחה. נא דווח את הבעיה ב<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">קהילת ownCloud</a>."
#: js/update.js:18
msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "איפוס הססמה של ownCloud"
@@ -411,7 +411,7 @@ msgstr "איפוס שליחת דוא״ל."
msgid "Request failed!"
msgstr "הבקשה נכשלה!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:40
#: templates/login.php:28
msgid "Username"
msgstr "שם משתמש"
@@ -492,65 +492,65 @@ msgstr "ללא מחולל מספרים אקראיים מאובטח תוקף יכ
msgid ""
"Your data directory and files are probably accessible from the internet "
"because the .htaccess file does not work."
-msgstr ""
+msgstr "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד."
#: templates/installation.php:32
msgid ""
"For information how to properly configure your server, please see the <a "
"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
"target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "לקבלת מידע להגדרה נכונה של השרת שלך, ראה את ה<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">תיעוד</a>."
#: templates/installation.php:36
msgid "Create an <strong>admin account</strong>"
msgstr "יצירת <strong>חשבון מנהל</strong>"
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Advanced"
msgstr "מתקדם"
-#: templates/installation.php:54
+#: templates/installation.php:56
msgid "Data folder"
msgstr "תיקיית נתונים"
-#: templates/installation.php:61
+#: templates/installation.php:65
msgid "Configure the database"
msgstr "הגדרת מסד הנתונים"
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: templates/installation.php:70 templates/installation.php:82
+#: templates/installation.php:93 templates/installation.php:104
msgid "will be used"
msgstr "ינוצלו"
-#: templates/installation.php:109
+#: templates/installation.php:117
msgid "Database user"
msgstr "שם משתמש במסד הנתונים"
-#: templates/installation.php:113
+#: templates/installation.php:122
msgid "Database password"
msgstr "ססמת מסד הנתונים"
-#: templates/installation.php:117
+#: templates/installation.php:127
msgid "Database name"
msgstr "שם מסד הנתונים"
-#: templates/installation.php:125
+#: templates/installation.php:137
msgid "Database tablespace"
msgstr "מרחב הכתובות של מסד הנתונים"
-#: templates/installation.php:131
+#: templates/installation.php:144
msgid "Database host"
msgstr "שרת בסיס נתונים"
-#: templates/installation.php:136
+#: templates/installation.php:150
msgid "Finish setup"
msgstr "סיום התקנה"
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:35
msgid "web services under your control"
msgstr "שירותי רשת בשליטתך"
-#: templates/layout.user.php:48
+#: templates/layout.user.php:53
msgid "Log out"
msgstr "התנתקות"
@@ -582,7 +582,7 @@ msgstr "כניסה"
#: templates/login.php:49
msgid "Alternative Logins"
-msgstr ""
+msgstr "כניסות אלטרנטיביות"
#: templates/part.pagenavi.php:3
msgid "prev"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 9b9bb1c34f5..569dbeb0daa 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
+"PO-Revision-Date: 2013-02-24 12:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -54,27 +54,27 @@ msgid ""
"the HTML form"
msgstr "הקובץ שהועלה חרג מההנחיה MAX_FILE_SIZE שצוינה בטופס ה־HTML"
-#: ajax/upload.php:31
+#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
msgstr "הקובץ שהועלה הועלה בצורה חלקית"
-#: ajax/upload.php:32
+#: ajax/upload.php:31
msgid "No file was uploaded"
msgstr "לא הועלו קבצים"
-#: ajax/upload.php:33
+#: ajax/upload.php:32
msgid "Missing a temporary folder"
msgstr "תיקייה זמנית חסרה"
-#: ajax/upload.php:34
+#: ajax/upload.php:33
msgid "Failed to write to disk"
msgstr "הכתיבה לכונן נכשלה"
-#: ajax/upload.php:52
+#: ajax/upload.php:51
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:83
+#: ajax/upload.php:82
msgid "Invalid directory."
msgstr ""
@@ -84,7 +84,7 @@ msgstr "קבצים"
#: js/fileactions.js:125
msgid "Delete permanently"
-msgstr ""
+msgstr "מחק לצמיתות"
#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
msgid "Delete"
@@ -94,8 +94,8 @@ msgstr "מחיקה"
msgid "Rename"
msgstr "שינוי שם"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "ממתין"
@@ -153,74 +153,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "שגיאת העלאה"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "סגירה"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "קובץ אחד נשלח"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} קבצים נשלחים"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "ההעלאה בוטלה."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "קישור אינו יכול להיות ריק."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "שם"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "גודל"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "זמן שינוי"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "תיקייה אחת"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} תיקיות"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "קובץ אחד"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} קבצים"
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index 091bf898926..24d976ecb83 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -43,13 +43,13 @@ msgstr "נא לספק קוד יישום וסוד תקניים של Dropbox."
msgid "Error configuring Google Drive storage"
msgstr "אירעה שגיאה בעת הגדרת אחסון ב־Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -101,7 +101,7 @@ msgid "Users"
msgstr "משתמשים"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "מחיקה"
@@ -113,10 +113,10 @@ msgstr "הפעלת אחסון חיצוני למשתמשים"
msgid "Allow users to mount their own external storage"
msgstr "יאפשר למשתמשים לעגן את האחסון החיצוני שלהם"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "שורש אישורי אבטחת SSL "
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "ייבוא אישור אבטחת שורש"
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index 3ce0051e74e..0f5b6dca9e8 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Gilad Naaman <gilad.doom@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
+"PO-Revision-Date: 2013-02-24 12:30+0000\n"
+"Last-Translator: Gilad Naaman <gilad.doom@gmail.com>\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"
@@ -17,52 +18,60 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "בלתי אפשרי למחוק את %s לצמיתות"
#: ajax/undelete.php:41
#, php-format
msgid "Couldn't restore %s"
-msgstr ""
+msgstr "בלתי אפשרי לשחזר את %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
-msgstr ""
+msgstr "בצע פעולת שחזור"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
-msgstr ""
+msgstr "מחק קובץ לצמיתות"
+
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "מחק לצמיתות"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "שם"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
-msgstr ""
+msgstr "נמחק"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "תיקייה אחת"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} תיקיות"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "קובץ אחד"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} קבצים"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "שום דבר כאן. סל המחזור שלך ריק!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
-msgstr ""
+msgstr "שחזר"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "מחיקה"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index a208a713446..72e496d2620 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
+"PO-Revision-Date: 2013-02-24 12:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr "לא ניתן לטעון רשימה מה־App Store"
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr "שגיאת הזדהות"
@@ -74,12 +74,12 @@ msgstr "בקשה לא חוקית"
msgid "Admins can't remove themself from the admin group"
msgstr "מנהלים לא יכולים להסיר את עצמם מקבוצת המנהלים"
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
#, php-format
msgid "Unable to add user to group %s"
msgstr "לא ניתן להוסיף משתמש לקבוצה %s"
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
#, php-format
msgid "Unable to remove user from group %s"
msgstr "לא ניתן להסיר משתמש מהקבוצה %s"
@@ -149,23 +149,23 @@ msgstr "מנהל הקבוצה"
msgid "Delete"
msgstr "מחיקה"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "עברית"
@@ -320,11 +320,11 @@ msgstr ""
msgid "More"
msgstr "יותר"
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:227 templates/personal.php:102
msgid "Version"
msgstr "גרסא"
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:230 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -334,51 +334,51 @@ msgid ""
"License\">AGPL</abbr></a>."
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
+#: templates/apps.php:11
msgid "Add your App"
msgstr "הוספת היישום שלך"
-#: templates/apps.php:11
+#: templates/apps.php:12
msgid "More Apps"
msgstr "יישומים נוספים"
-#: templates/apps.php:24
+#: templates/apps.php:28
msgid "Select an App"
msgstr "בחירת יישום"
-#: templates/apps.php:28
+#: templates/apps.php:34
msgid "See application page at apps.owncloud.com"
msgstr "צפה בעמוד הישום ב apps.owncloud.com"
-#: templates/apps.php:29
+#: templates/apps.php:36
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "ברישיון <span class=\"licence\"></span>לטובת <span class=\"author\"></span>"
-#: templates/apps.php:31
+#: templates/apps.php:38
msgid "Update"
msgstr "עדכון"
-#: templates/help.php:3
+#: templates/help.php:4
msgid "User Documentation"
msgstr "תיעוד משתמש"
-#: templates/help.php:4
+#: templates/help.php:6
msgid "Administrator Documentation"
msgstr "תיעוד מנהלים"
-#: templates/help.php:6
+#: templates/help.php:9
msgid "Online Documentation"
msgstr "תיעוד מקוון"
-#: templates/help.php:7
+#: templates/help.php:11
msgid "Forum"
msgstr "פורום"
-#: templates/help.php:9
+#: templates/help.php:14
msgid "Bugtracker"
msgstr ""
-#: templates/help.php:11
+#: templates/help.php:17
msgid "Commercial Support"
msgstr "תמיכה בתשלום"
@@ -387,79 +387,79 @@ msgstr "תמיכה בתשלום"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך"
-#: templates/personal.php:14
+#: templates/personal.php:15
msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "השג את האפליקציות על מנת לסנכרן את הקבצים שלך"
-#: templates/personal.php:25
+#: templates/personal.php:26
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr "ססמה"
-#: templates/personal.php:37
+#: templates/personal.php:38
msgid "Your password was changed"
msgstr "הססמה שלך הוחלפה"
-#: templates/personal.php:38
+#: templates/personal.php:39
msgid "Unable to change your password"
msgstr "לא ניתן לשנות את הססמה שלך"
-#: templates/personal.php:39
+#: templates/personal.php:40
msgid "Current password"
msgstr "ססמה נוכחית"
-#: templates/personal.php:40
+#: templates/personal.php:42
msgid "New password"
msgstr "ססמה חדשה"
-#: templates/personal.php:42
+#: templates/personal.php:44
msgid "Change password"
msgstr "שינוי ססמה"
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:55
+#: templates/personal.php:57
msgid "Your display name was changed"
msgstr ""
-#: templates/personal.php:56
+#: templates/personal.php:58
msgid "Unable to change your display name"
msgstr ""
-#: templates/personal.php:59
+#: templates/personal.php:61
msgid "Change display name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:70
msgid "Email"
msgstr "דוא״ל"
-#: templates/personal.php:69
+#: templates/personal.php:72
msgid "Your email address"
msgstr "כתובת הדוא״ל שלך"
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה"
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr "פה"
-#: templates/personal.php:82
+#: templates/personal.php:86
msgid "Help translate"
msgstr "עזרה בתרגום"
-#: templates/personal.php:87
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים."
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index cd67250d867..0052056c210 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
+"PO-Revision-Date: 2013-02-24 12:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -22,17 +22,17 @@ msgstr ""
msgid "Failed to delete the server configuration"
msgstr ""
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
msgid "The configuration is valid and the connection could be established!"
msgstr ""
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
msgid ""
"The configuration is valid, but the Bind failed. Please check the server "
"settings and credentials."
msgstr ""
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
msgid ""
"The configuration is invalid. Please look in the ownCloud log for further "
"details."
@@ -87,224 +87,224 @@ msgstr ""
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:18
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:23
msgid "Host"
msgstr "מארח"
-#: templates/settings.php:21
+#: templates/settings.php:25
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:26
msgid "Base DN"
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:27
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:28
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "User DN"
msgstr "DN משתמש"
-#: templates/settings.php:23
+#: templates/settings.php:32
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:24
+#: templates/settings.php:33
msgid "Password"
msgstr "סיסמא"
-#: templates/settings.php:24
+#: templates/settings.php:36
msgid "For anonymous access, leave DN and Password empty."
msgstr "לגישה אנונימית, השאר את הDM והסיסמא ריקים."
-#: templates/settings.php:25
+#: templates/settings.php:37
msgid "User Login Filter"
msgstr "סנן כניסת משתמש"
-#: templates/settings.php:25
+#: templates/settings.php:40
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:41
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:26
+#: templates/settings.php:42
msgid "User List Filter"
msgstr "סנן רשימת משתמשים"
-#: templates/settings.php:26
+#: templates/settings.php:45
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:26
+#: templates/settings.php:46
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:47
msgid "Group Filter"
msgstr "סנן קבוצה"
-#: templates/settings.php:27
+#: templates/settings.php:50
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:51
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:55
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:33
+#: templates/settings.php:57
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:33
+#: templates/settings.php:57
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:34
+#: templates/settings.php:58
msgid "Port"
-msgstr ""
+msgstr "פורט"
-#: templates/settings.php:35
+#: templates/settings.php:59
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:35
+#: templates/settings.php:59
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:60
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:37
+#: templates/settings.php:61
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:37
+#: templates/settings.php:61
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:62
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:62
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:63
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:64
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:64
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:64
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:65
msgid "in seconds. A change empties the cache."
msgstr "בשניות. שינוי מרוקן את המטמון."
-#: templates/settings.php:43
+#: templates/settings.php:67
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:69
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:69
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:70
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:46
+#: templates/settings.php:70
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:47
+#: templates/settings.php:71
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:48
+#: templates/settings.php:72
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:48
+#: templates/settings.php:72
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:73
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:73
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:74
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:51
+#: templates/settings.php:75
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:77
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:80
msgid "in bytes"
msgstr "בבתים"
-#: templates/settings.php:58
+#: templates/settings.php:82
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:62
+#: templates/settings.php:86
msgid "Help"
msgstr "עזרה"
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index a0b6e4cede0..2f956fdfd70 100644
--- a/l10n/hi/files_trashbin.po
+++ b/l10n/hi/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 23:14+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr ""
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index ebbeae5639d..2c13cde4da8 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -160,59 +160,59 @@ msgstr "Studeni"
msgid "December"
msgstr "Prosinac"
-#: js/js.js:284
+#: js/js.js:286
msgid "Settings"
msgstr "Postavke"
-#: js/js.js:764
+#: js/js.js:767
msgid "seconds ago"
msgstr "sekundi prije"
-#: js/js.js:765
+#: js/js.js:768
msgid "1 minute ago"
msgstr ""
-#: js/js.js:766
+#: js/js.js:769
msgid "{minutes} minutes ago"
msgstr ""
-#: js/js.js:767
+#: js/js.js:770
msgid "1 hour ago"
msgstr ""
-#: js/js.js:768
+#: js/js.js:771
msgid "{hours} hours ago"
msgstr ""
-#: js/js.js:769
+#: js/js.js:772
msgid "today"
msgstr "danas"
-#: js/js.js:770
+#: js/js.js:773
msgid "yesterday"
msgstr "jučer"
-#: js/js.js:771
+#: js/js.js:774
msgid "{days} days ago"
msgstr ""
-#: js/js.js:772
+#: js/js.js:775
msgid "last month"
msgstr "prošli mjesec"
-#: js/js.js:773
+#: js/js.js:776
msgid "{months} months ago"
msgstr ""
-#: js/js.js:774
+#: js/js.js:777
msgid "months ago"
msgstr "mjeseci"
-#: js/js.js:775
+#: js/js.js:778
msgid "last year"
msgstr "prošlu godinu"
-#: js/js.js:776
+#: js/js.js:779
msgid "years ago"
msgstr "godina"
@@ -242,8 +242,8 @@ msgid "The object type is not specified."
msgstr ""
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
-#: js/share.js:583
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
+#: js/share.js:594
msgid "Error"
msgstr "Pogreška"
@@ -255,15 +255,15 @@ msgstr ""
msgid "The required file {file} is not installed!"
msgstr ""
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Share"
-msgstr "Podijeli"
-
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+#: js/share.js:29 js/share.js:43 js/share.js:90
msgid "Shared"
msgstr ""
-#: js/share.js:141 js/share.js:611
+#: js/share.js:93
+msgid "Share"
+msgstr "Podijeli"
+
+#: js/share.js:141 js/share.js:622
msgid "Error while sharing"
msgstr "Greška prilikom djeljenja"
@@ -359,23 +359,23 @@ msgstr "izbriši"
msgid "share"
msgstr "djeli"
-#: js/share.js:373 js/share.js:558
+#: js/share.js:373 js/share.js:569
msgid "Password protected"
msgstr "Zaštita lozinkom"
-#: js/share.js:571
+#: js/share.js:582
msgid "Error unsetting expiration date"
msgstr "Greška prilikom brisanja datuma isteka"
-#: js/share.js:583
+#: js/share.js:594
msgid "Error setting expiration date"
msgstr "Greška prilikom postavljanja datuma isteka"
-#: js/share.js:598
+#: js/share.js:609
msgid "Sending ..."
msgstr ""
-#: js/share.js:609
+#: js/share.js:620
msgid "Email sent"
msgstr ""
@@ -390,7 +390,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud resetiranje lozinke"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index b04b656f0f5..34485e74bdd 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -93,8 +93,8 @@ msgstr "Briši"
msgid "Rename"
msgstr "Promjeni ime"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "U tijeku"
@@ -152,74 +152,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nemoguće poslati datoteku jer je prazna ili je direktorij"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Pogreška pri slanju"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Zatvori"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 datoteka se učitava"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Slanje poništeno."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Naziv"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Veličina"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Zadnja promjena"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr ""
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr ""
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr ""
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr ""
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index c221796fa03..f15f1efe649 100644
--- a/l10n/hr/files_external.po
+++ b/l10n/hr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -41,13 +41,13 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -99,7 +99,7 @@ msgid "Users"
msgstr "Korisnici"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Obriši"
@@ -111,10 +111,10 @@ msgstr ""
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index f7162d5dc4f..30fa8bb0b29 100644
--- a/l10n/hr/files_trashbin.po
+++ b/l10n/hr/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Ime"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Obriši"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 5d8097e959a..c8eec3c4b2e 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: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -148,23 +148,23 @@ msgstr "Grupa Admin"
msgid "Delete"
msgstr "Obriši"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__ime_jezika__"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 244db459496..1a4cafae957 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 14:00+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -391,7 +391,7 @@ msgstr "A frissítés nem sikerült. Kérem értesítse erről a problémáról
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud jelszó-visszaállítás"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index e9dbc61712c..d37303a2fdf 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 08:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -97,8 +97,8 @@ msgstr "Törlés"
msgid "Rename"
msgstr "Átnevezés"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Folyamatban"
@@ -156,74 +156,74 @@ msgstr "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhat
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "A tároló majdnem tele van ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Feltöltési hiba"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Bezárás"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 fájl töltődik föl"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} fájl töltődik föl"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "A feltöltést megszakítottuk."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "Az URL nem lehet semmi."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Érvénytelen mappanév. A név használata csak a Owncloud számára lehetséges."
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Név"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Méret"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Módosítva"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 mappa"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} mappa"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 fájl"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} fájl"
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index 450c7e05616..af24c19037a 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 19:20+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -41,13 +41,13 @@ msgstr "Adjon meg egy érvényes Dropbox app key-t és secretet!"
msgid "Error configuring Google Drive storage"
msgstr "A Google Drive tárolót nem sikerült beállítani"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Figyelem:</b> az \"smbclient\" nincs telepítve a kiszolgálón. Emiatt nem lehet CIFS/SMB megosztásokat fölcsatolni. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -115,6 +115,6 @@ msgstr "Lehetővé teszi, hogy a felhasználók külső tárolási szolgáltatá
msgid "SSL root certificates"
msgstr "SSL tanúsítványok"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "SSL tanúsítványok importálása"
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index 45b1df8c92a..77f4f58eadc 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 13:30+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Nem sikerült %s végleges törlése"
@@ -28,35 +28,39 @@ msgstr "Nem sikerült %s végleges törlése"
msgid "Couldn't restore %s"
msgstr "Nem sikerült %s visszaállítása"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "a visszaállítás végrehajtása"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "az állomány végleges törlése"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Végleges törlés"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Név"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Törölve"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 mappa"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} mappa"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 fájl"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} fájl"
@@ -67,3 +71,7 @@ msgstr "Itt nincs semmi. Az Ön szemetes mappája üres!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Visszaállítás"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Törlés"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 54b93c6397a..1e8ca3e6b63 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -149,23 +149,23 @@ msgstr "Csoportadminisztrátor"
msgid "Delete"
msgstr "Törlés"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr "csoport hozzáadása"
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr "Érvényes felhasználónevet kell megadnia"
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr "A felhasználó nem hozható létre"
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr "Érvényes jelszót kell megadnia"
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 57f0d5ce5f8..a1a90998d4c 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,209 +7,221 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-19 02:03+0200\n"
-"PO-Revision-Date: 2012-10-19 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
-"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\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"
-#: ajax/upload.php:20
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:26
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:21
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+#: ajax/upload.php:27
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:22
+#: ajax/upload.php:29
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:23
+#: ajax/upload.php:31
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:24
+#: ajax/upload.php:32
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:25
+#: ajax/upload.php:33
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:26
+#: ajax/upload.php:34
msgid "Failed to write to disk"
msgstr ""
-#: appinfo/app.php:6
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:10
msgid "Files"
msgstr ""
-#: js/fileactions.js:108 templates/index.php:62
-msgid "Unshare"
+#: js/fileactions.js:125
+msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:110 templates/index.php:64
+#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
msgid "Delete"
-msgstr ""
+msgstr "Ջնջել"
-#: js/fileactions.js:182
+#: js/fileactions.js:193
msgid "Rename"
msgstr ""
-#: js/filelist.js:194 js/filelist.js:196
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:253 js/filelist.js:255
msgid "{new_name} already exists"
msgstr ""
-#: js/filelist.js:194 js/filelist.js:196
+#: js/filelist.js:253 js/filelist.js:255
msgid "replace"
msgstr ""
-#: js/filelist.js:194
+#: js/filelist.js:253
msgid "suggest name"
msgstr ""
-#: js/filelist.js:194 js/filelist.js:196
+#: js/filelist.js:253 js/filelist.js:255
msgid "cancel"
msgstr ""
-#: js/filelist.js:243
+#: js/filelist.js:295
msgid "replaced {new_name}"
msgstr ""
-#: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279
+#: js/filelist.js:295 js/filelist.js:297
msgid "undo"
msgstr ""
-#: js/filelist.js:245
+#: js/filelist.js:297
msgid "replaced {new_name} with {old_name}"
msgstr ""
-#: js/filelist.js:277
-msgid "unshared {files}"
+#: js/filelist.js:322
+msgid "perform delete operation"
msgstr ""
-#: js/filelist.js:279
-msgid "deleted {files}"
+#: js/files.js:52
+msgid "'.' is an invalid file name."
msgstr ""
-#: js/files.js:179
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:56
+msgid "File name cannot be empty."
msgstr ""
-#: js/files.js:214
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
msgstr ""
-#: js/files.js:214
-msgid "Upload Error"
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr ""
-#: js/files.js:242 js/files.js:347 js/files.js:377
-msgid "Pending"
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:225
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
msgstr ""
#: js/files.js:262
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:262
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:273
+msgid "Close"
+msgstr "Փակել"
+
+#: js/files.js:312
msgid "1 file uploading"
msgstr ""
-#: js/files.js:265 js/files.js:310 js/files.js:325
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:328 js/files.js:361
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:430
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:500
-msgid "Invalid name, '/' is not allowed."
+#: js/files.js:570
+msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:681
-msgid "{count} files scanned"
+#: js/files.js:575
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:689
-msgid "error while scanning"
-msgstr ""
-
-#: js/files.js:762 templates/index.php:48
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:763 templates/index.php:56
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:764 templates/index.php:58
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:791
+#: js/files.js:970
msgid "1 folder"
msgstr ""
-#: js/files.js:793
+#: js/files.js:972
msgid "{count} folders"
msgstr ""
-#: js/files.js:801
+#: js/files.js:980
msgid "1 file"
msgstr ""
-#: js/files.js:803
+#: js/files.js:982
msgid "{count} files"
msgstr ""
-#: js/files.js:846
-msgid "seconds ago"
-msgstr ""
-
-#: js/files.js:847
-msgid "1 minute ago"
-msgstr ""
-
-#: js/files.js:848
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/files.js:851
-msgid "today"
-msgstr ""
-
-#: js/files.js:852
-msgid "yesterday"
-msgstr ""
-
-#: js/files.js:853
-msgid "{days} days ago"
-msgstr ""
-
-#: js/files.js:854
-msgid "last month"
-msgstr ""
-
-#: js/files.js:856
-msgid "months ago"
-msgstr ""
-
-#: js/files.js:857
-msgid "last year"
-msgstr ""
-
-#: js/files.js:858
-msgid "years ago"
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
msgstr ""
#: templates/admin.php:5
@@ -220,80 +232,84 @@ msgstr ""
msgid "Maximum upload size"
msgstr ""
-#: templates/admin.php:7
+#: templates/admin.php:10
msgid "max. possible: "
msgstr ""
-#: templates/admin.php:9
+#: templates/admin.php:15
msgid "Needed for multi-file and folder downloads."
msgstr ""
-#: templates/admin.php:9
+#: templates/admin.php:17
msgid "Enable ZIP-download"
msgstr ""
-#: templates/admin.php:11
+#: templates/admin.php:20
msgid "0 is unlimited"
msgstr ""
-#: templates/admin.php:12
+#: templates/admin.php:22
msgid "Maximum input size for ZIP files"
msgstr ""
-#: templates/admin.php:14
+#: templates/admin.php:26
msgid "Save"
-msgstr ""
+msgstr "Պահպանել"
#: templates/index.php:7
msgid "New"
msgstr ""
-#: templates/index.php:9
+#: templates/index.php:10
msgid "Text file"
msgstr ""
-#: templates/index.php:10
+#: templates/index.php:12
msgid "Folder"
msgstr ""
-#: templates/index.php:11
-msgid "From url"
+#: templates/index.php:14
+msgid "From link"
msgstr ""
-#: templates/index.php:20
-msgid "Upload"
+#: templates/index.php:40
+msgid "Deleted files"
msgstr ""
-#: templates/index.php:27
+#: templates/index.php:46
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:59
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:50
-msgid "Share"
-msgstr ""
-
-#: templates/index.php:52
+#: templates/index.php:73
msgid "Download"
+msgstr "Բեռնել"
+
+#: templates/index.php:85 templates/index.php:86
+msgid "Unshare"
msgstr ""
-#: templates/index.php:75
+#: templates/index.php:105
msgid "Upload too large"
msgstr ""
-#: templates/index.php:77
+#: templates/index.php:107
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:82
+#: templates/index.php:112
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:85
+#: templates/index.php:115
msgid "Current scanning"
msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index 3ad25c76e79..8f3ff63ea6d 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/files_external.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
-"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -41,66 +41,80 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
+#: lib/config.php:398
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:401
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
#: templates/settings.php:3
msgid "External Storage"
msgstr ""
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
msgid "Mount point"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
msgid "Backend"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:10
msgid "Configuration"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:11
msgid "Options"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid "Applicable"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:27
msgid "Add mount point"
msgstr ""
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
msgid "None set"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:86
msgid "All Users"
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:87
msgid "Groups"
msgstr ""
-#: templates/settings.php:69
+#: templates/settings.php:95
msgid "Users"
msgstr ""
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
-msgstr ""
+msgstr "Ջնջել"
-#: templates/settings.php:87
+#: templates/settings.php:124
msgid "Enable User External Storage"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:125
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:113
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
new file mode 100644
index 00000000000..79b83d2bb2f
--- /dev/null
+++ b/l10n/hy/files_trashbin.po
@@ -0,0 +1,76 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-01-31 16:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\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"
+
+#: ajax/delete.php:40
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:96
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:34
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:152 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:161
+msgid "1 folder"
+msgstr ""
+
+#: js/trash.js:163
+msgid "{count} folders"
+msgstr ""
+
+#: js/trash.js:171
+msgid "1 file"
+msgstr ""
+
+#: js/trash.js:173
+msgid "{count} files"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Ջնջել"
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index ce1f8ccb809..32b7618bc07 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,96 +7,169 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-09 02:03+0200\n"
-"PO-Revision-Date: 2012-10-09 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
-"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\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"
-#: ajax/apps/ocs.php:23
+#: ajax/apps/ocs.php:20
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
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
+#: ajax/togglegroups.php:18
msgid "Authentication error"
msgstr ""
-#: ajax/creategroup.php:19
+#: ajax/changedisplayname.php:32
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
msgid "Group already exists"
msgstr ""
-#: ajax/creategroup.php:28
+#: ajax/creategroup.php:19
msgid "Unable to add group"
msgstr ""
-#: ajax/enableapp.php:14
+#: ajax/enableapp.php:11
msgid "Could not enable app. "
msgstr ""
-#: ajax/lostpassword.php:14
+#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr ""
-#: ajax/lostpassword.php:16
+#: ajax/lostpassword.php:14
msgid "Invalid email"
msgstr ""
-#: ajax/openid.php:16
-msgid "OpenID Changed"
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
msgstr ""
-#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
-msgid "Invalid request"
+#: ajax/removeuser.php:24
+msgid "Unable to delete user"
msgstr ""
-#: ajax/removegroup.php:16
-msgid "Unable to delete group"
+#: ajax/setlanguage.php:15
+msgid "Language changed"
msgstr ""
-#: ajax/removeuser.php:22
-msgid "Unable to delete user"
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
msgstr ""
-#: ajax/setlanguage.php:18
-msgid "Language changed"
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
msgstr ""
-#: ajax/togglegroups.php:25
+#: ajax/togglegroups.php:28
#, php-format
msgid "Unable to add user to group %s"
msgstr ""
-#: ajax/togglegroups.php:31
+#: ajax/togglegroups.php:34
#, php-format
msgid "Unable to remove user from group %s"
msgstr ""
-#: js/apps.js:28 js/apps.js:65
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: js/apps.js:30
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:36 js/apps.js:76
msgid "Disable"
msgstr ""
-#: js/apps.js:28 js/apps.js:54
+#: js/apps.js:36 js/apps.js:64
msgid "Enable"
msgstr ""
-#: js/personal.js:69
+#: js/apps.js:55
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:84
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:90
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:96
msgid "Saving..."
msgstr ""
-#: personal.php:47 personal.php:48
+#: js/users.js:30
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:30
+msgid "undo"
+msgstr ""
+
+#: js/users.js:62
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:75 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:78 templates/users.php:82 templates/users.php:119
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:99 templates/users.php:161
+msgid "Delete"
+msgstr "Ջնջել"
+
+#: js/users.js:191
+msgid "add group"
+msgstr ""
+
+#: js/users.js:352
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:353 js/users.js:359 js/users.js:374
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:358
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
-#: templates/admin.php:14
+#: templates/admin.php:15
msgid "Security Warning"
msgstr ""
-#: templates/admin.php:17
+#: templates/admin.php:18
msgid ""
"Your data directory and your files are probably accessible from the "
"internet. The .htaccess file that ownCloud provides is not working. We "
@@ -105,71 +178,149 @@ msgid ""
" webserver document root."
msgstr ""
-#: templates/admin.php:31
+#: templates/admin.php:29
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:32
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:47
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:61
+msgid ""
+"This ownCloud server can't set system locale to "
+"\"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with"
+" certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support en_US.UTF-8/en_US.UTF8."
+msgstr ""
+
+#: templates/admin.php:72
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:75
+msgid ""
+"This ownCloud server has no working internet connection. This means that "
+"some of the features like mounting of external storage, notifications about "
+"updates or installation of 3rd party apps don´t work. Accessing files from "
+"remote and sending of notification emails might also not work. We suggest to"
+" enable internet connection for this server if you want to have all features"
+" of ownCloud."
+msgstr ""
+
+#: templates/admin.php:89
msgid "Cron"
msgstr ""
-#: templates/admin.php:37
+#: templates/admin.php:98
msgid "Execute one task with each page loaded"
msgstr ""
-#: templates/admin.php:43
+#: templates/admin.php:108
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
+#: templates/admin.php:118
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
+#: templates/admin.php:125
msgid "Sharing"
msgstr ""
-#: templates/admin.php:61
+#: templates/admin.php:131
msgid "Enable Share API"
msgstr ""
-#: templates/admin.php:62
+#: templates/admin.php:132
msgid "Allow apps to use the Share API"
msgstr ""
-#: templates/admin.php:67
+#: templates/admin.php:139
msgid "Allow links"
msgstr ""
-#: templates/admin.php:68
+#: templates/admin.php:140
msgid "Allow users to share items to the public with links"
msgstr ""
-#: templates/admin.php:73
+#: templates/admin.php:147
msgid "Allow resharing"
msgstr ""
-#: templates/admin.php:74
+#: templates/admin.php:148
msgid "Allow users to share items shared with them again"
msgstr ""
-#: templates/admin.php:79
+#: templates/admin.php:155
msgid "Allow users to share with anyone"
msgstr ""
-#: templates/admin.php:81
+#: templates/admin.php:158
msgid "Allow users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:88
+#: templates/admin.php:165
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:178
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:179
+msgid ""
+"Enforces the clients to connect to ownCloud via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:182
+msgid ""
+"Please connect to this ownCloud instance via HTTPS to enable or disable the "
+"SSL enforcement."
+msgstr ""
+
+#: templates/admin.php:192
msgid "Log"
msgstr ""
-#: templates/admin.php:116
+#: templates/admin.php:193
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:220
msgid "More"
msgstr ""
-#: templates/admin.php:124
+#: templates/admin.php:227 templates/personal.php:98
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:230 templates/personal.php:100
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -187,113 +338,129 @@ msgstr ""
msgid "More Apps"
msgstr ""
-#: templates/apps.php:27
+#: templates/apps.php:24
msgid "Select an App"
msgstr ""
-#: templates/apps.php:31
+#: templates/apps.php:28
msgid "See application page at apps.owncloud.com"
msgstr ""
-#: templates/apps.php:32
+#: templates/apps.php:29
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/apps.php:31
+msgid "Update"
msgstr ""
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:3
+msgid "User Documentation"
msgstr ""
-#: templates/help.php:11
-msgid "Ask a question"
+#: templates/help.php:4
+msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:23
-msgid "Problems connecting to help database."
+#: templates/help.php:6
+msgid "Online Documentation"
msgstr ""
-#: templates/help.php:24
-msgid "Go there manually."
+#: templates/help.php:7
+msgid "Forum"
msgstr ""
-#: templates/help.php:32
-msgid "Answer"
+#: templates/help.php:9
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Commercial Support"
msgstr ""
#: templates/personal.php:8
#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:14
+msgid "Get the apps to sync your files"
msgstr ""
-#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
+#: templates/personal.php:25
+msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:13
-msgid "Download"
+#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+msgid "Password"
msgstr ""
-#: templates/personal.php:19
+#: templates/personal.php:37
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:20
+#: templates/personal.php:38
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:21
+#: templates/personal.php:39
msgid "Current password"
msgstr ""
-#: templates/personal.php:22
+#: templates/personal.php:40
msgid "New password"
msgstr ""
-#: templates/personal.php:23
-msgid "show"
+#: templates/personal.php:42
+msgid "Change password"
msgstr ""
-#: templates/personal.php:24
-msgid "Change password"
+#: templates/personal.php:54 templates/users.php:78
+msgid "Display Name"
msgstr ""
-#: templates/personal.php:30
+#: templates/personal.php:55
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:56
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:59
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:68
msgid "Email"
msgstr ""
-#: templates/personal.php:31
+#: templates/personal.php:69
msgid "Your email address"
msgstr ""
-#: templates/personal.php:32
+#: templates/personal.php:70
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:76 templates/personal.php:77
msgid "Language"
msgstr ""
-#: templates/personal.php:44
+#: templates/personal.php:82
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"
+#: templates/personal.php:87
+msgid "WebDAV"
msgstr ""
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
+#: templates/personal.php:89
+msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
-#: templates/users.php:26 templates/users.php:78 templates/users.php:98
-msgid "Groups"
+#: templates/users.php:21 templates/users.php:77
+msgid "Login Name"
msgstr ""
#: templates/users.php:32
@@ -301,21 +468,29 @@ msgid "Create"
msgstr ""
#: templates/users.php:35
-msgid "Default Quota"
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:41 templates/users.php:139
+msgid "Unlimited"
msgstr ""
-#: templates/users.php:55 templates/users.php:138
+#: templates/users.php:59 templates/users.php:154
msgid "Other"
+msgstr "Այլ"
+
+#: templates/users.php:84
+msgid "Storage"
msgstr ""
-#: templates/users.php:80 templates/users.php:112
-msgid "Group Admin"
+#: templates/users.php:95
+msgid "change display name"
msgstr ""
-#: templates/users.php:82
-msgid "Quota"
+#: templates/users.php:99
+msgid "set new password"
msgstr ""
-#: templates/users.php:146
-msgid "Delete"
+#: templates/users.php:134
+msgid "Default"
msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 385d32959dc..d545c83f5ee 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-02-08 23:12+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -157,59 +157,59 @@ msgstr "Novembre"
msgid "December"
msgstr "Decembre"
-#: js/js.js:284
+#: js/js.js:286
msgid "Settings"
msgstr "Configurationes"
-#: js/js.js:764
+#: js/js.js:767
msgid "seconds ago"
msgstr ""
-#: js/js.js:765
+#: js/js.js:768
msgid "1 minute ago"
msgstr ""
-#: js/js.js:766
+#: js/js.js:769
msgid "{minutes} minutes ago"
msgstr ""
-#: js/js.js:767
+#: js/js.js:770
msgid "1 hour ago"
msgstr ""
-#: js/js.js:768
+#: js/js.js:771
msgid "{hours} hours ago"
msgstr ""
-#: js/js.js:769
+#: js/js.js:772
msgid "today"
msgstr ""
-#: js/js.js:770
+#: js/js.js:773
msgid "yesterday"
msgstr ""
-#: js/js.js:771
+#: js/js.js:774
msgid "{days} days ago"
msgstr ""
-#: js/js.js:772
+#: js/js.js:775
msgid "last month"
msgstr ""
-#: js/js.js:773
+#: js/js.js:776
msgid "{months} months ago"
msgstr ""
-#: js/js.js:774
+#: js/js.js:777
msgid "months ago"
msgstr ""
-#: js/js.js:775
+#: js/js.js:778
msgid "last year"
msgstr ""
-#: js/js.js:776
+#: js/js.js:779
msgid "years ago"
msgstr ""
@@ -239,8 +239,8 @@ msgid "The object type is not specified."
msgstr ""
#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
-#: js/share.js:583
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
+#: js/share.js:594
msgid "Error"
msgstr ""
@@ -252,15 +252,15 @@ msgstr ""
msgid "The required file {file} is not installed!"
msgstr ""
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
-msgid "Share"
-msgstr "Compartir"
-
-#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+#: js/share.js:29 js/share.js:43 js/share.js:90
msgid "Shared"
msgstr ""
-#: js/share.js:141 js/share.js:611
+#: js/share.js:93
+msgid "Share"
+msgstr "Compartir"
+
+#: js/share.js:141 js/share.js:622
msgid "Error while sharing"
msgstr ""
@@ -356,23 +356,23 @@ msgstr ""
msgid "share"
msgstr ""
-#: js/share.js:373 js/share.js:558
+#: js/share.js:373 js/share.js:569
msgid "Password protected"
msgstr ""
-#: js/share.js:571
+#: js/share.js:582
msgid "Error unsetting expiration date"
msgstr ""
-#: js/share.js:583
+#: js/share.js:594
msgid "Error setting expiration date"
msgstr ""
-#: js/share.js:598
+#: js/share.js:609
msgid "Sending ..."
msgstr ""
-#: js/share.js:609
+#: js/share.js:620
msgid "Email sent"
msgstr ""
@@ -387,7 +387,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Reinitialisation del contrasigno de ownCLoud"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 633ccdec7d2..a29c8d55495 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -92,8 +92,8 @@ msgstr "Deler"
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr ""
@@ -151,74 +151,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr ""
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Clauder"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr ""
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nomine"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Dimension"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Modificate"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr ""
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr ""
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr ""
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr ""
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index 7fa22302eb4..060fd6f7d2c 100644
--- a/l10n/ia/files_external.po
+++ b/l10n/ia/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -41,13 +41,13 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -99,7 +99,7 @@ msgid "Users"
msgstr "Usatores"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Deler"
@@ -111,10 +111,10 @@ msgstr ""
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index adba7ebd96f..5c26542ab60 100644
--- a/l10n/ia/files_trashbin.po
+++ b/l10n/ia/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nomine"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Deler"
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 774eb8a0947..46c5a721eb6 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: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -147,23 +147,23 @@ msgstr ""
msgid "Delete"
msgstr "Deler"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Interlingua"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 3ddaac2d132..c88257c6bd0 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -390,7 +390,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "reset password ownCloud"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 8acd0447cff..b880acc703a 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -93,8 +93,8 @@ msgstr "Hapus"
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Menunggu"
@@ -152,76 +152,76 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Terjadi Galat Pengunggahan"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "tutup"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr ""
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Pengunggahan dibatalkan."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "tautan tidak boleh kosong"
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nama"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Ukuran"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
-msgstr ""
+msgstr "1 map"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
-msgstr ""
+msgstr "{count} map"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
-msgstr ""
+msgstr "1 berkas"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
-msgstr ""
+msgstr "{count} berkas"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 28191e4f23c..7a7d4d5211d 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -4,13 +4,14 @@
#
# Translators:
# <mr.pige_ina@yahoo.co.id>, 2012.
+# Widya Walesa <walecha99@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 03:12+0000\n"
+"Last-Translator: w41l <walecha99@gmail.com>\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"
@@ -20,20 +21,20 @@ msgstr ""
#: templates/settings-personal.php:4 templates/settings.php:5
msgid "Encryption"
-msgstr "enkripsi"
+msgstr "Enkripsi"
#: templates/settings-personal.php:7
msgid "File encryption is enabled."
-msgstr ""
+msgstr "Enkripsi berkas aktif."
#: templates/settings-personal.php:11
msgid "The following file types will not be encrypted:"
-msgstr ""
+msgstr "Tipe berkas berikut tidak akan dienkripsi:"
#: templates/settings.php:7
msgid "Exclude the following file types from encryption:"
-msgstr ""
+msgstr "Kecualikan tipe berkas berikut dari enkripsi:"
#: templates/settings.php:12
msgid "None"
-msgstr "tidak ada"
+msgstr "Tidak ada"
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index cdec2730ac7..38580c3495f 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -4,13 +4,14 @@
#
# Translators:
# <mr.pige_ina@yahoo.co.id>, 2012.
+# Widya Walesa <walecha99@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: w41l <walecha99@gmail.com>\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"
@@ -20,102 +21,102 @@ msgstr ""
#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
msgid "Access granted"
-msgstr "akses diberikan"
+msgstr "Akses diberikan"
#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
msgid "Error configuring Dropbox storage"
-msgstr ""
+msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Dropbox"
#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
msgid "Grant access"
-msgstr "berikan hak akses"
+msgstr "Berikan hak akses"
#: js/dropbox.js:73 js/google.js:72
msgid "Fill out all required fields"
-msgstr "isi semua field yang dibutuhkan"
+msgstr "Isi semua field yang dibutuhkan"
#: js/dropbox.js:85
msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "Masukkan kunci dan sandi aplikasi Dropbox yang benar."
#: js/google.js:26 js/google.js:73 js/google.js:78
msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Peringatan:</b> \"smbclient\" tidak terpasang. Mount direktori CIFS/SMB tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
"install it."
-msgstr ""
+msgstr "<b>Peringatan:</b> Dukungan FTP di PHP tidak aktif atau tidak terpasang. Mount direktori FTP tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya."
#: templates/settings.php:3
msgid "External Storage"
-msgstr "penyimpanan eksternal"
+msgstr "Penyimpanan Eksternal"
#: templates/settings.php:8 templates/settings.php:22
msgid "Mount point"
-msgstr ""
+msgstr "Lokasi mount"
#: templates/settings.php:9
msgid "Backend"
-msgstr ""
+msgstr "Backend"
#: templates/settings.php:10
msgid "Configuration"
-msgstr "konfigurasi"
+msgstr "Konfigurasi"
#: templates/settings.php:11
msgid "Options"
-msgstr "pilihan"
+msgstr "Pilihan"
#: templates/settings.php:12
msgid "Applicable"
-msgstr "berlaku"
+msgstr "Berlaku"
#: templates/settings.php:27
msgid "Add mount point"
-msgstr ""
+msgstr "Tambah lokasi mount"
#: templates/settings.php:85
msgid "None set"
-msgstr "tidak satupun di set"
+msgstr "Tidak satupun di set"
#: templates/settings.php:86
msgid "All Users"
-msgstr "semua pengguna"
+msgstr "Semua Pengguna"
#: templates/settings.php:87
msgid "Groups"
-msgstr "grup"
+msgstr "Grup"
#: templates/settings.php:95
msgid "Users"
-msgstr "pengguna"
+msgstr "Pengguna"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
-msgstr "hapus"
+msgstr "Hapus"
#: templates/settings.php:124
msgid "Enable User External Storage"
-msgstr ""
+msgstr "Aktifkan Penyimpanan Eksternal Pengguna"
#: templates/settings.php:125
msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Ijinkan pengguna untuk me-mount penyimpanan eksternal mereka"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
-msgstr ""
+msgstr "Sertifikat root SSL"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
-msgstr ""
+msgstr "Impor Sertifikat Root"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index 15be1a566a3..3fdc100c635 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/files_trashbin.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Widya Walesa <walecha99@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -17,52 +18,60 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "Tidak dapat menghapus permanen %s"
#: ajax/undelete.php:41
#, php-format
msgid "Couldn't restore %s"
-msgstr ""
+msgstr "Tidak dapat memulihkan %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
-msgstr ""
+msgstr "jalankan operasi pemulihan"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
+msgstr "hapus berkas secara permanen"
+
+#: js/trash.js:121
+msgid "Delete permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
-msgstr "nama"
+msgstr "Nama"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
-msgstr ""
+msgstr "Dihapus"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
-msgstr ""
+msgstr "1 map"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
-msgstr ""
+msgstr "{count} map"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
-msgstr ""
+msgstr "1 berkas"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
-msgstr ""
+msgstr "{count} berkas"
#: templates/index.php:9
msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Tempat sampah anda kosong!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
-msgstr ""
+msgstr "Pulihkan"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Hapus"
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
index 490e0fc8163..5bf91c3ed03 100644
--- a/l10n/id/files_versions.po
+++ b/l10n/id/files_versions.po
@@ -4,13 +4,14 @@
#
# Translators:
# <mr.pige_ina@yahoo.co.id>, 2012.
+# Widya Walesa <walecha99@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 03:00+0000\n"
+"Last-Translator: w41l <walecha99@gmail.com>\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"
@@ -21,33 +22,33 @@ msgstr ""
#: ajax/rollbackVersion.php:15
#, php-format
msgid "Could not revert: %s"
-msgstr ""
+msgstr "Tidak dapat mengembalikan: %s"
#: history.php:40
msgid "success"
-msgstr ""
+msgstr "sukses"
#: history.php:42
#, php-format
msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "Berkas %s telah dikembalikan ke versi %s"
#: history.php:49
msgid "failure"
-msgstr ""
+msgstr "gagal"
#: history.php:51
#, php-format
msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "Berkas %s gagal dikembalikan ke versi %s"
#: history.php:68
msgid "No old versions available"
-msgstr ""
+msgstr "Versi lama tidak tersedia"
#: history.php:73
msgid "No path specified"
-msgstr ""
+msgstr "Lokasi tidak ditentukan"
#: js/versions.js:16
msgid "History"
@@ -55,7 +56,7 @@ msgstr "riwayat"
#: templates/history.php:20
msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "Kembalikan berkas ke versi sebelumnya dengan mengklik tombol kembalikan"
#: templates/settings.php:3
msgid "Files Versioning"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 32d4cfd14ee..12bb079d493 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 14:40+0000\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 03:12+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: app.php:339
+#: app.php:349
msgid "Help"
msgstr "bantu"
-#: app.php:346
+#: app.php:362
msgid "Personal"
msgstr "perseorangan"
-#: app.php:351
+#: app.php:373
msgid "Settings"
msgstr "pengaturan"
-#: app.php:356
+#: app.php:385
msgid "Users"
msgstr "pengguna"
-#: app.php:363
+#: app.php:398
msgid "Apps"
msgstr "aplikasi"
-#: app.php:365
+#: app.php:406
msgid "Admin"
msgstr "admin"
@@ -51,15 +51,15 @@ msgstr "download ZIP sedang dimatikan"
msgid "Files need to be downloaded one by one."
msgstr "file harus di unduh satu persatu"
-#: files.php:203 files.php:228
+#: files.php:204 files.php:231
msgid "Back to Files"
msgstr "kembali ke daftar file"
-#: files.php:227
+#: files.php:228
msgid "Selected files too large to generate zip file."
msgstr "file yang dipilih terlalu besar untuk membuat file zip"
-#: helper.php:226
+#: helper.php:228
msgid "couldn't be determined"
msgstr ""
@@ -119,7 +119,7 @@ msgstr ""
msgid "%s set the database host."
msgstr ""
-#: setup.php:126 setup.php:291 setup.php:336
+#: setup.php:126 setup.php:294 setup.php:339
msgid "PostgreSQL username and/or password not valid"
msgstr ""
@@ -127,7 +127,7 @@ msgstr ""
msgid "You need to enter either an existing account or the administrator."
msgstr ""
-#: setup.php:149 setup.php:423 setup.php:489
+#: setup.php:149 setup.php:427 setup.php:494
msgid "Oracle username and/or password not valid"
msgstr ""
@@ -135,51 +135,51 @@ msgstr ""
msgid "MySQL username and/or password not valid"
msgstr ""
-#: setup.php:255 setup.php:357 setup.php:366 setup.php:384 setup.php:394
-#: setup.php:403 setup.php:430 setup.php:496 setup.php:522 setup.php:529
-#: setup.php:540 setup.php:547 setup.php:556 setup.php:564 setup.php:573
-#: setup.php:579
+#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
+#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
+#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578
+#: setup.php:584
#, php-format
msgid "DB Error: \"%s\""
msgstr ""
-#: setup.php:256 setup.php:358 setup.php:367 setup.php:385 setup.php:395
-#: setup.php:404 setup.php:431 setup.php:497 setup.php:523 setup.php:530
-#: setup.php:541 setup.php:557 setup.php:565 setup.php:574
+#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
+#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
+#: setup.php:546 setup.php:562 setup.php:570 setup.php:579
#, php-format
msgid "Offending command was: \"%s\""
msgstr ""
-#: setup.php:270
+#: setup.php:273
#, php-format
msgid "MySQL user '%s'@'localhost' exists already."
msgstr ""
-#: setup.php:271
+#: setup.php:274
msgid "Drop this user from MySQL"
msgstr ""
-#: setup.php:276
+#: setup.php:279
#, php-format
msgid "MySQL user '%s'@'%%' already exists"
msgstr ""
-#: setup.php:277
+#: setup.php:280
msgid "Drop this user from MySQL."
msgstr ""
-#: setup.php:548 setup.php:580
+#: setup.php:553 setup.php:585
#, php-format
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr ""
-#: setup.php:644
+#: setup.php:649
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:645
+#: setup.php:651
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -236,16 +236,16 @@ msgstr "tahun kemarin"
msgid "years ago"
msgstr "beberapa tahun lalu"
-#: updater.php:75
+#: updater.php:78
#, php-format
msgid "%s is available. Get <a href=\"%s\">more information</a>"
msgstr "%s tersedia. dapatkan <a href=\"%s\"> info lebih lanjut</a>"
-#: updater.php:77
+#: updater.php:81
msgid "up to date"
msgstr "terbaru"
-#: updater.php:80
+#: updater.php:84
msgid "updates check is disabled"
msgstr "pengecekan pembaharuan sedang non-aktifkan"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 56cc39cb356..fe8bf52035e 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -149,23 +149,23 @@ msgstr "Admin Grup"
msgid "Delete"
msgstr "Hapus"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
@@ -389,7 +389,7 @@ msgstr ""
#: templates/personal.php:14
msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Dapatkan aplikasi untuk sinkronisasi berkas anda"
#: templates/personal.php:25
msgid "Show First Run Wizard again"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index c105afaa81b..ca5a266207c 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -4,13 +4,14 @@
#
# Translators:
# <mr.pige_ina@yahoo.co.id>, 2012.
+# Widya Walesa <walecha99@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 03:00+0000\n"
+"Last-Translator: w41l <walecha99@gmail.com>\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"
@@ -20,23 +21,23 @@ msgstr ""
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Gagal menghapus konfigurasi server"
-#: ajax/testConfiguration.php:35
+#: ajax/testConfiguration.php:36
msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Konfigurasi valid dan koneksi dapat dilakukan!"
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
msgid ""
"The configuration is valid, but the Bind failed. Please check the server "
"settings and credentials."
-msgstr ""
+msgstr "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan."
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:43
msgid ""
"The configuration is invalid. Please look in the ownCloud log for further "
"details."
-msgstr ""
+msgstr "Konfigurasi salah. Silakan lihat log ownCloud untuk lengkapnya."
#: js/settings.js:66
msgid "Deletion failed"
@@ -44,267 +45,267 @@ msgstr "penghapusan gagal"
#: js/settings.js:82
msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Ambil alih pengaturan dari konfigurasi server saat ini?"
#: js/settings.js:83
msgid "Keep settings?"
-msgstr ""
+msgstr "Biarkan pengaturan?"
#: js/settings.js:97
msgid "Cannot add server configuration"
-msgstr ""
+msgstr "Gagal menambah konfigurasi server"
#: js/settings.js:121
msgid "Connection test succeeded"
-msgstr ""
+msgstr "Tes koneksi sukses"
#: js/settings.js:126
msgid "Connection test failed"
-msgstr ""
+msgstr "Tes koneksi gagal"
#: js/settings.js:136
msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Anda ingin menghapus Konfigurasi Server saat ini?"
#: js/settings.js:137
msgid "Confirm Deletion"
-msgstr ""
+msgstr "Konfirmasi Penghapusan"
#: templates/settings.php:8
msgid ""
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
" experience unexpected behaviour. Please ask your system administrator to "
"disable one of them."
-msgstr ""
+msgstr "<b>Peringatan:/b> Aplikasi user_ldap dan user_webdavauth tidak kompatibel. Anda mungkin akan mengalami kejadian yang tidak diharapkan. Silakan minta administrator sistem untuk menonaktifkan salah satunya."
#: templates/settings.php:11
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya."
#: templates/settings.php:15
msgid "Server configuration"
-msgstr ""
+msgstr "Konfigurasi server"
-#: templates/settings.php:17
+#: templates/settings.php:18
msgid "Add Server Configuration"
-msgstr ""
+msgstr "Tambah Konfigurasi Server"
-#: templates/settings.php:21
+#: templates/settings.php:23
msgid "Host"
msgstr "host"
-#: templates/settings.php:21
+#: templates/settings.php:25
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://"
-#: templates/settings.php:22
+#: templates/settings.php:26
msgid "Base DN"
-msgstr ""
+msgstr "Base DN"
-#: templates/settings.php:22
+#: templates/settings.php:27
msgid "One Base DN per line"
-msgstr ""
+msgstr "Satu Base DN per baris"
-#: templates/settings.php:22
+#: templates/settings.php:28
msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "User DN"
-msgstr ""
+msgstr "User DN"
-#: templates/settings.php:23
+#: templates/settings.php:32
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 "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong."
-#: templates/settings.php:24
+#: templates/settings.php:33
msgid "Password"
msgstr "kata kunci"
-#: templates/settings.php:24
+#: templates/settings.php:36
msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Untuk akses anonim, biarkan DN dan Kata sandi kosong."
-#: templates/settings.php:25
+#: templates/settings.php:37
msgid "User Login Filter"
msgstr "gunakan saringan login"
-#: templates/settings.php:25
+#: templates/settings.php:40
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
-msgstr ""
+msgstr "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login."
-#: templates/settings.php:25
+#: templates/settings.php:41
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "gunakan pengganti %%uid, mis. \"uid=%%uid\""
-#: templates/settings.php:26
+#: templates/settings.php:42
msgid "User List Filter"
-msgstr ""
+msgstr "Daftar Filter Pengguna"
-#: templates/settings.php:26
+#: templates/settings.php:45
msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Definisikan filter untuk diterapkan saat menerima pengguna."
-#: templates/settings.php:26
+#: templates/settings.php:46
msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "tanpa pengganti apapun, mis. \"objectClass=seseorang\"."
-#: templates/settings.php:27
+#: templates/settings.php:47
msgid "Group Filter"
msgstr "saringan grup"
-#: templates/settings.php:27
+#: templates/settings.php:50
msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Definisikan filter untuk diterapkan saat menerima grup."
-#: templates/settings.php:27
+#: templates/settings.php:51
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\"."
-#: templates/settings.php:31
+#: templates/settings.php:55
msgid "Connection Settings"
-msgstr ""
+msgstr "Pengaturan Koneksi"
-#: templates/settings.php:33
+#: templates/settings.php:57
msgid "Configuration Active"
-msgstr ""
+msgstr "Konfigurasi Aktif"
-#: templates/settings.php:33
+#: templates/settings.php:57
msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Jika tidak dicentang, konfigurasi ini dilewati."
-#: templates/settings.php:34
+#: templates/settings.php:58
msgid "Port"
msgstr "port"
-#: templates/settings.php:35
+#: templates/settings.php:59
msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Host Cadangan (Replika)"
-#: templates/settings.php:35
+#: templates/settings.php:59
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
-msgstr ""
+msgstr "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama."
-#: templates/settings.php:36
+#: templates/settings.php:60
msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Port Cadangan (Replika)"
-#: templates/settings.php:37
+#: templates/settings.php:61
msgid "Disable Main Server"
-msgstr ""
+msgstr "Nonaktifkan Server Utama"
-#: templates/settings.php:37
+#: templates/settings.php:61
msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "Saat diaktifkan, ownCloud hanya akan terhubung ke server replika."
-#: templates/settings.php:38
+#: templates/settings.php:62
msgid "Use TLS"
msgstr "gunakan TLS"
-#: templates/settings.php:38
+#: templates/settings.php:62
msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal."
-#: templates/settings.php:39
+#: templates/settings.php:63
msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Server LDAP dengan kapitalisasi tidak sensitif (Windows)"
-#: templates/settings.php:40
+#: templates/settings.php:64
msgid "Turn off SSL certificate validation."
msgstr "matikan validasi sertivikat SSL"
-#: templates/settings.php:40
+#: templates/settings.php:64
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
-msgstr ""
+msgstr "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda."
-#: templates/settings.php:40
+#: templates/settings.php:64
msgid "Not recommended, use for testing only."
msgstr "tidak disarankan, gunakan hanya untuk pengujian."
-#: templates/settings.php:41
+#: templates/settings.php:65
msgid "in seconds. A change empties the cache."
msgstr "dalam detik. perubahan mengosongkan cache"
-#: templates/settings.php:43
+#: templates/settings.php:67
msgid "Directory Settings"
-msgstr ""
+msgstr "Pengaturan Direktori"
-#: templates/settings.php:45
+#: templates/settings.php:69
msgid "User Display Name Field"
-msgstr ""
+msgstr "Bidang Tampilan Nama Pengguna"
-#: templates/settings.php:45
+#: templates/settings.php:69
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama pengguna ownCloud."
-#: templates/settings.php:46
+#: templates/settings.php:70
msgid "Base User Tree"
-msgstr ""
+msgstr "Pohon Pengguna Dasar"
-#: templates/settings.php:46
+#: templates/settings.php:70
msgid "One User Base DN per line"
-msgstr ""
+msgstr "Satu Pengguna Base DN per baris"
-#: templates/settings.php:47
+#: templates/settings.php:71
msgid "User Search Attributes"
-msgstr ""
+msgstr "Atribut Pencarian Pengguna"
-#: templates/settings.php:47 templates/settings.php:50
+#: templates/settings.php:71 templates/settings.php:74
msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Pilihan; satu atribut per baris"
-#: templates/settings.php:48
+#: templates/settings.php:72
msgid "Group Display Name Field"
-msgstr ""
+msgstr "Bidang Tampilan Nama Grup"
-#: templates/settings.php:48
+#: templates/settings.php:72
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama grup ownCloud."
-#: templates/settings.php:49
+#: templates/settings.php:73
msgid "Base Group Tree"
-msgstr ""
+msgstr "Pohon Grup Dasar"
-#: templates/settings.php:49
+#: templates/settings.php:73
msgid "One Group Base DN per line"
-msgstr ""
+msgstr "Satu Grup Base DN per baris"
-#: templates/settings.php:50
+#: templates/settings.php:74
msgid "Group Search Attributes"
-msgstr ""
+msgstr "Atribut Pencarian Grup"
-#: templates/settings.php:51
+#: templates/settings.php:75
msgid "Group-Member association"
-msgstr ""
+msgstr "asosiasi Anggota-Grup"
-#: templates/settings.php:53
+#: templates/settings.php:77
msgid "Special Attributes"
-msgstr ""
+msgstr "Atribut Khusus"
-#: templates/settings.php:56
+#: templates/settings.php:80
msgid "in bytes"
msgstr "dalam bytes"
-#: templates/settings.php:58
+#: templates/settings.php:82
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
-msgstr ""
+msgstr "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD."
-#: templates/settings.php:62
+#: templates/settings.php:86
msgid "Help"
msgstr "bantuan"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 0a5e526535a..ff58acb1af5 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -388,7 +388,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "endursetja ownCloud lykilorð"
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 0e399eecf6e..a3246ac5f4b 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -91,8 +91,8 @@ msgstr "Eyða"
msgid "Rename"
msgstr "Endurskýra"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Bíður"
@@ -150,74 +150,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti."
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Villa við innsendingu"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Loka"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 skrá innsend"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} skrár innsendar"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Hætt við innsendingu."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "Vefslóð má ekki vera tóm."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Óleyfilegt nafn á möppu. Nafnið 'Shared' er frátekið fyrir Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nafn"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Stærð"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Breytt"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 mappa"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} möppur"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 skrá"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} skrár"
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index 1e8fbe75517..80e9667abb7 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 18:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: sveinn <sveinng@gmail.com>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -42,13 +42,13 @@ msgstr "Gefðu upp virkan Dropbox lykil og leynikóða"
msgid "Error configuring Google Drive storage"
msgstr "Villa kom upp við að setja upp Google Drive gagnasvæði"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Aðvörun:</b> \"smbclient\" er ekki uppsettur. Uppsetning á CIFS/SMB gagnasvæðum er ekki möguleg. Hafðu samband við kerfisstjóra til að fá hann uppsettan."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -116,6 +116,6 @@ msgstr "Leyfa notendum að bæta við sínum eigin ytri gagnasvæðum"
msgid "SSL root certificates"
msgstr "SSL rótar skilríki"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Flytja inn rótar skilríki"
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index 858d3ee0764..b5725ca57fa 100644
--- a/l10n/is/files_trashbin.po
+++ b/l10n/is/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nafn"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 mappa"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} möppur"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 skrá"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} skrár"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Eyða"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 23cca9ba416..d28cbf2fbc3 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -146,23 +146,23 @@ msgstr "Hópstjóri"
msgid "Delete"
msgstr "Eyða"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__nafn_tungumáls__"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 863859a6dfb..e1bca79ae84 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -392,7 +392,7 @@ msgstr "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"http
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Ripristino password di ownCloud"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 001d45a4bea..0a7342312fb 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-16 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:30+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+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"
@@ -94,8 +94,8 @@ msgstr "Elimina"
msgid "Rename"
msgstr "Rinomina"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "In corso"
@@ -153,74 +153,74 @@ msgstr "Lo spazio di archiviazione è pieno, i file non possono essere più aggi
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Errore di invio"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Chiudi"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 file in fase di caricamento"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} file in fase di caricamentoe"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Invio annullato"
-#: js/files.js:496
+#: js/files.js:497
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:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "L'URL non può essere vuoto."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato da ownCloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nome"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Dimensione"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Modificato"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 cartella"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} cartelle"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 file"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} file"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 970dad99d8e..70cda861bee 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:42+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+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"
@@ -43,13 +43,13 @@ msgstr "Fornisci chiave di applicazione e segreto di Dropbox validi."
msgid "Error configuring Google Drive storage"
msgstr "Errore durante la configurazione dell'archivio Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Avviso:</b> \"smbclient\" non è installato. Impossibile montare condivisioni CIFS/SMB. Chiedi all'amministratore di sistema di installarlo."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -101,7 +101,7 @@ msgid "Users"
msgstr "Utenti"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Elimina"
@@ -113,10 +113,10 @@ msgstr "Abilita la memoria esterna dell'utente"
msgid "Allow users to mount their own external storage"
msgstr "Consenti agli utenti di montare la propria memoria esterna"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "Certificati SSL radice"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importa certificato radice"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index f696193957d..24a94de9a34 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:50+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Impossibile eliminare %s definitivamente"
@@ -28,35 +28,39 @@ msgstr "Impossibile eliminare %s definitivamente"
msgid "Couldn't restore %s"
msgstr "Impossibile ripristinare %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "esegui operazione di ripristino"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "elimina il file definitivamente"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Elimina definitivamente"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nome"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Eliminati"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 cartella"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} cartelle"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 file"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} file"
@@ -67,3 +71,7 @@ msgstr "Qui non c'è niente. Il tuo cestino è vuoto."
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Ripristina"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Elimina"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 590800accaa..f6f36bcf538 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: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -152,23 +152,23 @@ msgstr "Gruppi amministrati"
msgid "Delete"
msgstr "Elimina"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr "aggiungi gruppo"
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr "Deve essere fornito un nome utente valido"
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr "Errore durante la creazione dell'utente"
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr "Deve essere fornita una password valida"
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Italiano"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index c6394fa579a..c9a3092c49a 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -389,7 +389,7 @@ msgstr "更新に成功しました。この問題を <a href=\"https://github.c
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "更新に成功しました。今すぐownCloudにリダイレクトします。"
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloudのパスワードをリセットします"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 17180fdddcb..1a9d5e61da3 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-16 00:04+0100\n"
-"PO-Revision-Date: 2013-02-15 01:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -95,8 +95,8 @@ msgstr "削除"
msgid "Rename"
msgstr "名前の変更"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "保留"
@@ -154,74 +154,74 @@ msgstr "あなたのストレージは一杯です。ファイルの更新と同
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "あなたのストレージはほぼ一杯です({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。"
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "ディレクトリもしくは0バイトのファイルはアップロードできません"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "アップロードエラー"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "閉じる"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "ファイルを1つアップロード中"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} ファイルをアップロード中"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "アップロードはキャンセルされました。"
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URLは空にできません。"
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "名前"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "サイズ"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "更新日時"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 フォルダ"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} フォルダ"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 ファイル"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} ファイル"
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index 6e0b94a6f3f..547237c1cd3 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 12:24+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -43,13 +43,13 @@ msgstr "有効なDropboxアプリのキーとパスワードを入力して下
msgid "Error configuring Google Drive storage"
msgstr "Googleドライブストレージの設定エラー"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>警告:</b> \"smbclient\" はインストールされていません。CIFS/SMB 共有のマウントはできません。システム管理者にインストールをお願いして下さい。"
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -101,7 +101,7 @@ msgid "Users"
msgstr "ユーザ"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "削除"
@@ -113,10 +113,10 @@ msgstr "ユーザの外部ストレージを有効にする"
msgid "Allow users to mount their own external storage"
msgstr "ユーザに外部ストレージのマウントを許可する"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "SSLルート証明書"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "ルート証明書をインポート"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index a81dae25c6e..7e5b2cb54a7 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:50+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "%s を完全に削除出来ませんでした"
@@ -28,35 +28,39 @@ msgstr "%s を完全に削除出来ませんでした"
msgid "Couldn't restore %s"
msgstr "%s を復元出来ませんでした"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "復元操作を実行する"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "ファイルを完全に削除する"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "完全に削除する"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "名前"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "削除済み"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 フォルダ"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} フォルダ"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 ファイル"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} ファイル"
@@ -67,3 +71,7 @@ msgstr "ここには何もありません。ゴミ箱は空です!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "復元"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "削除"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index eeb11a53539..8ca5e52b51b 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -150,23 +150,23 @@ msgstr "グループ管理者"
msgid "Delete"
msgstr "削除"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr "グループを追加"
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr "有効なユーザ名を指定する必要があります"
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr "ユーザ作成エラー"
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr "有効なパスワードを指定する必要があります"
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Japanese (日本語)"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 179e1f94829..2cb4719ec66 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -387,7 +387,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud პაროლის შეცვლა"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index c0cadd90704..e09e646cfd3 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -91,8 +91,8 @@ msgstr "წაშლა"
msgid "Rename"
msgstr "გადარქმევა"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "მოცდის რეჟიმში"
@@ -150,74 +150,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "შეცდომა ატვირთვისას"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "დახურვა"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 ფაილის ატვირთვა"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} ფაილი იტვირთება"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "ატვირთვა შეჩერებულ იქნა."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას"
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "სახელი"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "ზომა"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "შეცვლილია"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 საქაღალდე"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} საქაღალდე"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 ფაილი"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} ფაილი"
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index eb5eb8256c9..b2e62bc7f8e 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -41,13 +41,13 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -99,7 +99,7 @@ msgid "Users"
msgstr "მომხმარებელი"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "წაშლა"
@@ -111,10 +111,10 @@ msgstr ""
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 89f7efa5b69..a93e459f4c9 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "სახელი"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 საქაღალდე"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} საქაღალდე"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 ფაილი"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} ფაილი"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "წაშლა"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 3f628dba71f..1199de5ea98 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -146,23 +146,23 @@ msgstr "ჯგუფის ადმინისტრატორი"
msgid "Delete"
msgstr "წაშლა"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index c3e84e4040b..4d5ca8bf43b 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -391,7 +391,7 @@ msgstr "업데이트가 실패하였습니다. 이 문제를 <a href=\"https://g
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "업데이트가 성공하였습니다. ownCloud로 돌아갑니다."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud 암호 재설정"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 42732dd887f..82f8c7ec960 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -96,8 +96,8 @@ msgstr "삭제"
msgid "Rename"
msgstr "이름 바꾸기"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "보류 중"
@@ -155,74 +155,74 @@ msgstr "저장 공간이 가득 찼습니다. 파일을 업데이트하거나
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "이 파일은 디렉터리이거나 비어 있기 때문에 업로드할 수 없습니다"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "업로드 오류"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "닫기"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "파일 1개 업로드 중"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "파일 {count}개 업로드 중"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "업로드가 취소되었습니다."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL을 입력해야 합니다."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "폴더 이름이 유효하지 않습니다. "
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "이름"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "크기"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "수정됨"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "폴더 1개"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "폴더 {count}개"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "파일 1개"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "파일 {count}개"
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index 0c7bf2da326..a117a841108 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-31 17:02+0100\n"
-"PO-Revision-Date: 2013-01-31 08:10+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Shinjo Park <kde@peremen.name>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -29,11 +29,11 @@ msgstr "접근 허가됨"
msgid "Error configuring Dropbox storage"
msgstr "Dropbox 저장소 설정 오류"
-#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:41
+#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
msgid "Grant access"
msgstr "접근 권한 부여"
-#: js/dropbox.js:73 js/google.js:73
+#: js/dropbox.js:73 js/google.js:72
msgid "Fill out all required fields"
msgstr "모든 필수 항목을 입력하십시오"
@@ -41,17 +41,17 @@ msgstr "모든 필수 항목을 입력하십시오"
msgid "Please provide a valid Dropbox app key and secret."
msgstr "올바른 Dropbox 앱 키와 암호를 입력하십시오."
-#: js/google.js:26 js/google.js:74 js/google.js:79
+#: js/google.js:26 js/google.js:73 js/google.js:78
msgid "Error configuring Google Drive storage"
msgstr "Google 드라이브 저장소 설정 오류"
-#: lib/config.php:405
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>경고:</b> \"smbclient\"가 설치되지 않았습니다. CIFS/SMB 공유 자원에 연결할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오."
-#: lib/config.php:406
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -119,6 +119,6 @@ msgstr "사용자별 외부 저장소 마운트 허용"
msgid "SSL root certificates"
msgstr "SSL 루트 인증서"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "루트 인증서 가져오기"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index d03c3476b2e..dc232ecb307 100644
--- a/l10n/ko/files_trashbin.po
+++ b/l10n/ko/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "이름"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "폴더 1개"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "폴더 {count}개"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "파일 1개"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "파일 {count}개"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "복원"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "삭제"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index d1f243a24e5..3865730fd3e 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -150,23 +150,23 @@ msgstr "그룹 관리자"
msgid "Delete"
msgstr "삭제"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "한국어"
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index 03fa59c5804..a4a5d2ace62 100644
--- a/l10n/ku_IQ/files_trashbin.po
+++ b/l10n/ku_IQ/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 23:14+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "ناو"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 59316159763..e15a264f1a7 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -388,7 +388,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud Passwuert reset"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 1c858d6cfa0..444f1bafb89 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -91,8 +91,8 @@ msgstr "Läschen"
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr ""
@@ -150,74 +150,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass."
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Fehler beim eroplueden"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Zoumaachen"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr ""
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Upload ofgebrach."
-#: js/files.js:496
+#: js/files.js:497
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:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Numm"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Gréisst"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Geännert"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr ""
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr ""
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr ""
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr ""
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index 42ed0ce33df..adbd2f2bfa0 100644
--- a/l10n/lb/files_external.po
+++ b/l10n/lb/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -41,13 +41,13 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -99,7 +99,7 @@ msgid "Users"
msgstr ""
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Läschen"
@@ -111,10 +111,10 @@ msgstr ""
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 5b1856decdf..57a40d95699 100644
--- a/l10n/lb/files_trashbin.po
+++ b/l10n/lb/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Numm"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Läschen"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 36096bf64bf..dd567e8aeb7 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: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -146,23 +146,23 @@ msgstr "Gruppen Admin"
msgid "Delete"
msgstr "Läschen"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 32243706c27..50c0876c7f7 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -388,7 +388,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud slaptažodžio atkūrimas"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 0f4c408d508..e24b5f62981 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -93,8 +93,8 @@ msgstr "Ištrinti"
msgid "Rename"
msgstr "Pervadinti"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Laukiantis"
@@ -152,74 +152,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Įkėlimo klaida"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Užverti"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "įkeliamas 1 failas"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} įkeliami failai"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Įkėlimas atšauktas."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Pavadinimas"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Dydis"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Pakeista"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 aplankalas"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} aplankalai"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 failas"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} failai"
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index 6e6e944d5af..b46644c1c76 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -43,13 +43,13 @@ msgstr "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\"."
msgid "Error configuring Google Drive storage"
msgstr "Klaida nustatinėjant Google Drive talpyklą"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -101,7 +101,7 @@ msgid "Users"
msgstr "Vartotojai"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Ištrinti"
@@ -113,10 +113,10 @@ msgstr "Įjungti vartotojų išorines saugyklas"
msgid "Allow users to mount their own external storage"
msgstr "Leisti vartotojams pridėti savo išorines saugyklas"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "SSL sertifikatas"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Įkelti pagrindinį sertifikatą"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index 928d63096ca..d212c6fa4e5 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Pavadinimas"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 aplankalas"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} aplankalai"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 failas"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} failai"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Ištrinti"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 9eacd04fb64..cb8373e66c1 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -147,23 +147,23 @@ msgstr ""
msgid "Delete"
msgstr "Ištrinti"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Kalba"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 868fa31a2bb..55f705bdd47 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -388,7 +388,7 @@ msgstr "Atjaunināšana beidzās nesekmīgi. Lūdzu, ziņojiet par šo problēmu
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud paroles maiņa"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index e51491eec5d..c1fa3bd8931 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-16 00:04+0100\n"
-"PO-Revision-Date: 2013-02-15 13:00+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -93,8 +93,8 @@ msgstr "Dzēst"
msgid "Rename"
msgstr "Pārsaukt"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Gaida savu kārtu"
@@ -152,74 +152,74 @@ msgstr "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhron
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tās izmērs ir 0 baiti"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Kļūda augšupielādējot"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Aizvērt"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "Augšupielādē 1 datni"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "augšupielādē {count} datnes"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Augšupielāde ir atcelta."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL nevar būt tukšs."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nederīgs mapes nosaukums. “Koplietots” izmantojums ir rezervēts ownCloud servisam."
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nosaukums"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Izmērs"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Mainīts"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 mape"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} mapes"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 datne"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} datnes"
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index c4fdcae0744..ada5bed70f6 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 18:30+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -42,13 +42,13 @@ msgstr "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu."
msgid "Error configuring Google Drive storage"
msgstr "Kļūda, konfigurējot Google Drive krātuvi"
-#: lib/config.php:405
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Brīdinājums:</b> nav uzinstalēts “smbclient”. Nevar montēt CIFS/SMB koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē."
-#: lib/config.php:406
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -116,6 +116,6 @@ msgstr "Ļaut lietotājiem montēt pašiem savu ārējo krātuvi"
msgid "SSL root certificates"
msgstr "SSL saknes sertifikāti"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importēt saknes sertifikātus"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 71b39e763bc..f4af7a84510 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Nevarēja pilnībā izdzēst %s"
@@ -28,35 +28,39 @@ msgstr "Nevarēja pilnībā izdzēst %s"
msgid "Couldn't restore %s"
msgstr "Nevarēja atjaunot %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "veikt atjaunošanu"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "dzēst datni pavisam"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Dzēst pavisam"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nosaukums"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Dzēsts"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 mape"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} mapes"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 datne"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} datnes"
@@ -67,3 +71,7 @@ msgstr "Šeit nekā nav. Jūsu miskaste ir tukša!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Atjaunot"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Dzēst"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index d674a9d9a10..e0e8e5915ec 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -148,23 +148,23 @@ msgstr "Grupas administrators"
msgid "Delete"
msgstr "Dzēst"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr "pievienot grupu"
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr "Jānorāda derīgs lietotājvārds"
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr "Kļūda, veidojot lietotāju"
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr "Jānorāda derīga parole"
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__valodas_nosaukums__"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index ee5062dcb09..297237da8c7 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -389,7 +389,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ресетирање на лозинка за ownCloud"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 03d2c9c8940..0d386182636 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -93,8 +93,8 @@ msgstr "Избриши"
msgid "Rename"
msgstr "Преименувај"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Чека"
@@ -152,74 +152,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Грешка при преземање"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Затвои"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 датотека се подига"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} датотеки се подигаат"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Преземањето е прекинато."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "Адресата неможе да биде празна."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Име"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Големина"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Променето"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 папка"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} папки"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 датотека"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} датотеки"
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index 586863c6b16..90c33f06a61 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-29 00:07+0100\n"
-"PO-Revision-Date: 2012-12-28 09:20+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -42,13 +42,13 @@ msgstr "Ве молам доставите валиден Dropbox клуч и т
msgid "Error configuring Google Drive storage"
msgstr "Грешка при конфигурација на Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Внимание:</b> \"smbclient\" не е инсталиран. Не е можно монтирање на CIFS/SMB дискови. Замолете го Вашиот систем администратор да го инсталира."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -116,6 +116,6 @@ msgstr "Дозволи им на корисниците да монтираат
msgid "SSL root certificates"
msgstr "SSL root сертификати"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Увези"
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index 173bc01b4e9..733fe1f429c 100644
--- a/l10n/mk/files_trashbin.po
+++ b/l10n/mk/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Име"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 папка"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} папки"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 датотека"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} датотеки"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Избриши"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 13fa26c20b6..7737d5c72fb 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -148,23 +148,23 @@ msgstr "Администратор на група"
msgid "Delete"
msgstr "Избриши"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index b1280033038..61b35a09fc7 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -389,7 +389,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Set semula kata lalaun ownCloud"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 50e095c4980..2a3bee93b76 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -94,8 +94,8 @@ msgstr "Padam"
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Dalam proses"
@@ -153,74 +153,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Muat naik ralat"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Tutup"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr ""
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Muatnaik dibatalkan."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nama "
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Saiz"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr ""
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr ""
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr ""
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr ""
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index 5e943b19f64..3d0efc11524 100644
--- a/l10n/ms_MY/files_external.po
+++ b/l10n/ms_MY/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -41,13 +41,13 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -99,7 +99,7 @@ msgid "Users"
msgstr "Pengguna"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Padam"
@@ -111,10 +111,10 @@ msgstr ""
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index 7924d440e3c..457ed8d886e 100644
--- a/l10n/ms_MY/files_trashbin.po
+++ b/l10n/ms_MY/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nama"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Padam"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 78eea9c6d7c..ea1b9bb1e23 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: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -149,23 +149,23 @@ msgstr ""
msgid "Delete"
msgstr "Padam"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "_nama_bahasa_"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
new file mode 100644
index 00000000000..f7b5644106d
--- /dev/null
+++ b/l10n/my_MM/core.po
@@ -0,0 +1,594 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Pyae Sone <gipsyhnh@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
+"PO-Revision-Date: 2013-02-24 11:20+0000\n"
+"Last-Translator: Pyae Sone <gipsyhnh@gmail.com>\n"
+"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/share.php:97
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:99
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:101
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:104
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
+#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
+msgid "Category type not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:30
+msgid "No category to add?"
+msgstr "ထည့်ရန်ခေါင်းစဉ်မရှိဘူးလား"
+
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
+#: ajax/vcategories/favorites.php:24
+#: ajax/vcategories/removeFromFavorites.php:26
+msgid "Object type not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
+msgstr ""
+
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
+msgstr "ဖျက်ရန်အတွက်ခေါင်းစဉ်မရွေးထားပါ"
+
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
+msgstr ""
+
+#: js/config.php:34
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:35
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:36
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:39
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:40
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:45
+msgid "January"
+msgstr "ဇန်နဝါရီ"
+
+#: js/config.php:46
+msgid "February"
+msgstr "ဖေဖော်ဝါရီ"
+
+#: js/config.php:47
+msgid "March"
+msgstr "မတ်"
+
+#: js/config.php:48
+msgid "April"
+msgstr "ဧပြီ"
+
+#: js/config.php:49
+msgid "May"
+msgstr "မေ"
+
+#: js/config.php:50
+msgid "June"
+msgstr "ဇွန်"
+
+#: js/config.php:51
+msgid "July"
+msgstr "ဇူလိုင်"
+
+#: js/config.php:52
+msgid "August"
+msgstr "ဩဂုတ်"
+
+#: js/config.php:53
+msgid "September"
+msgstr "စက်တင်ဘာ"
+
+#: js/config.php:54
+msgid "October"
+msgstr "အောက်တိုဘာ"
+
+#: js/config.php:55
+msgid "November"
+msgstr "နိုဝင်ဘာ"
+
+#: js/config.php:56
+msgid "December"
+msgstr "ဒီဇင်ဘာ"
+
+#: js/js.js:286
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:767
+msgid "seconds ago"
+msgstr "စက္ကန့်အနည်းငယ်က"
+
+#: js/js.js:768
+msgid "1 minute ago"
+msgstr "၁ မိနစ်အရင်က"
+
+#: js/js.js:769
+msgid "{minutes} minutes ago"
+msgstr ""
+
+#: js/js.js:770
+msgid "1 hour ago"
+msgstr "၁ နာရီ အရင်က"
+
+#: js/js.js:771
+msgid "{hours} hours ago"
+msgstr ""
+
+#: js/js.js:772
+msgid "today"
+msgstr "ယနေ့"
+
+#: js/js.js:773
+msgid "yesterday"
+msgstr "မနေ့က"
+
+#: js/js.js:774
+msgid "{days} days ago"
+msgstr ""
+
+#: js/js.js:775
+msgid "last month"
+msgstr "ပြီးခဲ့သောလ"
+
+#: js/js.js:776
+msgid "{months} months ago"
+msgstr ""
+
+#: js/js.js:777
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:778
+msgid "last year"
+msgstr "မနှစ်က"
+
+#: js/js.js:779
+msgid "years ago"
+msgstr "နှစ် အရင်က"
+
+#: js/oc-dialogs.js:126
+msgid "Choose"
+msgstr "ရွေးချယ်"
+
+#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+msgid "Cancel"
+msgstr "ပယ်ဖျက်မည်"
+
+#: js/oc-dialogs.js:162
+msgid "No"
+msgstr "မဟုတ်ဘူး"
+
+#: js/oc-dialogs.js:163
+msgid "Yes"
+msgstr "ဟုတ်"
+
+#: js/oc-dialogs.js:180
+msgid "Ok"
+msgstr "အိုကေ"
+
+#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
+#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:582
+#: js/share.js:594
+msgid "Error"
+msgstr ""
+
+#: js/oc-vcategories.js:179
+msgid "The app name is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:194
+msgid "The required file {file} is not installed!"
+msgstr ""
+
+#: js/share.js:29 js/share.js:43 js/share.js:90
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:93
+msgid "Share"
+msgstr ""
+
+#: js/share.js:141 js/share.js:622
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:152
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:159
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:168
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:170
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:175
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:180
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:183
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:185 templates/installation.php:46 templates/login.php:35
+msgid "Password"
+msgstr "စကားဝှက်"
+
+#: js/share.js:189
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:190
+msgid "Send"
+msgstr ""
+
+#: js/share.js:194
+msgid "Set expiration date"
+msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်"
+
+#: js/share.js:195
+msgid "Expiration date"
+msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်"
+
+#: js/share.js:227
+msgid "Share via email:"
+msgstr "အီးမေးလ်ဖြင့်ဝေမျှမည် -"
+
+#: js/share.js:229
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:256
+msgid "Resharing is not allowed"
+msgstr "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ"
+
+#: js/share.js:292
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:313
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:325
+msgid "can edit"
+msgstr "ပြင်ဆင်နိုင်"
+
+#: js/share.js:327
+msgid "access control"
+msgstr ""
+
+#: js/share.js:330
+msgid "create"
+msgstr "ဖန်တီးမည်"
+
+#: js/share.js:333
+msgid "update"
+msgstr ""
+
+#: js/share.js:336
+msgid "delete"
+msgstr "ဖျက်မည်"
+
+#: js/share.js:339
+msgid "share"
+msgstr "ဝေမျှမည်"
+
+#: js/share.js:373 js/share.js:569
+msgid "Password protected"
+msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်"
+
+#: js/share.js:582
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:594
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:609
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:620
+msgid "Email sent"
+msgstr ""
+
+#: js/update.js:14
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:18
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:48
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။"
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Reset email send."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Request failed!"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:40
+#: templates/login.php:28
+msgid "Username"
+msgstr "သုံးစွဲသူအမည်"
+
+#: lostpassword/templates/lostpassword.php:14
+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 "Apps"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "အက်ဒမင်"
+
+#: strings.php:9
+msgid "Help"
+msgstr "အကူအညီ"
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "မတွေ့ရှိမိပါ"
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr "ပေါင်းထည့်"
+
+#: templates/installation.php:23 templates/installation.php:30
+msgid "Security Warning"
+msgstr "လုံခြုံရေးသတိပေးချက်"
+
+#: templates/installation.php:24
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:25
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:31
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:32
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" "
+"target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:36
+msgid "Create an <strong>admin account</strong>"
+msgstr "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်"
+
+#: templates/installation.php:54
+msgid "Advanced"
+msgstr "အဆင့်မြင့်"
+
+#: templates/installation.php:56
+msgid "Data folder"
+msgstr "အချက်အလက်ဖိုလ်ဒါလ်"
+
+#: templates/installation.php:65
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:70 templates/installation.php:82
+#: templates/installation.php:93 templates/installation.php:104
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:117
+msgid "Database user"
+msgstr "Database သုံးစွဲသူ"
+
+#: templates/installation.php:122
+msgid "Database password"
+msgstr "Database စကားဝှက်"
+
+#: templates/installation.php:127
+msgid "Database name"
+msgstr "Database အမည်"
+
+#: templates/installation.php:137
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:144
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr "တပ်ဆင်ခြင်းပြီးပါပြီ။"
+
+#: templates/layout.guest.php:35
+msgid "web services under your control"
+msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
+
+#: templates/layout.user.php:53
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:11
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:13
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:19
+msgid "Lost your password?"
+msgstr "သင်၏စကားဝှက်ပျောက်သွားပြီလား။"
+
+#: templates/login.php:41
+msgid "remember"
+msgstr "မှတ်မိစေသည်"
+
+#: templates/login.php:43
+msgid "Log in"
+msgstr "ဝင်ရောက်ရန်"
+
+#: templates/login.php:49
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "ယခင်"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "နောက်သို့"
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
new file mode 100644
index 00000000000..8457d8ca859
--- /dev/null
+++ b/l10n/my_MM/files.po
@@ -0,0 +1,315 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/rename.php:22 ajax/rename.php:25
+msgid "Unable to rename file"
+msgstr ""
+
+#: ajax/upload.php:19
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:27
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:29
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:31
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:32
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:34
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:52
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:10
+msgid "Files"
+msgstr "ဖိုင်များ"
+
+#: js/fileactions.js:125
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:127 templates/index.php:91 templates/index.php:92
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:193
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:253 js/filelist.js:255
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:253 js/filelist.js:255
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:253
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:253 js/filelist.js:255
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:295
+msgid "replaced {new_name}"
+msgstr ""
+
+#: js/filelist.js:295 js/filelist.js:297
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:297
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:322
+msgid "perform delete operation"
+msgstr ""
+
+#: js/files.js:52
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:56
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:225
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:262
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:262
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:273
+msgid "Close"
+msgstr ""
+
+#: js/files.js:312
+msgid "1 file uploading"
+msgstr ""
+
+#: js/files.js:315 js/files.js:370 js/files.js:385
+msgid "{count} files uploading"
+msgstr ""
+
+#: js/files.js:388 js/files.js:423
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:497
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:570
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/files.js:575
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+msgstr ""
+
+#: js/files.js:949 templates/index.php:67
+msgid "Name"
+msgstr ""
+
+#: js/files.js:950 templates/index.php:78
+msgid "Size"
+msgstr ""
+
+#: js/files.js:951 templates/index.php:80
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:970
+msgid "1 folder"
+msgstr ""
+
+#: js/files.js:972
+msgid "{count} folders"
+msgstr ""
+
+#: js/files.js:980
+msgid "1 file"
+msgstr ""
+
+#: js/files.js:982
+msgid "{count} files"
+msgstr ""
+
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:14
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:40
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:59
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:73
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:85 templates/index.php:86
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:105
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:107
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:112
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:115
+msgid "Current scanning"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
new file mode 100644
index 00000000000..e6b714b2cb4
--- /dev/null
+++ b/l10n/my_MM/files_encryption.po
@@ -0,0 +1,38 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/settings-personal.php:4 templates/settings.php:5
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "File encryption is enabled."
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "The following file types will not be encrypted:"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Exclude the following file types from encryption:"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "None"
+msgstr ""
diff --git a/l10n/my_MM/files_external.po b/l10n/my_MM/files_external.po
new file mode 100644
index 00000000000..43ef867a3e9
--- /dev/null
+++ b/l10n/my_MM/files_external.po
@@ -0,0 +1,120 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:73 js/google.js:72
+msgid "Fill out all required fields"
+msgstr ""
+
+#: js/dropbox.js:85
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:26 js/google.js:73 js/google.js:78
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: lib/config.php:398
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:401
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:22
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "Users"
+msgstr "သုံးစွဲသူ"
+
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:144 templates/settings.php:145
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:124
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:125
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:136
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:154
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
new file mode 100644
index 00000000000..6c66538b0e2
--- /dev/null
+++ b/l10n/my_MM/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: 2013-02-25 00:05+0100\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr "စကားဝှက်"
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/public.php:10
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:13
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:19 templates/public.php:37
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:34
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:43
+msgid "web services under your control"
+msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
diff --git a/l10n/my_MM/files_trashbin.po b/l10n/my_MM/files_trashbin.po
new file mode 100644
index 00000000000..33f2492dba1
--- /dev/null
+++ b/l10n/my_MM/files_trashbin.po
@@ -0,0 +1,76 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 23:14+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/delete.php:40
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:41
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:96
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:34
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:152 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:161
+msgid "1 folder"
+msgstr ""
+
+#: js/trash.js:163
+msgid "{count} folders"
+msgstr ""
+
+#: js/trash.js:171
+msgid "1 file"
+msgstr ""
+
+#: js/trash.js:173
+msgid "{count} files"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
diff --git a/l10n/my_MM/files_versions.po b/l10n/my_MM/files_versions.po
new file mode 100644
index 00000000000..4fac18084e1
--- /dev/null
+++ b/l10n/my_MM/files_versions.po
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:68
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:73
+msgid "No path specified"
+msgstr ""
+
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
new file mode 100644
index 00000000000..b2c72b85c53
--- /dev/null
+++ b/l10n/my_MM/lib.po
@@ -0,0 +1,254 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Pyae Sone <gipsyhnh@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
+"PO-Revision-Date: 2013-02-24 08:40+0000\n"
+"Last-Translator: Pyae Sone <gipsyhnh@gmail.com>\n"
+"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: app.php:349
+msgid "Help"
+msgstr "အကူအညီ"
+
+#: app.php:362
+msgid "Personal"
+msgstr ""
+
+#: app.php:373
+msgid "Settings"
+msgstr ""
+
+#: app.php:385
+msgid "Users"
+msgstr "သုံးစွဲသူ"
+
+#: app.php:398
+msgid "Apps"
+msgstr "Apps"
+
+#: app.php:406
+msgid "Admin"
+msgstr "အက်ဒမင်"
+
+#: files.php:202
+msgid "ZIP download is turned off."
+msgstr "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည်"
+
+#: files.php:203
+msgid "Files need to be downloaded one by one."
+msgstr "ဖိုင်များသည် တစ်ခုပြီး တစ်ခုဒေါင်းလုတ်ချရန်လိုအပ်သည်"
+
+#: files.php:204 files.php:231
+msgid "Back to Files"
+msgstr "ဖိုင်သို့ပြန်သွားမည်"
+
+#: files.php:228
+msgid "Selected files too large to generate zip file."
+msgstr "zip ဖိုင်အဖြစ်ပြုလုပ်ရန် ရွေးချယ်ထားသောဖိုင်များသည် အရမ်းကြီးလွန်းသည်"
+
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "မဆုံးဖြတ်နိုင်ပါ။"
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:62 json.php:73
+msgid "Authentication error"
+msgstr "ခွင့်ပြုချက်မအောင်မြင်"
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr "ဖိုင်များ"
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr "စာသား"
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr "ပုံရိပ်များ"
+
+#: setup.php:34
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:37
+msgid "Set an admin password."
+msgstr ""
+
+#: setup.php:40
+msgid "Specify a data folder."
+msgstr ""
+
+#: setup.php:53
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: setup.php:56
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: setup.php:59
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: setup.php:62
+#, php-format
+msgid "%s set the database host."
+msgstr ""
+
+#: setup.php:126 setup.php:294 setup.php:339
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:127 setup.php:150 setup.php:204
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:149 setup.php:427 setup.php:494
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:203
+msgid "MySQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:257 setup.php:360 setup.php:369 setup.php:387 setup.php:397
+#: setup.php:406 setup.php:435 setup.php:501 setup.php:527 setup.php:534
+#: setup.php:545 setup.php:552 setup.php:561 setup.php:569 setup.php:578
+#: setup.php:584
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup.php:258 setup.php:361 setup.php:370 setup.php:388 setup.php:398
+#: setup.php:407 setup.php:436 setup.php:502 setup.php:528 setup.php:535
+#: setup.php:546 setup.php:562 setup.php:570 setup.php:579
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:273
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:274
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:279
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:280
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:553 setup.php:585
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:649
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:650
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: template.php:113
+msgid "seconds ago"
+msgstr "စက္ကန့်အနည်းငယ်က"
+
+#: template.php:114
+msgid "1 minute ago"
+msgstr "၁ မိနစ်အရင်က"
+
+#: template.php:115
+#, php-format
+msgid "%d minutes ago"
+msgstr "%d မိနစ်အရင်က"
+
+#: template.php:116
+msgid "1 hour ago"
+msgstr "၁ နာရီ အရင်က"
+
+#: template.php:117
+#, php-format
+msgid "%d hours ago"
+msgstr "%d နာရီအရင်က"
+
+#: template.php:118
+msgid "today"
+msgstr "ယနေ့"
+
+#: template.php:119
+msgid "yesterday"
+msgstr "မနေ့က"
+
+#: template.php:120
+#, php-format
+msgid "%d days ago"
+msgstr "%d ရက် အရင်က"
+
+#: template.php:121
+msgid "last month"
+msgstr "ပြီးခဲ့သောလ"
+
+#: template.php:122
+#, php-format
+msgid "%d months ago"
+msgstr "%d လအရင်က"
+
+#: template.php:123
+msgid "last year"
+msgstr "မနှစ်က"
+
+#: template.php:124
+msgid "years ago"
+msgstr "နှစ် အရင်က"
+
+#: updater.php:78
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr "%s ကိုရရှိနိုင်ပါပြီ။ <a href=\"%s\">နောက်ထပ်အချက်အလက်များ</a>ရယူပါ။"
+
+#: updater.php:81
+msgid "up to date"
+msgstr "နောက်ဆုံးပေါ်"
+
+#: updater.php:84
+msgid "updates check is disabled"
+msgstr "နောက်ဆုံးပေါ်စစ်ဆေးခြင်းကိုပိတ်ထားသည်"
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ"
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
new file mode 100644
index 00000000000..bb7c8afa2de
--- /dev/null
+++ b/l10n/my_MM/settings.po
@@ -0,0 +1,496 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
+msgid "Authentication error"
+msgstr "ခွင့်ပြုချက်မအောင်မြင်"
+
+#: ajax/changedisplayname.php:32
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/enableapp.php:11
+msgid "Could not enable app. "
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:24
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: js/apps.js:30
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:36 js/apps.js:76
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:36 js/apps.js:64
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:55
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:84
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:87
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:90
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:96
+msgid "Saving..."
+msgstr ""
+
+#: js/users.js:30
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:30
+msgid "undo"
+msgstr ""
+
+#: js/users.js:62
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:75 templates/users.php:26 templates/users.php:80
+#: templates/users.php:105
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:78 templates/users.php:82 templates/users.php:119
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:99 templates/users.php:161
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:191
+msgid "add group"
+msgstr ""
+
+#: js/users.js:352
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:353 js/users.js:359 js/users.js:374
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:358
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:29 personal.php:30
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Security Warning"
+msgstr "လုံခြုံရေးသတိပေးချက်"
+
+#: templates/admin.php:18
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/admin.php:29
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:32
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:47
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:61
+msgid ""
+"This ownCloud server can't set system locale to "
+"\"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with"
+" certain characters in file names. We strongly suggest to install the "
+"required packages on your system to support en_US.UTF-8/en_US.UTF8."
+msgstr ""
+
+#: templates/admin.php:72
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:75
+msgid ""
+"This ownCloud server has no working internet connection. This means that "
+"some of the features like mounting of external storage, notifications about "
+"updates or installation of 3rd party apps don´t work. Accessing files from "
+"remote and sending of notification emails might also not work. We suggest to"
+" enable internet connection for this server if you want to have all features"
+" of ownCloud."
+msgstr ""
+
+#: templates/admin.php:89
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:98
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:108
+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:118
+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:125
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:131
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:132
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:139
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:140
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:147
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:148
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:155
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:158
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:165
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:178
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:179
+msgid ""
+"Enforces the clients to connect to ownCloud via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:182
+msgid ""
+"Please connect to this ownCloud instance via HTTPS to enable or disable the "
+"SSL enforcement."
+msgstr ""
+
+#: templates/admin.php:192
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:193
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:220
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:227 templates/personal.php:102
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:230 templates/personal.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:11
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:12
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:34
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:36
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Update"
+msgstr ""
+
+#: templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+msgid "Password"
+msgstr "စကားဝှက်"
+
+#: templates/personal.php:38
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "New password"
+msgstr "စကားဝှက်အသစ်"
+
+#: templates/personal.php:44
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:56 templates/users.php:78
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:57
+msgid "Your display name was changed"
+msgstr ""
+
+#: templates/personal.php:58
+msgid "Unable to change your display name"
+msgstr ""
+
+#: templates/personal.php:61
+msgid "Change display name"
+msgstr ""
+
+#: templates/personal.php:70
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:72
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:73
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:79 templates/personal.php:80
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:86
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:91
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:93
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:77
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:32
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:35
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:41 templates/users.php:139
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:59 templates/users.php:154
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:84
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:95
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:99
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:134
+msgid "Default"
+msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
new file mode 100644
index 00000000000..918b95dbf34
--- /dev/null
+++ b/l10n/my_MM/user_ldap.po
@@ -0,0 +1,309 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:121
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:126
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:136
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:137
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:25
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:30
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:32
+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:33
+msgid "Password"
+msgstr "စကားဝှက်"
+
+#: templates/settings.php:36
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:37
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:40
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:41
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:42
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:46
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:57
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:58
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:59
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:61
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:63
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:64
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:65
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:70
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:70
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:71 templates/settings.php:74
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:72
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:77
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:80
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:82
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Help"
+msgstr "အကူအညီ"
diff --git a/l10n/my_MM/user_webdavauth.po b/l10n/my_MM/user_webdavauth.po
new file mode 100644
index 00000000000..45d8ff660d3
--- /dev/null
+++ b/l10n/my_MM/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: my_MM\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "URL: http://"
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 4890e17c614..70efb0326be 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -393,7 +393,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Tilbakestill ownCloud passord"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 76697364960..2268eca43ad 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -99,8 +99,8 @@ msgstr "Slett"
msgid "Rename"
msgstr "Omdøp"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Ventende"
@@ -158,74 +158,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Opplasting feilet"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Lukk"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 fil lastes opp"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} filer laster opp"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Opplasting avbrutt."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL-en kan ikke være tom."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Navn"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Størrelse"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Endret"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 mappe"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} mapper"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 fil"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} filer"
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 1888463488e..32b2593a2a9 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -42,13 +42,13 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -100,7 +100,7 @@ msgid "Users"
msgstr "Brukere"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Slett"
@@ -112,10 +112,10 @@ msgstr ""
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index d745e979401..4bb1f08e6d7 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Navn"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 mappe"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} mapper"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 fil"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} filer"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Slett"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 39c78949743..bc5820976fb 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/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: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -153,23 +153,23 @@ msgstr "Gruppeadministrator"
msgid "Delete"
msgstr "Slett"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 6a4b1b17939..18f1551101b 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -400,7 +400,7 @@ msgstr "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud wachtwoord herstellen"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 0cc281e39e4..337697f53e8 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
-"PO-Revision-Date: 2013-02-19 21:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -102,8 +102,8 @@ msgstr "Verwijder"
msgid "Rename"
msgstr "Hernoem"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Wachten"
@@ -161,74 +161,74 @@ msgstr "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Upload Fout"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Sluit"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 bestand wordt ge-upload"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} bestanden aan het uploaden"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Uploaden geannuleerd."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL kan niet leeg zijn."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Naam"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Bestandsgrootte"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Laatst aangepast"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 map"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} mappen"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 bestand"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} bestanden"
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index 73a37735f70..8f85164214a 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-21 00:09+0100\n"
-"PO-Revision-Date: 2012-12-20 17:34+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -43,13 +43,13 @@ msgstr "Geef een geldige Dropbox key en secret."
msgid "Error configuring Google Drive storage"
msgstr "Fout tijdens het configureren van Google Drive opslag"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Waarschuwing:</b> \"smbclient\" is niet geïnstalleerd. Mounten van CIFS/SMB shares is niet mogelijk. Vraag uw beheerder om smbclient te installeren."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -117,6 +117,6 @@ msgstr "Sta gebruikers toe om hun eigen externe opslag aan te koppelen"
msgid "SSL root certificates"
msgstr "SSL root certificaten"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importeer root certificaat"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 3798b0d1161..0c2f17636ad 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Kon %s niet permanent verwijderen"
@@ -28,35 +28,39 @@ msgstr "Kon %s niet permanent verwijderen"
msgid "Couldn't restore %s"
msgstr "Kon %s niet herstellen"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "uitvoeren restore operatie"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "verwijder bestanden definitief"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Verwijder definitief"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Naam"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Verwijderd"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 map"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} mappen"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 bestand"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} bestanden"
@@ -67,3 +71,7 @@ msgstr "Niets te vinden. Uw prullenbak is leeg!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Herstellen"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Verwijder"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index df5d343a7dc..e40f6951750 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 13:00+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -172,7 +172,7 @@ msgstr "Fout bij aanmaken gebruiker"
msgid "A valid password must be provided"
msgstr "Er moet een geldig wachtwoord worden opgegeven"
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Nederlands"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 06effef4db7..335991cd164 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -92,8 +92,8 @@ msgstr "Slett"
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr ""
@@ -151,74 +151,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr ""
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Lukk"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr ""
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Namn"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Storleik"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Endra"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr ""
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr ""
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr ""
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr ""
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index eb83e9d2a12..7926cc6c478 100644
--- a/l10n/nn_NO/files_external.po
+++ b/l10n/nn_NO/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -41,13 +41,13 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -99,7 +99,7 @@ msgid "Users"
msgstr "Brukarar"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Slett"
@@ -111,10 +111,10 @@ msgstr ""
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index 43941fff2c7..222802a4c90 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Namn"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Slett"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 69672b6e832..adfea6fa533 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -147,23 +147,23 @@ msgstr ""
msgid "Delete"
msgstr "Slett"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Nynorsk"
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index cb7ee02dd0c..a2b487f6866 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -387,7 +387,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "senhal d'ownCloud tornat botar"
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 57fc9bcb13e..cac46c4b495 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -91,8 +91,8 @@ msgstr "Escafa"
msgid "Rename"
msgstr "Torna nomenar"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Al esperar"
@@ -150,74 +150,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet."
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Error d'amontcargar"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr ""
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 fichièr al amontcargar"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Amontcargar anullat."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. "
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nom"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Talha"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr ""
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr ""
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr ""
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr ""
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index fcf2b75be30..576e527deb9 100644
--- a/l10n/oc/files_external.po
+++ b/l10n/oc/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -41,13 +41,13 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -99,7 +99,7 @@ msgid "Users"
msgstr "Usancièrs"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Escafa"
@@ -111,10 +111,10 @@ msgstr ""
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index f3243c02aa8..f3b37f49d9d 100644
--- a/l10n/oc/files_trashbin.po
+++ b/l10n/oc/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nom"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Escafa"
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index dd9a80413d2..7549961e643 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -146,23 +146,23 @@ msgstr "Grop Admin"
msgid "Delete"
msgstr "Escafa"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 82607700c99..4bd37a75f22 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 12:12+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: mgrvnwald <marco@mgrvnwald.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -397,7 +397,7 @@ msgstr "Aktualizacja zakończyła się niepowodzeniem. Proszę zgłosić ten pro
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "restart hasła"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 35556a13c0c..b9541a61580 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
-"PO-Revision-Date: 2013-02-19 15:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: Mariusz Fik <fisiu@opensuse.org>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -99,8 +99,8 @@ msgstr "Usuwa element"
msgid "Rename"
msgstr "Zmień nazwę"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Oczekujące"
@@ -158,74 +158,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Błąd wczytywania"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Zamknij"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 plik wczytany"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} przesyłanie plików"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Wczytywanie anulowane."
-#: js/files.js:496
+#: js/files.js:497
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:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL nie może być pusty."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nazwa folderu nieprawidłowa. Wykorzystanie \"Shared\" jest zarezerwowane przez Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nazwa"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Rozmiar"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Czas modyfikacji"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 folder"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} foldery"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 plik"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} pliki"
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index a6a1c7b5483..1793a6d1e18 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 11:26+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -44,13 +44,13 @@ msgstr "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny."
msgid "Error configuring Google Drive storage"
msgstr "Wystąpił błąd podczas konfigurowania zasobu Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Ostrzeżenie:</b> \"smbclient\" nie jest zainstalowany. Zamontowanie katalogów CIFS/SMB nie jest możliwe. Skontaktuj sie z administratorem w celu zainstalowania."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -102,7 +102,7 @@ msgid "Users"
msgstr "Użytkownicy"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Usuń"
@@ -114,10 +114,10 @@ msgstr "Włącz zewnętrzne zasoby dyskowe użytkownika"
msgid "Allow users to mount their own external storage"
msgstr "Zezwalaj użytkownikom na montowanie ich własnych zewnętrznych zasobów dyskowych"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "Główny certyfikat SSL"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importuj główny certyfikat"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index eea8ff8f6d6..781fd3b36a1 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nazwa"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 folder"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} foldery"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 plik"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} pliki"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Przywróć"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Usuń"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index d69ae9efa29..ef84a4f9d57 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -158,23 +158,23 @@ msgstr "Grupa Admin"
msgid "Delete"
msgstr "Usuń"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Polski"
diff --git a/l10n/pl_PL/files_trashbin.po b/l10n/pl_PL/files_trashbin.po
index d35b236c8f8..e158e5a65ee 100644
--- a/l10n/pl_PL/files_trashbin.po
+++ b/l10n/pl_PL/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 23:14+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: pl_PL\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr ""
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 2fad1b25c98..f89a43e9dd0 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:10+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -397,7 +397,7 @@ msgstr "A atualização falhou. Por favor, relate este problema para a <a href=\
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A atualização teve êxito. Você será redirecionado ao ownCloud agora."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Redefinir senha ownCloud"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 9e297e235b1..f92e74a24d7 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -10,15 +10,16 @@
# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
# <targinosilveira@gmail.com>, 2012.
# Thiago Vicente <thiagovice@gmail.com>, 2012.
+# Tulio Simoes Martins Padilha <tuliouel@gmail.com>, 2013.
# Unforgiving Fallout <>, 2012.
# Van Der Fran <transifex@vanderland.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
+"Last-Translator: tuliouel <tuliouel@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -99,8 +100,8 @@ msgstr "Excluir"
msgid "Rename"
msgstr "Renomear"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Pendente"
@@ -158,74 +159,74 @@ msgstr "Seu armazenamento está cheio, arquivos não serão mais atualizados nem
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes."
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Erro de envio"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Fechar"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "enviando 1 arquivo"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "Enviando {count} arquivos"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Envio cancelado."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL não pode ficar em branco"
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nome de pasta inválido. O uso de 'Shared' é reservado para o Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nome"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Tamanho"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 pasta"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} pastas"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 arquivo"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} arquivos"
@@ -283,7 +284,7 @@ msgstr "Do link"
#: templates/index.php:40
msgid "Deleted files"
-msgstr ""
+msgstr "Arquivos apagados"
#: templates/index.php:46
msgid "Cancel upload"
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index 5f0a169ed2d..bb62fe971e5 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 22:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -43,13 +43,13 @@ msgstr "Por favor forneça um app key e secret válido do Dropbox"
msgid "Error configuring Google Drive storage"
msgstr "Erro ao configurar armazenamento do Google Drive"
-#: lib/config.php:413
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Aviso:</b> \"smbclient\" não está instalado. Não será possível montar compartilhamentos de CIFS/SMB. Por favor, peça ao seu administrador do sistema para instalá-lo."
-#: lib/config.php:414
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -117,6 +117,6 @@ msgstr "Permitir usuários a montar seus próprios armazenamentos externos"
msgid "SSL root certificates"
msgstr "Certificados SSL raíz"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importar Certificado Raíz"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index e5e109080a8..332e051fae8 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 00:00+0000\n"
-"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Não foi possível excluir %s permanentemente"
@@ -28,35 +28,39 @@ msgstr "Não foi possível excluir %s permanentemente"
msgid "Couldn't restore %s"
msgstr "Não foi possível restaurar %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "realizar operação de restauração"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "excluir arquivo permanentemente"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Excluir permanentemente"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nome"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Excluído"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 pasta"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} pastas"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 arquivo"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} arquivos"
@@ -67,3 +71,7 @@ msgstr "Nada aqui. Sua lixeira está vazia!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Restaurar"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Excluir"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index d73ca9e69d5..98ae4e17244 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 00:20+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -171,7 +171,7 @@ msgstr "Erro ao criar usuário"
msgid "A valid password must be provided"
msgstr "Forneça uma senha válida"
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Português (Brasil)"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index f3ba82a97b8..31113fe0d42 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 14:10+0000\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 20:00+0000\n"
"Last-Translator: tuliouel <tuliouel@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -46,7 +46,7 @@ msgstr "Remoção falhou"
#: js/settings.js:82
msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Tomar parámetros de recente configuração de servidor?"
#: js/settings.js:83
msgid "Keep settings?"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 8e36e6786ef..3a972374e6d 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -394,7 +394,7 @@ msgstr "A actualização falhou. Por favor reporte este incidente seguindo este
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Reposição da password ownCloud"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 97c80512770..a9cdf6595e4 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-16 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:10+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -98,8 +98,8 @@ msgstr "Apagar"
msgid "Rename"
msgstr "Renomear"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Pendente"
@@ -157,74 +157,74 @@ msgstr "O seu armazenamento está cheio, os ficheiros não podem ser sincronizad
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Erro no envio"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Fechar"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "A enviar 1 ficheiro"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "A carregar {count} ficheiros"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Envio cancelado."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "O URL não pode estar vazio."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Nome de pasta inválido. O Uso de 'shared' é reservado para o ownCloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nome"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Tamanho"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Modificado"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 pasta"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} pastas"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 ficheiro"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} ficheiros"
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 6319794b213..e1c76803d83 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-18 00:13+0100\n"
-"PO-Revision-Date: 2012-12-17 01:29+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -43,13 +43,13 @@ msgstr "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas."
msgid "Error configuring Google Drive storage"
msgstr "Erro ao configurar o armazenamento do Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Aviso:</b> O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -101,7 +101,7 @@ msgid "Users"
msgstr "Utilizadores"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Apagar"
@@ -113,10 +113,10 @@ msgstr "Activar Armazenamento Externo para o Utilizador"
msgid "Allow users to mount their own external storage"
msgstr "Permitir que os utilizadores montem o seu próprio armazenamento externo"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "Certificados SSL de raiz"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importar Certificado Root"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index 653dc5d2337..a07384333bf 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Não foi possível eliminar %s de forma permanente"
@@ -28,35 +28,39 @@ msgstr "Não foi possível eliminar %s de forma permanente"
msgid "Couldn't restore %s"
msgstr "Não foi possível restaurar %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "Restaurar"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "Eliminar permanentemente o(s) ficheiro(s)"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Eliminar permanentemente"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nome"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Apagado"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 pasta"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} pastas"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 ficheiro"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} ficheiros"
@@ -67,3 +71,7 @@ msgstr "Não ha ficheiros. O lixo está vazio"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Restaurar"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Apagar"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 03a761e64fb..8d135081991 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/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: 2013-02-16 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:10+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: Mouxy <daniel@mouxy.net>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index a9fbdcdf8b2..6a1ff327f34 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -392,7 +392,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Resetarea parolei ownCloud "
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 828e14ff110..54ea2dd98a6 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -96,8 +96,8 @@ msgstr "Șterge"
msgid "Rename"
msgstr "Redenumire"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "În așteptare"
@@ -155,74 +155,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes."
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Eroare la încărcare"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Închide"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "un fișier se încarcă"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} fisiere incarcate"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Încărcare anulată."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "Adresa URL nu poate fi goală."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Invalid folder name. Usage of 'Shared' is reserved by Ownclou"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Nume"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Dimensiune"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Modificat"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 folder"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} foldare"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 fisier"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} fisiere"
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index fd43a0fd65b..fe533cfcd45 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-27 00:04+0100\n"
-"PO-Revision-Date: 2013-01-25 23:25+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Dimon Pockemon <>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -43,13 +43,13 @@ msgstr "Prezintă te rog o cheie de Dropbox validă și parola"
msgid "Error configuring Google Drive storage"
msgstr "Eroare la configurarea mediului de stocare Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Atenție:</b> \"smbclient\" nu este instalat. Montarea mediilor CIFS/SMB partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleaze."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -117,6 +117,6 @@ msgstr "Permite utilizatorilor să monteze stocare externă proprie"
msgid "SSL root certificates"
msgstr "Certificate SSL root"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importă certificat root"
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index 441c56d5980..a5805521472 100644
--- a/l10n/ro/files_trashbin.po
+++ b/l10n/ro/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Nume"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 folder"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} foldare"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 fisier"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} fisiere"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Șterge"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index af1b84945b6..e1bb410edc4 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/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: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -152,23 +152,23 @@ msgstr "Grupul Admin "
msgid "Delete"
msgstr "Șterge"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "_language_name_"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 87c8db8abcc..21dfba20b35 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: Langaru <langaru@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -398,7 +398,7 @@ msgstr "При обновлении произошла ошибка. Пожал
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud..."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Сброс пароля "
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 6214f745168..573dd1596a4 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-17 00:24+0100\n"
-"PO-Revision-Date: 2013-02-16 18:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: Langaru <langaru@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -104,8 +104,8 @@ msgstr "Удалить"
msgid "Rename"
msgstr "Переименовать"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Ожидание"
@@ -163,74 +163,74 @@ msgstr "Ваше дисковое пространство полностью з
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ваше хранилище почти заполнено ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Загрузка началась. Это может потребовать много времени, если файл большого размера."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Не удается загрузить файл размером 0 байт в каталог"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Ошибка загрузки"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Закрыть"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "загружается 1 файл"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} файлов загружается"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Загрузка отменена."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "Ссылка не может быть пустой."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Название"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Размер"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Изменён"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 папка"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} папок"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 файл"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} файлов"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index e6f36547a06..1f32586bd3d 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
-"PO-Revision-Date: 2012-12-13 17:02+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: sam002 <semen@sam002.net>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -44,13 +44,13 @@ msgstr "Пожалуйста, предоставьте действующий к
msgid "Error configuring Google Drive storage"
msgstr "Ошибка при настройке хранилища Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Внимание:</b> \"smbclient\" не установлен. Подключение по CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -102,7 +102,7 @@ msgid "Users"
msgstr "Пользователи"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Удалить"
@@ -114,10 +114,10 @@ msgstr "Включить пользовательские внешние нос
msgid "Allow users to mount their own external storage"
msgstr "Разрешить пользователям монтировать их собственные внешние носители"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "Корневые сертификаты SSL"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Импортировать корневые сертификаты"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index cef3725c583..fff8f9c064f 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Langaru <langaru@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "%s не может быть удалён навсегда"
@@ -28,35 +28,39 @@ msgstr "%s не может быть удалён навсегда"
msgid "Couldn't restore %s"
msgstr "%s не может быть восстановлен"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "выполнить операцию восстановления"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "удалить файл навсегда"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Удалено навсегда"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Имя"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Удалён"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 папка"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} папок"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 файл"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} файлов"
@@ -67,3 +71,7 @@ msgstr "Здесь ничего нет. Ваша корзина пуста!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Восстановить"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Удалить"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 1ca4ef84824..3e4afb8b164 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -22,8 +22,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 06:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: Langaru <langaru@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index a8b77a5d600..b3fdce00f69 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: Langaru <langaru@gmail.com>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
@@ -389,7 +389,7 @@ msgstr "Обновление прошло неудачно. Пожалуйста
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Обновление прошло успешно. Немедленное перенаправление Вас на ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Переназначение пароля"
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index baae545b0e7..7e980374e2b 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
@@ -94,8 +94,8 @@ msgstr "Удалить"
msgid "Rename"
msgstr "Переименовать"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Ожидающий решения"
@@ -153,74 +153,74 @@ msgstr "Ваше хранилище переполнено, фалы больш
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ваше хранилище почти полно ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Идёт подготовка к скачке Вашего файла. Это может занять некоторое время, если фалы большие."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Ошибка загрузки"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Закрыть"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "загрузка 1 файла"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{количество} загружено файлов"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Загрузка отменена"
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL не должен быть пустым."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Неверное имя папки. Использование наименования 'Опубликовано' зарезервировано Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Имя"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Размер"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Изменен"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 папка"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{количество} папок"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 файл"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{количество} файлов"
diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po
index b93907dab57..b37a2763216 100644
--- a/l10n/ru_RU/files_external.po
+++ b/l10n/ru_RU/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-22 00:24+0100\n"
-"PO-Revision-Date: 2012-12-21 10:27+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+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"
@@ -42,13 +42,13 @@ msgstr "Пожалуйста представьте допустимый клю
msgid "Error configuring Google Drive storage"
msgstr "Ошибка настройки хранилища Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Предупреждение:</b> \"smbclient\" не установлен. Подключение общих папок CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -116,6 +116,6 @@ msgstr "Разрешить пользователям монтировать и
msgid "SSL root certificates"
msgstr "Корневые сертификаты SSL"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Импортировать корневые сертификаты"
diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po
index 987521a7961..a2501fc63a0 100644
--- a/l10n/ru_RU/files_trashbin.po
+++ b/l10n/ru_RU/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Langaru <langaru@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: ru_RU\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "%s не может быть удалён навсегда"
@@ -28,35 +28,39 @@ msgstr "%s не может быть удалён навсегда"
msgid "Couldn't restore %s"
msgstr "%s не может быть восстановлен"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "выполнить операцию восстановления"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "удалить файл навсегда"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Удалить навсегда"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Имя"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Удалён"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 папка"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{количество} папок"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 файл"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{количество} файлов"
@@ -67,3 +71,7 @@ msgstr "Здесь ничего нет. Ваша корзина пуста!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Восстановить"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Удалить"
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index 2f5ea18ce9a..dfce530abf4 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
@@ -147,23 +147,23 @@ msgstr "Группа Admin"
msgid "Delete"
msgstr "Удалить"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__язык_имя__"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 7d0e79ce9d0..7ea576ef320 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -389,7 +389,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud මුරපදය ප්‍රත්‍යාරම්භ කරන්න"
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 4b00adc79e9..3ba394f09d5 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -92,8 +92,8 @@ msgstr "මකන්න"
msgid "Rename"
msgstr "නැවත නම් කරන්න"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr ""
@@ -151,74 +151,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "උඩුගත කිරීමේ දෝශයක්"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "වසන්න"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 ගොනුවක් උඩගත කෙරේ"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත"
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "යොමුව හිස් විය නොහැක"
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "නම"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "ප්‍රමාණය"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "වෙනස් කළ"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 ෆොල්ඩරයක්"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr ""
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 ගොනුවක්"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr ""
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index 1c63e48b42c..295a21a1ab0 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -42,13 +42,13 @@ msgstr "කරුණාකර වලංගු Dropbox යෙදුම් යත
msgid "Error configuring Google Drive storage"
msgstr "Google Drive ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -100,7 +100,7 @@ msgid "Users"
msgstr "පරිශීලකයන්"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "මකා දමන්න"
@@ -112,10 +112,10 @@ msgstr "පරිශීලක භාහිර ගබඩාවන් සක්‍
msgid "Allow users to mount their own external storage"
msgstr "පරිශීලකයන්ට තමාගේම භාහිර ගබඩාවන් මවුන්ට් කිරීමේ අයිතිය දෙන්න"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "SSL මූල සහතිකයන්"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "මූල සහතිකය ආයාත කරන්න"
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index e19b02db18b..4013fa0197f 100644
--- a/l10n/si_LK/files_trashbin.po
+++ b/l10n/si_LK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "නම"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 ෆොල්ඩරයක්"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 ගොනුවක්"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "මකා දමන්න"
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index f63cf9b3a3d..5b2e9afdc4a 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -148,23 +148,23 @@ msgstr "කාණ්ඩ පරිපාලක"
msgid "Delete"
msgstr "මකා දමනවා"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po
index 86550447566..99f8cea940a 100644
--- a/l10n/sk/files_trashbin.po
+++ b/l10n/sk/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-09 00:12+0100\n"
-"PO-Revision-Date: 2013-01-31 16:03+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 23:14+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr ""
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index bac83aa35ff..a575644e542 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -393,7 +393,7 @@ msgstr "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https:/
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Aktualizácia bola úspešná. Presmerovávam na ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Obnovenie hesla pre ownCloud"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index a290cd58f67..f41d09fc23d 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-16 00:04+0100\n"
-"PO-Revision-Date: 2013-02-15 06:10+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -96,8 +96,8 @@ msgstr "Odstrániť"
msgid "Rename"
msgstr "Premenovať"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Čaká sa"
@@ -155,74 +155,74 @@ msgstr "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchroniz
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Vaše úložisko je takmer plné ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov."
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Chyba odosielania"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Zavrieť"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 súbor sa posiela "
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} súborov odosielaných"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Odosielanie zrušené"
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL nemôže byť prázdne"
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len pre Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Meno"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Veľkosť"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Upravené"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 priečinok"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} priečinkov"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 súbor"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} súborov"
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index 92807a28e1e..91085acb82a 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 13:30+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -44,13 +44,13 @@ msgstr "Zadajte platný kľúč aplikácie a heslo Dropbox"
msgid "Error configuring Google Drive storage"
msgstr "Chyba pri konfigurácii úložiska Google drive"
-#: lib/config.php:413
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Upozornenie:</b> \"smbclient\" nie je nainštalovaný. Nie je možné pripojenie oddielov CIFS/SMB. Požiadajte administrátora systému, nech ho nainštaluje."
-#: lib/config.php:414
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -118,6 +118,6 @@ msgstr "Povoliť používateľom pripojiť ich vlastné externé úložisko"
msgid "SSL root certificates"
msgstr "Koreňové SSL certifikáty"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importovať koreňový certifikát"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index c1d5863d679..eac6d4eb707 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:50+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,7 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Nemožno zmazať %s navždy"
@@ -29,35 +29,39 @@ msgstr "Nemožno zmazať %s navždy"
msgid "Couldn't restore %s"
msgstr "Nemožno obnoviť %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "vykonať obnovu"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "trvalo zmazať súbor"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Zmazať trvalo"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Meno"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Zmazané"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 priečinok"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} priečinkov"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 súbor"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} súborov"
@@ -68,3 +72,7 @@ msgstr "Žiadny obsah. Kôš je prázdny!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Obnoviť"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Zmazať"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 5df4ee90ecb..fffb157ca44 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 14:00+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -167,7 +167,7 @@ msgstr "Chyba pri vytváraní používateľa"
msgid "A valid password must be provided"
msgstr "Musíte zadať platné heslo"
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Slovensky"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 57d87ce6bcc..3237325869e 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -390,7 +390,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Ponastavitev gesla ownCloud"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 94b106efeaf..87d8f5e31f6 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -94,8 +94,8 @@ msgstr "Izbriši"
msgid "Rename"
msgstr "Preimenuj"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "V čakanju ..."
@@ -153,74 +153,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov."
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Napaka med nalaganjem"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Zapri"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "Pošiljanje 1 datoteke"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "nalagam {count} datotek"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Pošiljanje je preklicano."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "Naslov URL ne sme biti prazen."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Ime"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Velikost"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Spremenjeno"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 mapa"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} map"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 datoteka"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} datotek"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index f20fb0bad26..26f14a0bcfa 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
-"PO-Revision-Date: 2012-12-15 16:43+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+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"
@@ -43,13 +43,13 @@ msgstr "Vpišite veljaven ključ programa in kodo za Dropbox"
msgid "Error configuring Google Drive storage"
msgstr "Napaka nastavljanja shrambe Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Opozorilo:</b> \"smbclient\" ni nameščen. Priklapljanje CIFS/SMB pogonov ni mogoče. Prosimo, prosite vašega skrbnika, če ga namesti."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -101,7 +101,7 @@ msgid "Users"
msgstr "Uporabniki"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Izbriši"
@@ -113,10 +113,10 @@ msgstr "Omogoči uporabo zunanje podatkovne shrambe za uporabnike"
msgid "Allow users to mount their own external storage"
msgstr "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "Korenska potrdila SSL"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Uvozi korensko potrdilo"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 6bcfe28d48a..d5385c39717 100644
--- a/l10n/sl/files_trashbin.po
+++ b/l10n/sl/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Ime"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 mapa"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} map"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 datoteka"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} datotek"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Izbriši"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index f887087717c..f5ee11e28eb 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -149,23 +149,23 @@ msgstr "Skrbnik skupine"
msgid "Delete"
msgstr "Izbriši"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__ime_jezika__"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 2f093356329..1c71933f89d 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -389,7 +389,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Поништавање лозинке за ownCloud"
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 949fbc2cfc6..9e180899048 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -93,8 +93,8 @@ msgstr "Обриши"
msgid "Rename"
msgstr "Преименуј"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "На чекању"
@@ -152,74 +152,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Грешка при отпремању"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Затвори"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "Отпремам 1 датотеку"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "Отпремам {count} датотеке/а"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Отпремање је прекинуто."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Назив"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Величина"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Измењено"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 фасцикла"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} фасцикле/и"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 датотека"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} датотеке/а"
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index 867ac5a97ae..76a7547a145 100644
--- a/l10n/sr/files_external.po
+++ b/l10n/sr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -41,13 +41,13 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -99,7 +99,7 @@ msgid "Users"
msgstr "Корисници"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Обриши"
@@ -111,10 +111,10 @@ msgstr ""
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index 4e1a43a0495..17776189344 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -28,35 +28,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "врати у претходно стање"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Име"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Обрисано"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 фасцикла"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} фасцикле/и"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 датотека"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} датотеке/а"
@@ -67,3 +71,7 @@ msgstr "Овде нема ништа. Корпа за отпатке је пра
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Врати"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Обриши"
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 46a0dd8a5c2..cfbde7482ec 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -147,23 +147,23 @@ msgstr "Управник групе"
msgid "Delete"
msgstr "Обриши"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 721a34c0996..124cf95756b 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -91,8 +91,8 @@ msgstr "Obriši"
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr ""
@@ -150,74 +150,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr ""
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Zatvori"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr ""
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Ime"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Veličina"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Zadnja izmena"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr ""
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr ""
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr ""
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr ""
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index 1952c7f9474..c4764b3a362 100644
--- a/l10n/sr@latin/files_external.po
+++ b/l10n/sr@latin/files_external.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -41,13 +41,13 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -99,7 +99,7 @@ msgid "Users"
msgstr "Korisnici"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Obriši"
@@ -111,10 +111,10 @@ msgstr ""
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr ""
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index a96b8aed4fc..46d256675ab 100644
--- a/l10n/sr@latin/files_trashbin.po
+++ b/l10n/sr@latin/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: sr@latin\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Ime"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Obriši"
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index a275ec0d3a7..1f6c043a937 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: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -146,23 +146,23 @@ msgstr ""
msgid "Delete"
msgstr "Obriši"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index eb1279048c5..66e9d73211a 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -393,7 +393,7 @@ msgstr "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"http
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud"
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud lösenordsåterställning"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 4b3b2f578f0..ad31005d30c 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -97,8 +97,8 @@ msgstr "Radera"
msgid "Rename"
msgstr "Byt namn"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Väntar"
@@ -156,74 +156,74 @@ msgstr "Ditt lagringsutrymme är fullt, filer kan ej längre laddas upp eller sy
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes."
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Uppladdningsfel"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Stäng"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 filuppladdning"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} filer laddas upp"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Uppladdning avbruten."
-#: js/files.js:496
+#: js/files.js:497
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:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL kan inte vara tom."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Namn"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Storlek"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Ändrad"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 mapp"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} mappar"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 fil"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} filer"
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 0de3f3e3556..0288be2954b 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-26 00:10+0100\n"
-"PO-Revision-Date: 2012-12-25 15:20+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -42,13 +42,13 @@ msgstr "Ange en giltig Dropbox nyckel och hemlighet."
msgid "Error configuring Google Drive storage"
msgstr "Fel vid konfigurering av Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Varning:</b> \"smb-klienten\" är inte installerad. Montering av CIFS/SMB delningar är inte möjligt. Kontakta din systemadministratör för att få den installerad."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -116,6 +116,6 @@ msgstr "Tillåt användare att montera egen extern lagring"
msgid "SSL root certificates"
msgstr "SSL rotcertifikat"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Importera rotcertifikat"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index 94410d99b97..3c94578cfe9 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,7 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Kunde inte radera %s permanent"
@@ -29,35 +29,39 @@ msgstr "Kunde inte radera %s permanent"
msgid "Couldn't restore %s"
msgstr "Kunde inte återställa %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "utför återställning"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "radera filen permanent"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Radera permanent"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Namn"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Raderad"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 mapp"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} mappar"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 fil"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} filer"
@@ -68,3 +72,7 @@ msgstr "Ingenting här. Din papperskorg är tom!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Återskapa"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Radera"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 854e6c5dbac..5f570af98ee 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -154,23 +154,23 @@ msgstr "Gruppadministratör"
msgid "Delete"
msgstr "Radera"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__language_name__"
diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po
index 91113e58ba9..b7f72239297 100644
--- a/l10n/sw_KE/files_trashbin.po
+++ b/l10n/sw_KE/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 23:14+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr ""
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 0a06dc2c2a9..fb40b516181 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -387,7 +387,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud இன் கடவுச்சொல் மீளமைப்பு"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index f6d7c0f4462..1c5c7126c93 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -91,8 +91,8 @@ msgstr "அழிக்க"
msgid "Rename"
msgstr "பெயர்மாற்றம்"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "நிலுவையிலுள்ள"
@@ -150,74 +150,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "பதிவேற்றல் வழு"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "மூடுக"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 கோப்பு பதிவேற்றப்படுகிறது"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{எண்ணிக்கை} கோப்புகள் பதிவேற்றப்படுகின்றது"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL வெறுமையாக இருக்கமுடியாது."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "பெயர்"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "அளவு"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "மாற்றப்பட்டது"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 கோப்புறை"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{எண்ணிக்கை} கோப்புறைகள்"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 கோப்பு"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{எண்ணிக்கை} கோப்புகள்"
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index 196376b86f5..0ace805410c 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -42,13 +42,13 @@ msgstr "தயவுசெய்து ஒரு செல்லுபடிய
msgid "Error configuring Google Drive storage"
msgstr "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -100,7 +100,7 @@ msgid "Users"
msgstr "பயனாளர்"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "நீக்குக"
@@ -112,10 +112,10 @@ msgstr "பயனாளர் வெளி சேமிப்பை இயலு
msgid "Allow users to mount their own external storage"
msgstr "பயனாளர் அவர்களுடைய சொந்த வெளியக சேமிப்பை ஏற்ற அனுமதிக்க"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "SSL வேர் சான்றிதழ்கள்"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "வேர் சான்றிதழை இறக்குமதி செய்க"
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index aa8e5682663..7b089df6001 100644
--- a/l10n/ta_LK/files_trashbin.po
+++ b/l10n/ta_LK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "பெயர்"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 கோப்புறை"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{எண்ணிக்கை} கோப்புறைகள்"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 கோப்பு"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{எண்ணிக்கை} கோப்புகள்"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "நீக்குக"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 9b7eecce540..6af32023cf9 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -146,23 +146,23 @@ msgstr "குழு நிர்வாகி"
msgid "Delete"
msgstr "அழிக்க"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "_மொழி_பெயர்_"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index bd782be12d2..2a8f0615ace 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,24 +17,24 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ajax/share.php:85
+#: ajax/share.php:97
#, php-format
msgid "User %s shared a file with you"
msgstr ""
-#: ajax/share.php:87
+#: ajax/share.php:99
#, php-format
msgid "User %s shared a folder with you"
msgstr ""
-#: ajax/share.php:89
+#: ajax/share.php:101
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
msgstr ""
-#: ajax/share.php:91
+#: ajax/share.php:104
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,79 +80,79 @@ msgstr ""
msgid "Error removing %s from favorites."
msgstr ""
-#: js/config.php:32
+#: js/config.php:34
msgid "Sunday"
msgstr ""
-#: js/config.php:32
+#: js/config.php:35
msgid "Monday"
msgstr ""
-#: js/config.php:32
+#: js/config.php:36
msgid "Tuesday"
msgstr ""
-#: js/config.php:32
+#: js/config.php:37
msgid "Wednesday"
msgstr ""
-#: js/config.php:32
+#: js/config.php:38
msgid "Thursday"
msgstr ""
-#: js/config.php:32
+#: js/config.php:39
msgid "Friday"
msgstr ""
-#: js/config.php:32
+#: js/config.php:40
msgid "Saturday"
msgstr ""
-#: js/config.php:33
+#: js/config.php:45
msgid "January"
msgstr ""
-#: js/config.php:33
+#: js/config.php:46
msgid "February"
msgstr ""
-#: js/config.php:33
+#: js/config.php:47
msgid "March"
msgstr ""
-#: js/config.php:33
+#: js/config.php:48
msgid "April"
msgstr ""
-#: js/config.php:33
+#: js/config.php:49
msgid "May"
msgstr ""
-#: js/config.php:33
+#: js/config.php:50
msgid "June"
msgstr ""
-#: js/config.php:33
+#: js/config.php:51
msgid "July"
msgstr ""
-#: js/config.php:33
+#: js/config.php:52
msgid "August"
msgstr ""
-#: js/config.php:33
+#: js/config.php:53
msgid "September"
msgstr ""
-#: js/config.php:33
+#: js/config.php:54
msgid "October"
msgstr ""
-#: js/config.php:33
+#: js/config.php:55
msgid "November"
msgstr ""
-#: js/config.php:33
+#: js/config.php:56
msgid "December"
msgstr ""
@@ -291,7 +291,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:185 templates/installation.php:44 templates/login.php:35
+#: js/share.js:185 templates/installation.php:46 templates/login.php:35
msgid "Password"
msgstr ""
@@ -386,7 +386,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr ""
@@ -406,7 +406,7 @@ msgstr ""
msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:40
#: templates/login.php:28
msgid "Username"
msgstr ""
@@ -500,52 +500,52 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:52
+#: templates/installation.php:54
msgid "Advanced"
msgstr ""
-#: templates/installation.php:54
+#: templates/installation.php:56
msgid "Data folder"
msgstr ""
-#: templates/installation.php:61
+#: templates/installation.php:65
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:66 templates/installation.php:77
-#: templates/installation.php:87 templates/installation.php:97
+#: templates/installation.php:70 templates/installation.php:82
+#: templates/installation.php:93 templates/installation.php:104
msgid "will be used"
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:117
msgid "Database user"
msgstr ""
-#: templates/installation.php:113
+#: templates/installation.php:122
msgid "Database password"
msgstr ""
-#: templates/installation.php:117
+#: templates/installation.php:127
msgid "Database name"
msgstr ""
-#: templates/installation.php:125
+#: templates/installation.php:137
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:131
+#: templates/installation.php:144
msgid "Database host"
msgstr ""
-#: templates/installation.php:136
+#: templates/installation.php:150
msgid "Finish setup"
msgstr ""
-#: templates/layout.guest.php:33
+#: templates/layout.guest.php:35
msgid "web services under your control"
msgstr ""
-#: templates/layout.user.php:48
+#: templates/layout.user.php:53
msgid "Log out"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 7d45d571c9d..fc6f66258f2 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -50,27 +50,27 @@ msgid ""
"the HTML form"
msgstr ""
-#: ajax/upload.php:31
+#: ajax/upload.php:30
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:32
+#: ajax/upload.php:31
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:33
+#: ajax/upload.php:32
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:34
+#: ajax/upload.php:33
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:52
+#: ajax/upload.php:51
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:83
+#: ajax/upload.php:82
msgid "Invalid directory."
msgstr ""
@@ -90,8 +90,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr ""
@@ -149,74 +149,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr ""
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr ""
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr ""
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr ""
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr ""
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr ""
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr ""
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr ""
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr ""
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr ""
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr ""
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr ""
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr ""
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index b27519c01e6..eecfc2b5663 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 6e98b59654a..45d9ce016f1 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index c1f7c6dcd28..3dd26594044 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,24 +25,24 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: templates/public.php:9
+#: templates/public.php:10
#, php-format
msgid "%s shared the folder %s with you"
msgstr ""
-#: templates/public.php:11
+#: templates/public.php:13
#, php-format
msgid "%s shared the file %s with you"
msgstr ""
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:37
msgid "Download"
msgstr ""
-#: templates/public.php:29
+#: templates/public.php:34
msgid "No preview available for"
msgstr ""
-#: templates/public.php:35
+#: templates/public.php:43
msgid "web services under your control"
msgstr ""
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 0e34b311a8f..c0d9911e2a6 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ajax/delete.php:24
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr ""
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 0339eb09170..2854191572b 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,6 +60,6 @@ msgstr ""
msgid "Files Versioning"
msgstr ""
-#: templates/settings.php:4
+#: templates/settings.php:7
msgid "Enable"
msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 53147fb1c57..854f33470c4 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -177,7 +177,7 @@ msgid ""
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:651
+#: setup.php:650
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 6403daf074a..c6fe848769a 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,8 +21,8 @@ msgstr ""
msgid "Unable to load list from App Store"
msgstr ""
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:15
-#: ajax/togglegroups.php:18
+#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
msgid "Authentication error"
msgstr ""
@@ -70,12 +70,12 @@ msgstr ""
msgid "Admins can't remove themself from the admin group"
msgstr ""
-#: ajax/togglegroups.php:28
+#: ajax/togglegroups.php:30
#, php-format
msgid "Unable to add user to group %s"
msgstr ""
-#: ajax/togglegroups.php:34
+#: ajax/togglegroups.php:36
#, php-format
msgid "Unable to remove user from group %s"
msgstr ""
@@ -316,11 +316,11 @@ msgstr ""
msgid "More"
msgstr ""
-#: templates/admin.php:227 templates/personal.php:98
+#: templates/admin.php:227 templates/personal.php:102
msgid "Version"
msgstr ""
-#: templates/admin.php:230 templates/personal.php:100
+#: templates/admin.php:230 templates/personal.php:105
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
"\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -329,52 +329,52 @@ msgid ""
"General Public License\">AGPL</abbr></a>."
msgstr ""
-#: templates/apps.php:10
+#: templates/apps.php:11
msgid "Add your App"
msgstr ""
-#: templates/apps.php:11
+#: templates/apps.php:12
msgid "More Apps"
msgstr ""
-#: templates/apps.php:24
+#: templates/apps.php:28
msgid "Select an App"
msgstr ""
-#: templates/apps.php:28
+#: templates/apps.php:34
msgid "See application page at apps.owncloud.com"
msgstr ""
-#: templates/apps.php:29
+#: templates/apps.php:36
msgid ""
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr ""
-#: templates/apps.php:31
+#: templates/apps.php:38
msgid "Update"
msgstr ""
-#: templates/help.php:3
+#: templates/help.php:4
msgid "User Documentation"
msgstr ""
-#: templates/help.php:4
+#: templates/help.php:6
msgid "Administrator Documentation"
msgstr ""
-#: templates/help.php:6
+#: templates/help.php:9
msgid "Online Documentation"
msgstr ""
-#: templates/help.php:7
+#: templates/help.php:11
msgid "Forum"
msgstr ""
-#: templates/help.php:9
+#: templates/help.php:14
msgid "Bugtracker"
msgstr ""
-#: templates/help.php:11
+#: templates/help.php:17
msgid "Commercial Support"
msgstr ""
@@ -383,79 +383,79 @@ msgstr ""
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr ""
-#: templates/personal.php:14
+#: templates/personal.php:15
msgid "Get the apps to sync your files"
msgstr ""
-#: templates/personal.php:25
+#: templates/personal.php:26
msgid "Show First Run Wizard again"
msgstr ""
-#: templates/personal.php:36 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
msgid "Password"
msgstr ""
-#: templates/personal.php:37
+#: templates/personal.php:38
msgid "Your password was changed"
msgstr ""
-#: templates/personal.php:38
+#: templates/personal.php:39
msgid "Unable to change your password"
msgstr ""
-#: templates/personal.php:39
+#: templates/personal.php:40
msgid "Current password"
msgstr ""
-#: templates/personal.php:40
+#: templates/personal.php:42
msgid "New password"
msgstr ""
-#: templates/personal.php:42
+#: templates/personal.php:44
msgid "Change password"
msgstr ""
-#: templates/personal.php:54 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:78
msgid "Display Name"
msgstr ""
-#: templates/personal.php:55
+#: templates/personal.php:57
msgid "Your display name was changed"
msgstr ""
-#: templates/personal.php:56
+#: templates/personal.php:58
msgid "Unable to change your display name"
msgstr ""
-#: templates/personal.php:59
+#: templates/personal.php:61
msgid "Change display name"
msgstr ""
-#: templates/personal.php:68
+#: templates/personal.php:70
msgid "Email"
msgstr ""
-#: templates/personal.php:69
+#: templates/personal.php:72
msgid "Your email address"
msgstr ""
-#: templates/personal.php:70
+#: templates/personal.php:73
msgid "Fill in an email address to enable password recovery"
msgstr ""
-#: templates/personal.php:76 templates/personal.php:77
+#: templates/personal.php:79 templates/personal.php:80
msgid "Language"
msgstr ""
-#: templates/personal.php:82
+#: templates/personal.php:86
msgid "Help translate"
msgstr ""
-#: templates/personal.php:87
+#: templates/personal.php:91
msgid "WebDAV"
msgstr ""
-#: templates/personal.php:89
+#: templates/personal.php:93
msgid "Use this address to connect to your ownCloud in your file manager"
msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index cbc32af4131..d4c1c33115a 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 15865d8de37..496d3c2f460 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
+"POT-Creation-Date: 2013-02-25 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 37394ee13a4..6349d38593a 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: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -388,7 +388,7 @@ msgstr "การอัพเดทไม่เป็นผลสำเร็จ
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้"
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "รีเซ็ตรหัสผ่าน ownCloud"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 295ad41356c..c64178ab830 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -92,8 +92,8 @@ msgstr "ลบ"
msgid "Rename"
msgstr "เปลี่ยนชื่อ"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "อยู่ระหว่างดำเนินการ"
@@ -151,74 +151,74 @@ msgstr "พื้นที่จัดเก็บข้อมูลของค
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่"
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "เกิดข้อผิดพลาดในการอัพโหลด"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "ปิด"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "กำลังอัพโหลดไฟล์ 1 ไฟล์"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "กำลังอัพโหลด {count} ไฟล์"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "การอัพโหลดถูกยกเลิก"
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL ไม่สามารถเว้นว่างได้"
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "ชื่อ"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "ขนาด"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "ปรับปรุงล่าสุด"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 โฟลเดอร์"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} โฟลเดอร์"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 ไฟล์"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} ไฟล์"
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 6d58bbeaf81..ef6af654263 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 00:50+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+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"
@@ -42,13 +42,13 @@ msgstr "กรุณากรอกรหัส app key ของ Dropbox แล
msgid "Error configuring Google Drive storage"
msgstr "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>คำเตือน:</b> \"smbclient\" ยังไม่ได้ถูกติดตั้ง. การชี้ CIFS/SMB เพื่อแชร์ข้อมูลไม่สามารถกระทำได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -116,6 +116,6 @@ msgstr "อนุญาตให้ผู้ใช้งานสามารถ
msgid "SSL root certificates"
msgstr "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root"
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index b7f0801c5e2..17daf5430d1 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -28,35 +28,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "ดำเนินการคืนค่า"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "ชื่อ"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "ลบแล้ว"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 โฟลเดอร์"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} โฟลเดอร์"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 ไฟล์"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} ไฟล์"
@@ -67,3 +71,7 @@ msgstr "ไม่มีอะไรอยู่ในนี้ ถังขย
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "คืนค่า"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "ลบ"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 6cc808ea899..b733528d9fa 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: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -148,23 +148,23 @@ msgstr "ผู้ดูแลกลุ่ม"
msgid "Delete"
msgstr "ลบ"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "ภาษาไทย"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 6b2bbe2b27b..eff8470675f 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 20:20+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: atakan96 <tayancatakan@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -392,7 +392,7 @@ msgstr "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"h
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Güncelleme başarılı. ownCloud'a yönlendiriliyor."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud parola sıfırlama"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 3d25044bb6a..b99ed46f9cb 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 19:30+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: atakan96 <tayancatakan@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -97,8 +97,8 @@ msgstr "Sil"
msgid "Rename"
msgstr "İsim değiştir."
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Bekliyor"
@@ -156,74 +156,74 @@ msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkron
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Yükleme hatası"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Kapat"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 dosya yüklendi"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} dosya yükleniyor"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Yükleme iptal edildi."
-#: js/files.js:496
+#: js/files.js:497
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:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL boş olamaz."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir."
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Ad"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Boyut"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Değiştirilme"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 dizin"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} dizin"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 dosya"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} dosya"
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index 7e6073c6370..742414f6662 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 20:20+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: atakan96 <tayancatakan@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index 22a2d9527f2..dbf5551a0ca 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 20:10+0000\n"
-"Last-Translator: atakan96 <tayancatakan@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "%s Kalıcı olarak silinemedi"
@@ -28,35 +28,39 @@ msgstr "%s Kalıcı olarak silinemedi"
msgid "Couldn't restore %s"
msgstr "%s Geri yüklenemedi"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "Geri yükleme işlemini gerçekleştir"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "Dosyayı kalıcı olarak sil"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Kalıcı olarak sil"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "İsim"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Silindi"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 dizin"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} dizin"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 dosya"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} dosya"
@@ -67,3 +71,7 @@ msgstr "Burası boş. Çöp kutun tamamen boş."
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Geri yükle"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Sil"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 65ec66d804e..a3f45a9e187 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
-"PO-Revision-Date: 2013-02-18 23:30+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: Aranel Surion <aranel@aranelsurion.org>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 80023f786d8..54ed07e8816 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 09:40+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: volodya327 <volodya327@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -392,7 +392,7 @@ msgstr "Оновлення виконалось неуспішно. Будь л
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Оновлення виконалось успішно. Перенаправляємо вас на ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "скидання пароля ownCloud"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 73d909acdc3..a81852cfc62 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 10:12+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: volodya327 <volodya327@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -94,8 +94,8 @@ msgstr "Видалити"
msgid "Rename"
msgstr "Перейменувати"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Очікування"
@@ -153,74 +153,74 @@ msgstr "Ваше сховище переповнене, файли більше
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Ваше сховище майже повне ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Помилка завантаження"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Закрити"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 файл завантажується"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} файлів завантажується"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Завантаження перервано."
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL не може бути пустим."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Невірне ім'я теки. Використання \"Shared\" зарезервовано Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Ім'я"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Розмір"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Змінено"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 папка"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} папок"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 файл"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} файлів"
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index dc8a1586187..08d108f7f8b 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 15:37+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: volodya327 <volodya327@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -43,13 +43,13 @@ msgstr "Будь ласка, надайте дійсний ключ та пар
msgid "Error configuring Google Drive storage"
msgstr "Помилка при налаштуванні сховища Google Drive"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Попередження:</b> Клієнт \"smbclient\" не встановлено. Під'єднанатися до CIFS/SMB тек неможливо. Попрохайте системного адміністратора встановити його."
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -101,7 +101,7 @@ msgid "Users"
msgstr "Користувачі"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "Видалити"
@@ -113,10 +113,10 @@ msgstr "Активувати користувацькі зовнішні схо
msgid "Allow users to mount their own external storage"
msgstr "Дозволити користувачам монтувати власні зовнішні сховища"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "SSL корневі сертифікати"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Імпортувати корневі сертифікати"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index 7f2bd9d813e..8baab90eba9 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-20 00:02+0100\n"
-"PO-Revision-Date: 2013-02-19 14:20+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ajax/delete.php:24
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Неможливо видалити %s назавжди"
@@ -28,35 +28,39 @@ msgstr "Неможливо видалити %s назавжди"
msgid "Couldn't restore %s"
msgstr "Неможливо відновити %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "виконати операцію відновлення"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "видалити файл назавжди"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Видалити назавжди"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Ім'я"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Видалено"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 папка"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} папок"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 файл"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} файлів"
@@ -67,3 +71,7 @@ msgstr "Нічого немає. Ваший кошик для сміття пу
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Відновити"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Видалити"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 41e1a49cd7a..e851e3ab214 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 16:00+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: volodya327 <volodya327@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index f7bf90b56f1..f8755bc4aed 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: saosangm <saosangmo@yahoo.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -392,7 +392,7 @@ msgstr "Cập nhật không thành công . Vui lòng thông báo đến <a href=
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud."
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "Khôi phục mật khẩu Owncloud "
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index ec785055c6b..388859c6d88 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-16 00:04+0100\n"
-"PO-Revision-Date: 2013-02-15 20:30+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: saosangm <saosangmo@yahoo.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -95,8 +95,8 @@ msgstr "Xóa"
msgid "Rename"
msgstr "Sửa tên"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Chờ"
@@ -154,74 +154,74 @@ msgstr "Your storage is full, files can not be updated or synced anymore!"
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "Your storage is almost full ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "Your download is being prepared. This might take some time if the files are big."
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "Tải lên lỗi"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "Đóng"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 tệp tin đang được tải lên"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} tập tin đang tải lên"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "Hủy tải lên"
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này."
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL không được để trống."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "Tên"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "Kích cỡ"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "Thay đổi"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 thư mục"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} thư mục"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 tập tin"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} tập tin"
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index 6dbeed35de4..4e047a661a4 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 18:40+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: saosangm <saosangmo@yahoo.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -44,13 +44,13 @@ msgstr "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã b
msgid "Error configuring Google Drive storage"
msgstr "Lỗi cấu hình lưu trữ Google Drive"
-#: lib/config.php:405
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>Cảnh báo:</b> \"smbclient\" chưa được cài đặt. Mount CIFS/SMB shares là không thể thực hiện được. Hãy hỏi người quản trị hệ thống để cài đặt nó."
-#: lib/config.php:406
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -118,6 +118,6 @@ msgstr "Cho phép người dùng kết nối với lưu trữ riêng bên ngoài
msgid "SSL root certificates"
msgstr "Chứng chỉ SSL root"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "Nhập Root Certificate"
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index c5b1c4de22b..1bd8d833be1 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
-"Last-Translator: saosangm <saosangmo@yahoo.com>\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "Không thể óa %s vĩnh viễn"
@@ -28,35 +28,39 @@ msgstr "Không thể óa %s vĩnh viễn"
msgid "Couldn't restore %s"
msgstr "Không thể khôi phục %s"
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr "thực hiện phục hồi"
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr "xóa file vĩnh viễn"
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "Xóa vĩnh vễn"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "Tên"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr "Đã xóa"
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 thư mục"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} thư mục"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 tập tin"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} tập tin"
@@ -67,3 +71,7 @@ msgstr "Không có gì ở đây. Thùng rác của bạn rỗng!"
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr "Khôi phục"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Xóa"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 49ceed9259d..4355c6f5b79 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/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: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -152,23 +152,23 @@ msgstr "Nhóm quản trị"
msgid "Delete"
msgstr "Xóa"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "__Ngôn ngữ___"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index e8be26bcfea..971edd7b11d 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:31+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -388,7 +388,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "私有云密码重置"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index a9b6ba1536f..dd2697a6941 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -92,8 +92,8 @@ msgstr "删除"
msgid "Rename"
msgstr "重命名"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "Pending"
@@ -151,74 +151,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "不能上传你指定的文件,可能因为它是个文件夹或者大小为0"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "上传错误"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "关闭"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 个文件正在上传"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} 个文件正在上传"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "上传取消了"
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "文件正在上传。关闭页面会取消上传。"
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "网址不能为空。"
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr ""
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "名字"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "大小"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "修改日期"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 个文件夹"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} 个文件夹"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 个文件"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} 个文件"
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index 066da805d34..3b106784f01 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -42,13 +42,13 @@ msgstr "请提供一个有效的 Dropbox app key 和 secret。"
msgid "Error configuring Google Drive storage"
msgstr "配置 Google Drive 存储失败"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -100,7 +100,7 @@ msgid "Users"
msgstr "用户"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "删除"
@@ -112,10 +112,10 @@ msgstr "启用用户外部存储"
msgid "Allow users to mount their own external storage"
msgstr "允许用户挂载他们的外部存储"
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr "SSL 根证书"
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "导入根证书"
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index 4432759cfe3..23c17f7e30d 100644
--- a/l10n/zh_CN.GB2312/files_trashbin.po
+++ b/l10n/zh_CN.GB2312/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: zh_CN.GB2312\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "名称"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 个文件夹"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} 个文件夹"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 个文件"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} 个文件"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "删除"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index b2a1a746277..f34fc737d15 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
@@ -147,23 +147,23 @@ msgstr "群组管理员"
msgid "Delete"
msgstr "删除"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "Chinese"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 1ea389e0f22..b1f593bcc25 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -392,7 +392,7 @@ msgstr ""
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr ""
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "重置 ownCloud 密码"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 76347b180a2..e88f59b128c 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -97,8 +97,8 @@ msgstr "删除"
msgid "Rename"
msgstr "重命名"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "操作等待中"
@@ -156,74 +156,74 @@ msgstr ""
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr ""
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "无法上传文件,因为它是一个目录或者大小为 0 字节"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "上传错误"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "关闭"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1个文件上传中"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} 个文件上传中"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "上传已取消"
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL不能为空"
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "名称"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "大小"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "修改日期"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1个文件夹"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} 个文件夹"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 个文件"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} 个文件"
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 674ecf16c69..2601a7a78e1 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-24 00:10+0100\n"
-"PO-Revision-Date: 2012-12-23 14:40+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -43,13 +43,13 @@ msgstr "请提供有效的Dropbox应用key和secret"
msgid "Error configuring Google Drive storage"
msgstr "配置Google Drive存储时出错"
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr "<b>警告:</b>“smbclient” 尚未安装。CIFS/SMB 分享挂载无法实现。请咨询系统管理员进行安装。"
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -117,6 +117,6 @@ msgstr "允许用户挂载自有外部存储"
msgid "SSL root certificates"
msgstr "SSL根证书"
-#: templates/settings.php:153
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "导入根证书"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 74ce3be6ba6..944ac8ff4af 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "名称"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1个文件夹"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} 个文件夹"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 个文件"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} 个文件"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "删除"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index aeb9677b671..47d9df8c2b1 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -151,23 +151,23 @@ msgstr "组管理员"
msgid "Delete"
msgstr "删除"
-#: js/users.js:190
+#: js/users.js:191
msgid "add group"
msgstr ""
-#: js/users.js:351
+#: js/users.js:352
msgid "A valid username must be provided"
msgstr ""
-#: js/users.js:352 js/users.js:358 js/users.js:373
+#: js/users.js:353 js/users.js:359 js/users.js:374
msgid "Error creating user"
msgstr ""
-#: js/users.js:357
+#: js/users.js:358
msgid "A valid password must be provided"
msgstr ""
-#: personal.php:34 personal.php:35
+#: personal.php:29 personal.php:30
msgid "__language_name__"
msgstr "简体中文"
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index 4d462824758..3619584ba4d 100644
--- a/l10n/zh_HK/files_trashbin.po
+++ b/l10n/zh_HK/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-08 00:10+0100\n"
-"PO-Revision-Date: 2013-02-07 23:11+0000\n"
+"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"PO-Revision-Date: 2013-02-20 23:14+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr ""
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr ""
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr ""
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr ""
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr ""
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 6aa6cc3d4c2..ac0cd1754c9 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 14:32+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:20+0000\n"
"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -391,7 +391,7 @@ msgstr "升級失敗,請將此問題回報 <a href=\"https://github.com/ownclo
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "升級成功,正將您重新導向至 ownCloud 。"
-#: lostpassword/controller.php:47
+#: lostpassword/controller.php:48
msgid "ownCloud password reset"
msgstr "ownCloud 密碼重設"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 4532870022c..88fbe67d2ee 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 23:05+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:31+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -96,8 +96,8 @@ msgstr "刪除"
msgid "Rename"
msgstr "重新命名"
-#: js/filelist.js:49 js/filelist.js:52 js/files.js:291 js/files.js:407
-#: js/files.js:438
+#: js/filelist.js:49 js/filelist.js:52 js/files.js:292 js/files.js:408
+#: js/files.js:439
msgid "Pending"
msgstr "等候中"
@@ -155,74 +155,74 @@ msgstr "您的儲存空間已滿,沒有辦法再更新或是同步檔案!"
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "您的儲存空間快要滿了 ({usedSpacePercent}%)"
-#: js/files.js:224
+#: js/files.js:225
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "正在準備您的下載,若您的檔案較大,將會需要更多時間。"
-#: js/files.js:261
+#: js/files.js:262
msgid "Unable to upload your file as it is a directory or has 0 bytes"
msgstr "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0"
-#: js/files.js:261
+#: js/files.js:262
msgid "Upload Error"
msgstr "上傳發生錯誤"
-#: js/files.js:272
+#: js/files.js:273
msgid "Close"
msgstr "關閉"
-#: js/files.js:311
+#: js/files.js:312
msgid "1 file uploading"
msgstr "1 個檔案正在上傳"
-#: js/files.js:314 js/files.js:369 js/files.js:384
+#: js/files.js:315 js/files.js:370 js/files.js:385
msgid "{count} files uploading"
msgstr "{count} 個檔案正在上傳"
-#: js/files.js:387 js/files.js:422
+#: js/files.js:388 js/files.js:423
msgid "Upload cancelled."
msgstr "上傳取消"
-#: js/files.js:496
+#: js/files.js:497
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "檔案上傳中。離開此頁面將會取消上傳。"
-#: js/files.js:569
+#: js/files.js:570
msgid "URL cannot be empty."
msgstr "URL 不能為空白."
-#: js/files.js:574
+#: js/files.js:575
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
msgstr "無效的資料夾名稱,'Shared' 的使用被 Owncloud 保留"
-#: js/files.js:948 templates/index.php:67
+#: js/files.js:949 templates/index.php:67
msgid "Name"
msgstr "名稱"
-#: js/files.js:949 templates/index.php:78
+#: js/files.js:950 templates/index.php:78
msgid "Size"
msgstr "大小"
-#: js/files.js:950 templates/index.php:80
+#: js/files.js:951 templates/index.php:80
msgid "Modified"
msgstr "修改"
-#: js/files.js:969
+#: js/files.js:970
msgid "1 folder"
msgstr "1 個資料夾"
-#: js/files.js:971
+#: js/files.js:972
msgid "{count} folders"
msgstr "{count} 個資料夾"
-#: js/files.js:979
+#: js/files.js:980
msgid "1 file"
msgstr "1 個檔案"
-#: js/files.js:981
+#: js/files.js:982
msgid "{count} files"
msgstr "{count} 個檔案"
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index 88c257062d0..b21173f2dd5 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -42,13 +42,13 @@ msgstr ""
msgid "Error configuring Google Drive storage"
msgstr ""
-#: lib/config.php:434
+#: lib/config.php:398
msgid ""
"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
"is not possible. Please ask your system administrator to install it."
msgstr ""
-#: lib/config.php:435
+#: lib/config.php:401
msgid ""
"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
" of FTP shares is not possible. Please ask your system administrator to "
@@ -100,7 +100,7 @@ msgid "Users"
msgstr "使用者"
#: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
msgid "Delete"
msgstr "刪除"
@@ -112,10 +112,10 @@ msgstr ""
msgid "Allow users to mount their own external storage"
msgstr ""
-#: templates/settings.php:139
+#: templates/settings.php:136
msgid "SSL root certificates"
msgstr ""
-#: templates/settings.php:158
+#: templates/settings.php:154
msgid "Import Root Certificate"
msgstr "匯入根憑證"
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index ae0e1da91d8..9ddcf5237e0 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:07+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:32+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/delete.php:22
+#: ajax/delete.php:40
#, php-format
msgid "Couldn't delete %s permanently"
msgstr ""
@@ -27,35 +27,39 @@ msgstr ""
msgid "Couldn't restore %s"
msgstr ""
-#: js/trash.js:7 js/trash.js:94
+#: js/trash.js:7 js/trash.js:96
msgid "perform restore operation"
msgstr ""
-#: js/trash.js:33
+#: js/trash.js:34
msgid "delete file permanently"
msgstr ""
-#: js/trash.js:125 templates/index.php:17
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr "永久刪除"
+
+#: js/trash.js:151 templates/index.php:17
msgid "Name"
msgstr "名稱"
-#: js/trash.js:126 templates/index.php:27
+#: js/trash.js:152 templates/index.php:27
msgid "Deleted"
msgstr ""
-#: js/trash.js:135
+#: js/trash.js:161
msgid "1 folder"
msgstr "1 個資料夾"
-#: js/trash.js:137
+#: js/trash.js:163
msgid "{count} folders"
msgstr "{count} 個資料夾"
-#: js/trash.js:145
+#: js/trash.js:171
msgid "1 file"
msgstr "1 個檔案"
-#: js/trash.js:147
+#: js/trash.js:173
msgid "{count} files"
msgstr "{count} 個檔案"
@@ -66,3 +70,7 @@ msgstr ""
#: templates/index.php:20 templates/index.php:22
msgid "Restore"
msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "刪除"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 6f13ba5136c..d7622d4436e 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 14:00+0000\n"
+"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"PO-Revision-Date: 2013-02-20 23:30+0000\n"
"Last-Translator: ronnietse <tseronnie@ymail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index a9aa891d409..953692f80a9 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -62,12 +62,12 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
}
} else {
$newPath = $this->path . '/' . $name;
-
+
// mark file as partial while uploading (ignored by the scanner)
$partpath = $newPath . '.part';
-
+
\OC\Files\Filesystem::file_put_contents($partpath, $data);
-
+
//detect aborted upload
if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT' ) {
if (isset($_SERVER['CONTENT_LENGTH'])) {
@@ -80,10 +80,10 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
}
}
}
-
+
// rename to correct path
\OC\Files\Filesystem::rename($partpath, $newPath);
-
+
// allow sync clients to send the mtime along in a header
$mtime = OC_Request::hasModificationTime();
if ($mtime !== false) {
@@ -91,7 +91,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
header('X-OC-MTime: accepted');
}
}
-
+
return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
}
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index c4c27e92251..91646312e90 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -47,9 +47,9 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
// mark file as partial while uploading (ignored by the scanner)
$partpath = $this->path . '.part';
-
+
\OC\Files\Filesystem::file_put_contents($partpath, $data);
-
+
//detect aborted upload
if (isset ($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PUT' ) {
if (isset($_SERVER['CONTENT_LENGTH'])) {
@@ -62,10 +62,10 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
}
}
}
-
+
// rename to correct path
\OC\Files\Filesystem::rename($partpath, $this->path);
-
+
//allow sync clients to send the mtime along in a header
$mtime = OC_Request::hasModificationTime();
if ($mtime !== false) {
diff --git a/lib/connector/sabre/quotaplugin.php b/lib/connector/sabre/quotaplugin.php
index ce9a968eb3c..c80a33d04b1 100644
--- a/lib/connector/sabre/quotaplugin.php
+++ b/lib/connector/sabre/quotaplugin.php
@@ -50,7 +50,8 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin {
$uri='/'.$uri;
}
list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri);
- if ($length > \OC\Files\Filesystem::free_space($parentUri)) {
+ $freeSpace = \OC\Files\Filesystem::free_space($parentUri);
+ if ($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN && $length > $freeSpace) {
throw new Sabre_DAV_Exception_InsufficientStorage();
}
}
diff --git a/lib/files/cache/legacy.php b/lib/files/cache/legacy.php
index 6d1ffa7b40b..2b8689fcbda 100644
--- a/lib/files/cache/legacy.php
+++ b/lib/files/cache/legacy.php
@@ -51,12 +51,12 @@ class Legacy {
$this->cacheHasItems = false;
return false;
}
-
+
if ($result === false || property_exists($result, 'error_message_prefix')) {
$this->cacheHasItems = false;
return false;
- }
-
+ }
+
$this->cacheHasItems = (bool)$result->fetchRow();
return $this->cacheHasItems;
}
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 875a9d6c5ee..0bbd7550d74 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -219,11 +219,14 @@ class Filesystem {
}
$parser = new \OC\ArrayParser();
+ $root = \OC_User::getHome($user);
+ self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user);
+
// Load system mount points
if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file(\OC::$SERVERROOT . '/config/mount.json')) {
- if(is_file(\OC::$SERVERROOT . '/config/mount.json')){
+ if (is_file(\OC::$SERVERROOT . '/config/mount.json')) {
$mountConfig = json_decode(file_get_contents(\OC::$SERVERROOT . '/config/mount.json'), true);
- }elseif(is_file(\OC::$SERVERROOT . '/config/mount.php')){
+ } elseif (is_file(\OC::$SERVERROOT . '/config/mount.php')) {
$mountConfig = $parser->parsePHP(file_get_contents(\OC::$SERVERROOT . '/config/mount.php'));
}
if (isset($mountConfig['global'])) {
@@ -259,12 +262,10 @@ class Filesystem {
}
}
// Load personal mount points
- $root = \OC_User::getHome($user);
- self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user);
if (is_file($root . '/mount.php') or is_file($root . '/mount.json')) {
- if (is_file($root . '/mount.json')){
+ if (is_file($root . '/mount.json')) {
$mountConfig = json_decode(file_get_contents($root . '/mount.json'), true);
- } elseif (is_file($root . '/mount.php')){
+ } elseif (is_file($root . '/mount.php')) {
$mountConfig = $parser->parsePHP(file_get_contents($root . '/mount.php'));
}
if (isset($mountConfig['user'][$user])) {
@@ -389,21 +390,29 @@ class Filesystem {
* @param array $data from hook
*/
static public function isBlacklisted($data) {
- $blacklist = \OC_Config::getValue('blacklisted_files', array('.htaccess'));
if (isset($data['path'])) {
$path = $data['path'];
} else if (isset($data['newpath'])) {
$path = $data['newpath'];
}
if (isset($path)) {
- $filename = strtolower(basename($path));
- if (in_array($filename, $blacklist)) {
+ if (self::isFileBlacklisted($path)) {
$data['run'] = false;
}
}
}
/**
+ * @param string $filename
+ * @return bool
+ */
+ static public function isFileBlacklisted($filename) {
+ $blacklist = \OC_Config::getValue('blacklisted_files', array('.htaccess'));
+ $filename = strtolower(basename($filename));
+ return (in_array($filename, $blacklist));
+ }
+
+ /**
* following functions are equivalent to their php builtin equivalents for arguments/return values.
*/
static public function mkdir($path) {
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 4e7a73e5d4a..f9c6bdfce0c 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -97,8 +97,8 @@ abstract class Common implements \OC\Files\Storage\Storage {
public function copy($path1, $path2) {
$source=$this->fopen($path1, 'r');
$target=$this->fopen($path2, 'w');
- $count=\OC_Helper::streamCopy($source, $target);
- return $count>0;
+ list($count, $result) = \OC_Helper::streamCopy($source, $target);
+ return $result;
}
/**
@@ -278,7 +278,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
return uniqid();
}
}
-
+
/**
* clean a path, i.e. remove all redundant '.' and '..'
* making sure that it can't point to higher than '/'
@@ -289,7 +289,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
if (strlen($path) == 0 or $path[0] != '/') {
$path = '/' . $path;
}
-
+
$output = array();
foreach (explode('/', $path) as $chunk) {
if ($chunk == '..') {
diff --git a/lib/files/view.php b/lib/files/view.php
index 9ac08c98082..f48d0c8b225 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -285,7 +285,7 @@ class View {
}
$target = $this->fopen($path, 'w');
if ($target) {
- $count = \OC_Helper::streamCopy($data, $target);
+ list ($count, $result) = \OC_Helper::streamCopy($data, $target);
fclose($target);
fclose($data);
if ($this->fakeRoot == Filesystem::getRoot()) {
@@ -303,7 +303,7 @@ class View {
);
}
\OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count);
- return $count > 0;
+ return $result;
} else {
return false;
}
@@ -361,10 +361,9 @@ class View {
} else {
$source = $this->fopen($path1 . $postFix1, 'r');
$target = $this->fopen($path2 . $postFix2, 'w');
- $count = \OC_Helper::streamCopy($source, $target);
+ list($count, $result) = \OC_Helper::streamCopy($source, $target);
list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
$storage1->unlink($internalPath1);
- $result = $count > 0;
}
if ($this->fakeRoot == Filesystem::getRoot()) {
\OC_Hook::emit(
@@ -444,7 +443,7 @@ class View {
} else {
$source = $this->fopen($path1 . $postFix1, 'r');
$target = $this->fopen($path2 . $postFix2, 'w');
- $result = \OC_Helper::streamCopy($source, $target);
+ list($count, $result) = \OC_Helper::streamCopy($source, $target);
}
if ($this->fakeRoot == Filesystem::getRoot()) {
\OC_Hook::emit(
diff --git a/lib/group.php b/lib/group.php
index 6afe1440030..88f0a2a032c 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -286,38 +286,39 @@ class OC_Group {
}
return $users;
}
-
- /**
- * @brief get a list of all display names in a group
- * @returns array with display names (value) and user ids(key)
- */
- public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
- $displayNames=array();
- foreach(self::$_usedBackends as $backend) {
- $displayNames = array_merge($backend->displayNamesInGroup($gid, $search, $limit, $offset), $displayNames);
- }
- return $displayNames;
+
+ /**
+ * @brief get a list of all display names in a group
+ * @returns array with display names (value) and user ids(key)
+ */
+ public static function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+ $displayNames=array();
+ foreach(self::$_usedBackends as $backend) {
+ $displayNames = array_merge($backend->displayNamesInGroup($gid, $search, $limit, $offset), $displayNames);
+ }
+ return $displayNames;
}
-
- /**
- * @brief get a list of all display names in several groups
- * @param array $gids
- * @param string $search
- * @param int $limit
- * @param int $offset
- * @return array with display names (Key) user ids (value)
- */
- public static function displayNamesInGroups($gids, $search = '', $limit = -1, $offset = 0) {
- $displayNames = array();
- foreach ($gids as $gid) {
- // TODO Need to apply limits to groups as total
- $displayNames = array_merge(
- array_diff(
- self::displayNamesInGroup($gid, $search, $limit, $offset),
- $displayNames
- ),
- $displayNames);
- }
- return $displayNames;
+
+ /**
+ * @brief get a list of all display names in several groups
+ * @param array $gids
+ * @param string $search
+ * @param int $limit
+ * @param int $offset
+ * @return array with display names (Key) user ids (value)
+ */
+ public static function displayNamesInGroups($gids, $search = '', $limit = -1, $offset = 0) {
+ $displayNames = array();
+ foreach ($gids as $gid) {
+ // TODO Need to apply limits to groups as total
+ $diff = array_diff(
+ self::displayNamesInGroup($gid, $search, $limit, $offset),
+ $displayNames
+ );
+ if ($diff) {
+ $displayNames = array_merge($diff, $displayNames);
+ }
+ }
+ return $displayNames;
}
}
diff --git a/lib/group/backend.php b/lib/group/backend.php
index 4f6570c3be3..e7b7b21d957 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -133,23 +133,23 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
return array();
}
-
- /**
- * @brief get a list of all display names in a group
- * @param string $gid
- * @param string $search
- * @param int $limit
- * @param int $offset
- * @return array with display names (value) and user ids (key)
- */
- public function DisplayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
- $displayNames = '';
- $users = $this->usersInGroup($gid, $search, $limit, $offset);
- foreach ( $users as $user ) {
- $DisplayNames[$user] = $user;
- }
-
- return $DisplayNames;
+
+ /**
+ * @brief get a list of all display names in a group
+ * @param string $gid
+ * @param string $search
+ * @param int $limit
+ * @param int $offset
+ * @return array with display names (value) and user ids (key)
+ */
+ public function DisplayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+ $displayNames = '';
+ $users = $this->usersInGroup($gid, $search, $limit, $offset);
+ foreach ( $users as $user ) {
+ $DisplayNames[$user] = $user;
+ }
+
+ return $DisplayNames;
}
}
diff --git a/lib/group/database.php b/lib/group/database.php
index 8816dd8169c..40e9b0d4147 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -210,30 +210,30 @@ class OC_Group_Database extends OC_Group_Backend {
}
return $users;
}
-
- /**
- * @brief get a list of all display names in a group
- * @param string $gid
- * @param string $search
- * @param int $limit
- * @param int $offset
- * @return array with display names (value) and user ids (key)
- */
- public function DisplayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+
+ /**
+ * @brief get a list of all display names in a group
+ * @param string $gid
+ * @param string $search
+ * @param int $limit
+ * @param int $offset
+ * @return array with display names (value) and user ids (key)
+ */
+ public function DisplayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
$displayNames = '';
$stmt = OC_DB::prepare('SELECT `*PREFIX*users`.`uid`, `*PREFIX*users`.`displayname`'
.' FROM `*PREFIX*users`'
.' INNER JOIN `*PREFIX*group_user` ON `*PREFIX*group_user`.`uid` = `*PREFIX*users`.`uid`'
- .' WHERE `gid` = ? AND `*PREFIX*group_user.uid` LIKE ?',
+ .' WHERE `gid` = ? AND `*PREFIX*group_user`.`uid` LIKE ?',
$limit,
$offset);
- $result = $stmt->execute(array($gid, $search.'%'));
- $users = array();
+ $result = $stmt->execute(array($gid, $search.'%'));
+ $users = array();
while ($row = $result->fetchRow()) {
- $displayName = trim($row['displayname'], ' ');
- $displayNames[$row['uid']] = empty($displayName) ? $row['uid'] : $displayName;
- }
- return $displayNames;
+ $displayName = trim($row['displayname'], ' ');
+ $displayNames[$row['uid']] = empty($displayName) ? $row['uid'] : $displayName;
+ }
+ return $displayNames;
}
}
diff --git a/lib/helper.php b/lib/helper.php
index add5c66e7be..41985ca57a7 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -513,11 +513,16 @@ class OC_Helper {
if(!$source or !$target) {
return false;
}
- $count=0;
+ $result = true;
+ $count = 0;
while(!feof($source)) {
- $count+=fwrite($target, fread($source, 8192));
+ if ( ( $c = fwrite($target, fread($source, 8192)) ) === false) {
+ $result = false;
+ } else {
+ $count += $c;
+ }
}
- return $count;
+ return array($count, $result);
}
/**
diff --git a/lib/hook.php b/lib/hook.php
index 554381251d6..8516cf0dcff 100644
--- a/lib/hook.php
+++ b/lib/hook.php
@@ -20,23 +20,23 @@ class OC_Hook{
* TODO: write example
*/
static public function connect( $signalclass, $signalname, $slotclass, $slotname ) {
- // If we're trying to connect to an emitting class that isn't
+ // If we're trying to connect to an emitting class that isn't
// yet registered, register it
if( !array_key_exists( $signalclass, self::$registered )) {
self::$registered[$signalclass] = array();
}
- // If we're trying to connect to an emitting method that isn't
+ // If we're trying to connect to an emitting method that isn't
// yet registered, register it with the emitting class
- if( !array_key_exists( $signalname, self::$registered[$signalclass] )) {
+ if( !array_key_exists( $signalname, self::$registered[$signalclass] )) {
self::$registered[$signalclass][$signalname] = array();
}
-
+
// Connect the hook handler to the requested emitter
self::$registered[$signalclass][$signalname][] = array(
"class" => $slotclass,
"name" => $slotname
);
-
+
// No chance for failure ;-)
return true;
}
@@ -53,19 +53,19 @@ class OC_Hook{
* TODO: write example
*/
static public function emit( $signalclass, $signalname, $params = array()) {
-
+
// Return false if no hook handlers are listening to this
// emitting class
if( !array_key_exists( $signalclass, self::$registered )) {
return false;
}
-
+
// Return false if no hook handlers are listening to this
// emitting method
if( !array_key_exists( $signalname, self::$registered[$signalclass] )) {
return false;
}
-
+
// Call all slots
foreach( self::$registered[$signalclass][$signalname] as $i ) {
try {
diff --git a/lib/image.php b/lib/image.php
index 7b0cbefd657..97b0231047b 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -702,6 +702,13 @@ class OC_Image {
return false;
}
+ // preserve transparency
+ if($this->imagetype == IMAGETYPE_GIF or $this->imagetype == IMAGETYPE_PNG) {
+ imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
+ imagealphablending($process, false);
+ imagesavealpha($process, true);
+ }
+
imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $width_orig, $height_orig);
if ($process == false) {
OC_Log::write('core', __METHOD__.'(): Error resampling process image '.$width.'x'.$height, OC_Log::ERROR);
@@ -751,6 +758,14 @@ class OC_Image {
imagedestroy($process);
return false;
}
+
+ // preserve transparency
+ if($this->imagetype == IMAGETYPE_GIF or $this->imagetype == IMAGETYPE_PNG) {
+ imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
+ imagealphablending($process, false);
+ imagesavealpha($process, true);
+ }
+
imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $targetWidth, $targetHeight, $width, $height);
if ($process == false) {
OC_Log::write('core',
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 0ad254ad844..87b0b29469c 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -9,7 +9,7 @@
"Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.",
"Back to Files" => "Zurück zu \"Dateien\"",
"Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.",
-"couldn't be determined" => "Konnte nicht festgestellt werden",
+"couldn't be determined" => "konnte nicht festgestellt werden",
"Application is not enabled" => "Die Anwendung ist nicht aktiviert",
"Authentication error" => "Authentifizierungs-Fehler",
"Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.",
@@ -18,7 +18,7 @@
"Images" => "Bilder",
"Set an admin username." => "Setze Administrator Benutzername.",
"Set an admin password." => "Setze Administrator Passwort",
-"Specify a data folder." => "Datei-Verzeichnis angeben",
+"Specify a data folder." => "Datei-Verzeichnis angeben.",
"%s enter the database username." => "%s gib den Datenbank-Benutzernamen an.",
"%s enter the database name." => "%s gib den Datenbank-Namen an.",
"%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten",
@@ -32,7 +32,7 @@
"MySQL user '%s'@'localhost' exists already." => "MySQL Benutzer '%s'@'localhost' existiert bereits.",
"Drop this user from MySQL" => "Lösche diesen Benutzer von MySQL",
"MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
-"Drop this user from MySQL." => "Lösche diesen Benutzer von MySQL.",
+"Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.",
"Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Instalationsanleitungen</a>.",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 1f63fdd87b0..d04c691f7ec 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -30,9 +30,9 @@
"DB Error: \"%s\"" => "DB Fehler: \"%s\"",
"Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
"MySQL user '%s'@'localhost' exists already." => "MySQL Benutzer '%s'@'localhost' existiert bereits.",
-"Drop this user from MySQL" => "Lösche diesen Benutzer von MySQL",
+"Drop this user from MySQL" => "Lösche diesen Benutzer aus MySQL",
"MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
-"Drop this user from MySQL." => "Lösche diesen Benutzer von MySQL.",
+"Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.",
"Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>.",
diff --git a/lib/l10n/my_MM.php b/lib/l10n/my_MM.php
new file mode 100644
index 00000000000..d725a06a3a9
--- /dev/null
+++ b/lib/l10n/my_MM.php
@@ -0,0 +1,31 @@
+<?php $TRANSLATIONS = array(
+"Help" => "အကူအညီ",
+"Users" => "သုံးစွဲသူ",
+"Apps" => "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 ဖိုင်အဖြစ်ပြုလုပ်ရန် ရွေးချယ်ထားသောဖိုင်များသည် အရမ်းကြီးလွန်းသည်",
+"couldn't be determined" => "မဆုံးဖြတ်နိုင်ပါ။",
+"Authentication error" => "ခွင့်ပြုချက်မအောင်မြင်",
+"Files" => "ဖိုင်များ",
+"Text" => "စာသား",
+"Images" => "ပုံရိပ်များ",
+"seconds ago" => "စက္ကန့်အနည်းငယ်က",
+"1 minute ago" => "၁ မိနစ်အရင်က",
+"%d minutes ago" => "%d မိနစ်အရင်က",
+"1 hour ago" => "၁ နာရီ အရင်က",
+"%d hours ago" => "%d နာရီအရင်က",
+"today" => "ယနေ့",
+"yesterday" => "မနေ့က",
+"%d days ago" => "%d ရက် အရင်က",
+"last month" => "ပြီးခဲ့သောလ",
+"%d months ago" => "%d လအရင်က",
+"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" => "နောက်ဆုံးပေါ်စစ်ဆေးခြင်းကိုပိတ်ထားသည်",
+"Could not find category \"%s\"" => "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ"
+);
diff --git a/lib/public/files.php b/lib/public/files.php
index c2945b200e8..700bf574537 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -62,7 +62,8 @@ class Files {
* @return int the number of bytes copied
*/
public static function streamCopy( $source, $target ) {
- return(\OC_Helper::streamCopy( $source, $target ));
+ list($count, $result) = \OC_Helper::streamCopy( $source, $target );
+ return $count;
}
/**
diff --git a/lib/public/share.php b/lib/public/share.php
index c0f35333e83..37cf0838ed1 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -384,7 +384,7 @@ class Share {
'itemSource' => $itemSource,
'shareType' => $shareType,
'shareWith' => $shareWith,
- ));
+ ));
self::delete($item['id']);
return true;
}
@@ -404,7 +404,7 @@ class Share {
'itemType' => $itemType,
'itemSource' => $itemSource,
'shares' => $shares
- ));
+ ));
foreach ($shares as $share) {
self::delete($share['id']);
}
@@ -848,7 +848,7 @@ class Share {
if ( isset($row['uid_owner']) && $row['uid_owner'] != '') {
$row['displayname_owner'] = \OCP\User::getDisplayName($row['uid_owner']);
}
-
+
$items[$row['id']] = $row;
}
if (!empty($items)) {
diff --git a/lib/public/user.php b/lib/public/user.php
index 86d1d0ccde8..9edebe0e7cf 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -52,25 +52,25 @@ class User {
public static function getUsers($search = '', $limit = null, $offset = null) {
return \OC_USER::getUsers();
}
-
- /**
- * @brief get the user display name of the user currently logged in.
- * @return string display name
- */
- public static function getDisplayName($user=null) {
- return \OC_USER::getDisplayName($user);
+
+ /**
+ * @brief get the user display name of the user currently logged in.
+ * @return string display name
+ */
+ public static function getDisplayName($user=null) {
+ return \OC_USER::getDisplayName($user);
}
-
- /**
- * @brief Get a list of all display names
- * @returns array with all display names (value) and the correspondig uids (key)
- *
- * Get a list of all display names and user ids.
- */
- public static function getDisplayNames($search = '', $limit = null, $offset = null) {
- return \OC_USER::getDisplayNames($search, $limit, $offset);
+
+ /**
+ * @brief Get a list of all display names
+ * @returns array with all display names (value) and the correspondig uids (key)
+ *
+ * Get a list of all display names and user ids.
+ */
+ public static function getDisplayNames($search = '', $limit = null, $offset = null) {
+ return \OC_USER::getDisplayNames($search, $limit, $offset);
}
-
+
/**
* @brief Check if the user is logged in
* @returns true/false
diff --git a/lib/request.php b/lib/request.php
index 3af93289670..30a25df23ab 100755
--- a/lib/request.php
+++ b/lib/request.php
@@ -149,7 +149,7 @@ class OC_Request {
return 'gzip';
return false;
}
-
+
/**
* @brief Check if the requester sent along an mtime
* @returns false or an mtime
diff --git a/lib/search.php b/lib/search.php
index e5a65f7157d..b9c75dfc333 100644
--- a/lib/search.php
+++ b/lib/search.php
@@ -57,14 +57,14 @@ class OC_Search{
}
return $results;
}
-
+
/**
* remove an existing search provider
* @param string $provider class name of a OC_Search_Provider
*/
public static function removeProvider($provider) {
self::$registeredProviders = array_filter(
- self::$registeredProviders,
+ self::$registeredProviders,
function ($element) use ($provider) {
return ($element['class'] != $provider);
}
diff --git a/lib/setup.php b/lib/setup.php
index 0c049841b2a..19e4a82b51f 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -98,7 +98,7 @@ class OC_Setup {
$error[] = array(
'error' => $e->getMessage(),
'hint' => $e->getHint()
- );
+ );
return($error);
} catch (Exception $e) {
$error[] = array(
@@ -174,7 +174,7 @@ class OC_Setup {
OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true));
OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
-
+
OC_Group::createGroup('admin');
OC_Group::addToGroup($username, 'admin');
OC_User::login($username, $password);
@@ -276,7 +276,7 @@ class OC_Setup {
$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
$result = mysql_query($query, $connection);
if (!$result) {
- throw new DatabaseSetupException($l->t("MySQL user '%s'@'%%' already exists", array($name)),
+ throw new DatabaseSetupException($l->t("MySQL user '%s'@'%%' already exists", array($name)),
$l->t("Drop this user from MySQL."));
}
}
@@ -550,7 +550,7 @@ class OC_Setup {
$result = oci_execute($stmt);
if(!$result) {
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
- $entry .= $l->t('Offending command was: "%s", name: %s, password: %s',
+ $entry .= $l->t('Offending command was: "%s", name: %s, password: %s',
array($query, $name, $password)) . '<br />';
echo($entry);
}
@@ -582,7 +582,7 @@ class OC_Setup {
$result = oci_execute($stmt);
if(!$result) {
$entry = $l->t('DB Error: "%s"', array(oci_error($connection))) . '<br />';
- $entry .= $l->t('Offending command was: "%s", name: %s, password: %s',
+ $entry .= $l->t('Offending command was: "%s", name: %s, password: %s',
array($query, $name, $password)) . '<br />';
echo($entry);
}
@@ -646,8 +646,7 @@ class OC_Setup {
header("Location: ".OC::$WEBROOT.'/');
} else {
- $error = $l->t('Your web server is not yet properly setup to allow files'
- .' synchronization because the WebDAV interface seems to be broken.');
+ $error = $l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.');
$hint = $l->t('Please double check the <a href=\'%s\'>installation guides</a>.',
'http://doc.owncloud.org/server/5.0/admin_manual/installation.html');
diff --git a/lib/user.php b/lib/user.php
index e69fef95a13..16f6d2787cb 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -437,7 +437,7 @@ class OC_User {
}
return false;
}
-
+
/**
* @brief Check whether user can change his display name
* @param $uid The username
diff --git a/lib/user/backend.php b/lib/user/backend.php
index 60b3cc6c5e4..93e8f17ca98 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -124,7 +124,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
public function getHome($uid) {
return false;
}
-
+
/**
* @brief get display name of the user
* @param $uid user ID of the user
@@ -133,7 +133,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
public function getDisplayName($uid) {
return $uid;
}
-
+
/**
* @brief Get a list of all display names
* @returns array with all displayNames (value) and the corresponding uids (key)
diff --git a/lib/user/database.php b/lib/user/database.php
index a0ad03fe0a0..210c7f3e1eb 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -110,7 +110,7 @@ class OC_User_Database extends OC_User_Backend {
return false;
}
}
-
+
/**
* @brief Set display name
* @param $uid The username
@@ -146,7 +146,7 @@ class OC_User_Database extends OC_User_Backend {
}
}
}
-
+
/**
* @brief Get a list of all display names
* @returns array with all displayNames (value) and the correspondig uids (key)
@@ -162,7 +162,7 @@ class OC_User_Database extends OC_User_Backend {
while ($row = $result->fetchRow()) {
$displayNames[$row['uid']] = $row['displayname'];
}
-
+
// let's see if we can also find some users who don't have a display name yet
$query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users`'
.' WHERE LOWER(`uid`) LIKE LOWER(?)', $limit, $offset);
@@ -173,11 +173,11 @@ class OC_User_Database extends OC_User_Backend {
$displayNames[$row['uid']] = $row['uid'];
}
}
-
-
+
+
return $displayNames;
}
-
+
/**
* @brief Check if the password is correct
* @param $uid The username
diff --git a/lib/util.php b/lib/util.php
index 636f3127f49..87facda1804 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -73,8 +73,8 @@ class OC_Util {
* @return array
*/
public static function getVersion() {
- // hint: We only can count up. So the internal version number
- // of ownCloud 4.5 will be 4.90.0. This is not visible to the user
+ // hint: We only can count up. Reset minor/patchlevel when
+ // updating major/minor version number.
return array(4, 93, 10);
}
@@ -269,6 +269,11 @@ class OC_Util {
'hint'=>'Please ask your server administrator to install the module.');
$web_server_restart= false;
}
+ if(ini_get('safe_mode')) {
+ $errors[]=array('error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.<br/>',
+ 'hint'=>'PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
+ $web_server_restart= false;
+ }
$handler = ini_get("session.save_handler");
if($handler == "files") {
@@ -562,7 +567,7 @@ class OC_Util {
*/
public static function isWebDAVWorking() {
if (!function_exists('curl_init')) {
- return;
+ return true;
}
$settings = array(
@@ -578,6 +583,7 @@ class OC_Util {
} catch(\Sabre_DAV_Exception_NotAuthenticated $e) {
$return = true;
} catch(\Exception $e) {
+ OC_Log::write('core', 'isWebDAVWorking: NO - Reason: '.$e, OC_Log::WARN);
$return = false;
}
diff --git a/settings/ajax/changedisplayname.php b/settings/ajax/changedisplayname.php
index 69462330765..dff4d733cd2 100644
--- a/settings/ajax/changedisplayname.php
+++ b/settings/ajax/changedisplayname.php
@@ -1,33 +1,33 @@
-<?php
-// Check if we are a user
-
-OCP\JSON::callCheck();
-OC_JSON::checkLoggedIn();
-
-$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
-$displayName = $_POST["displayName"];
-
-$userstatus = null;
-if(OC_User::isAdminUser(OC_User::getUser())) {
- $userstatus = 'admin';
-}
-if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
- $userstatus = 'subadmin';
-}
-
-if ($username == OC_User::getUser() && OC_User::canUserChangeDisplayName($username)) {
- $userstatus = 'changeOwnDisplayName';
-}
-
-if(is_null($userstatus)) {
- OC_JSON::error( array( "data" => array( "message" => $l->t("Authentication error") )));
- exit();
-}
-
-// Return Success story
-if( OC_User::setDisplayName( $username, $displayName )) {
- OC_JSON::success(array("data" => array( "username" => $username, 'displayName' => $displayName )));
-}
-else{
- OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change display name"), displayName => OC_User::getDisplayName($username) )));
-} \ No newline at end of file
+<?php
+// Check if we are a user
+
+OCP\JSON::callCheck();
+OC_JSON::checkLoggedIn();
+
+$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
+$displayName = $_POST["displayName"];
+
+$userstatus = null;
+if(OC_User::isAdminUser(OC_User::getUser())) {
+ $userstatus = 'admin';
+}
+if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
+ $userstatus = 'subadmin';
+}
+
+if ($username == OC_User::getUser() && OC_User::canUserChangeDisplayName($username)) {
+ $userstatus = 'changeOwnDisplayName';
+}
+
+if(is_null($userstatus)) {
+ OC_JSON::error( array( "data" => array( "message" => $l->t("Authentication error") )));
+ exit();
+}
+
+// Return Success story
+if( OC_User::setDisplayName( $username, $displayName )) {
+ OC_JSON::success(array("data" => array( "username" => $username, 'displayName' => $displayName )));
+}
+else{
+ OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change display name"), 'displayName' => OC_User::getDisplayName($username) )));
+}
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 356466c0c00..cd8dc0e2796 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -10,7 +10,9 @@ OCP\JSON::callCheck();
$username = isset($_POST["username"])?$_POST["username"]:'';
-if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))|| (!OC_User::isAdminUser(OC_User::getUser()) && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
+if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))
+ || (!OC_User::isAdminUser(OC_User::getUser())
+ && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
$l = OC_L10N::get('core');
OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
exit();
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 9bba9c5269d..f6fd9aba6d9 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -13,7 +13,9 @@ if($username == OC_User::getUser() && $group == "admin" && OC_User::isAdminUser
exit();
}
-if(!OC_User::isAdminUser(OC_User::getUser()) && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) {
+if(!OC_User::isAdminUser(OC_User::getUser())
+ && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)
+ || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) {
$l = OC_L10N::get('core');
OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
exit();
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index 9bbff80ea0c..5282f4a7143 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -29,10 +29,11 @@ if (isset($_GET['offset'])) {
}
$users = array();
if (OC_User::isAdminUser(OC_User::getUser())) {
- $batch = OC_User::getUsers('', 10, $offset);
- foreach ($batch as $user) {
+ $batch = OC_User::getDisplayNames('', 10, $offset);
+ foreach ($batch as $user => $displayname) {
$users[] = array(
'name' => $user,
+ 'displayname' => $displayname,
'groups' => join(', ', OC_Group::getUserGroups($user)),
'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)),
'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
@@ -43,6 +44,7 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
foreach ($batch as $user) {
$users[] = array(
'name' => $user,
+ 'displayname' => OC_User::determineDisplayName($user),
'groups' => join(', ', OC_Group::getUserGroups($user)),
'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
}
diff --git a/settings/js/users.js b/settings/js/users.js
index 63a62049839..452bdf5f838 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -66,10 +66,10 @@ var UserList = {
}
},
- add: function (username, groups, subadmin, quota, sort) {
+ add: function (username, displayname, groups, subadmin, quota, sort) {
var tr = $('tbody tr').first().clone();
tr.attr('data-uid', username);
- tr.attr('data-displayName', username);
+ tr.attr('data-displayName', displayname);
tr.find('td.name').text(username);
tr.find('td.displayName').text(username);
var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
@@ -138,7 +138,7 @@ var UserList = {
$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset }), function (result) {
if (result.status === 'success') {
$.each(result.data, function (index, user) {
- var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false);
+ var tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, false);
UserList.offset++;
if (index == 9) {
$(tr).bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
@@ -373,7 +373,7 @@ $(document).ready(function () {
OC.dialogs.alert(result.data.message,
t('settings', 'Error creating user'));
} else {
- UserList.add(username, result.data.groups, null, 'default', true);
+ UserList.add(username, username, result.data.groups, null, 'default', true);
}
}
);
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 4b8ee76e762..42992855ecd 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -36,7 +36,7 @@
"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
"__language_name__" => "Deutsch (Persönlich)",
"Security Warning" => "Sicherheitswarnung",
-"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." => "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass du deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass du dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst.",
+"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." => "Dein Datenverzeichnis und Deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass Du Deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass Du Dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst.",
"Setup Warning" => "Einrichtungswarnung",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>.",
@@ -45,14 +45,14 @@
"Locale not working" => "Ländereinstellung funktioniert nicht",
"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf ihrem System zu installieren.",
"Internet connection not working" => "Keine Netzwerkverbindung",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Du alle Funktionen von ownCloud nutzen möchtest.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Führe eine Aufgabe mit jeder geladenen 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 an einem Webcron-Service registriert. Die cron.php Seite wird einmal pro Minute über http abgerufen.",
"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutze den Cron Systemdienst. Rufe die Datei cron.php im owncloud Ordner einmal pro Minute über einen Cronjob auf.",
"Sharing" => "Teilen",
"Enable Share API" => "Aktiviere Sharing-API",
-"Allow apps to use the Share API" => "Erlaube Apps die Nutzung der Sharing-API",
+"Allow apps to use the Share API" => "Erlaube Apps die Nutzung der Share-API",
"Allow links" => "Erlaube Links",
"Allow users to share items to the public with links" => "Erlaube Benutzern Inhalte über öffentliche Links zu teilen",
"Allow resharing" => "Erlaube erneutes teilen",
@@ -64,7 +64,7 @@
"Enforces the clients to connect to ownCloud via an encrypted connection." => "Erzwingt die Verwendung einer verschlüsselten Verbindung",
"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich über eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu ändern",
"Log" => "Log",
-"Log level" => "Logtiefe",
+"Log level" => "Loglevel",
"More" => "Mehr",
"Version" => "Version",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
@@ -81,7 +81,7 @@
"Bugtracker" => "Bugtracker",
"Commercial Support" => "Kommerzieller Support",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>",
-"Get the apps to sync your files" => "Laden Sie die Apps zur Synchronisierung ihrer Daten herunter",
+"Get the apps to sync your files" => "Lade die Apps zur Synchronisierung Deiner Daten herunter",
"Show First Run Wizard again" => "Erstinstallation erneut durchführen",
"Password" => "Passwort",
"Your password was changed" => "Dein Passwort wurde geändert.",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index ee235105360..5dd5001548e 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -43,16 +43,16 @@
"Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
"Locale not working" => "Lokalisierung funktioniert nicht",
-"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf ihrem System zu installieren.",
+"This ownCloud server can't set system locale to \"en_US.UTF-8\"/\"en_US.UTF8\". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf \"de_DE.UTF-8\"/\"de_DE.UTF8\" ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen im Dateinamen geben könnte. Wir empfehlen die für de_DE.UTF-8/de_DE.UTF8 benötigten Pakete auf Ihrem System zu installieren.",
"Internet connection not working" => "Keine Netzwerkverbindung",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Dieser ownCloud Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen von ownCloud nutzen wollen.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Führe eine Aufgabe bei jedem Laden der 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-Service registriert. Die cron.php Seite im ownCloud Wurzelverzeichniss wird einmal pro Minute über http abgerufen.",
"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutzen Sie den Cron Systemdienst. Rufen Sie die Datei cron.php im ownCloud Ordner einmal pro Minute über einen Cronjob auf.",
"Sharing" => "Teilen",
-"Enable Share API" => "Teilen-API aktivieren",
-"Allow apps to use the Share API" => "Erlaube es Anwendungen, die Teilen-API zu benutzen",
+"Enable Share API" => "Share-API aktivieren",
+"Allow apps to use the Share API" => "Erlaube es Anwendungen, die Share-API zu benutzen",
"Allow links" => "Links erlauben",
"Allow users to share items to the public with links" => "Erlaube es Benutzern, Items per öffentlichem Link zu teilen",
"Allow resharing" => "Erlaube weiterverteilen",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index e0c20c6d97c..8c299393250 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -26,14 +26,25 @@
"Saving..." => "Guardando...",
"deleted" => "borrado",
"undo" => "deshacer",
+"Unable to remove user" => "No se puede quitar el usuario",
"Groups" => "Grupos",
"Group Admin" => "Grupo admin",
"Delete" => "Eliminar",
+"add group" => "Añadir Grupo",
+"A valid username must be provided" => "Se debe usar un nombre de usuario valido",
+"Error creating user" => "Error al crear usuario",
+"A valid password must be provided" => "Se debe usar una contraseña valida",
"__language_name__" => "Castellano",
"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." => "Su directorio de datos y sus archivos están probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Sugerimos fuertemente que configure su servidor web de manera que el directorio de datos ya no esté accesible o mueva el directorio de datos fuera del documento raíz de su servidor web.",
+"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." => "Su directorio de datos y sus archivos son probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Sugerimos fuertemente que configure su servidor web de manera que el directorio de datos ya no esté accesible o mueva el directorio de datos fuera del documento raíz de su servidor web.",
+"Setup Warning" => "Advertencia de Configuración",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
+"Module 'fileinfo' missing" => "Modulo 'fileinfo' perdido",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El modulo PHP 'fileinfo' no se encuentra. Sugerimos habilitar este modulo para tener mejorres resultados con la detección mime-type",
+"Internet connection not working" => "La conexion a internet no esta funcionando",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Este servidor ownCloud no tiene conexion de internet. Esto quiere decir que algunas caracteristicas como montar almacenamiento externo, notificaciones sobre actualizaciones o la instalacion de apps de terceros no funcionaran. Es posible que no pueda acceder remotamente a los archivos ni enviar notificaciones por correo. Sugerimos habilitar la conexión a internet para este servidor si quiere tener todas las caracteristicas de ownCloud.",
+"Sharing" => "Compartiendo",
"More" => "Más",
"Version" => "Version",
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
@@ -50,6 +61,7 @@
"Bugtracker" => "Rastreador de Bugs",
"Commercial Support" => "Soporte Comercial",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de <strong>%s</strong> disponibles",
+"Get the apps to sync your files" => "Obtener las apps para sincronizar sus archivos",
"Show First Run Wizard again" => "Mostrar asistente para iniciar otra vez",
"Password" => "Contraseña",
"Your password was changed" => "Su contraseña ha sido cambiada",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 105e2aa92ac..064529169f2 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -51,14 +51,14 @@
"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",
+"Enable Share API" => "Gaitu Elkarbanatze APIa",
+"Allow apps to use the Share API" => "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko",
"Allow links" => "Baimendu loturak",
-"Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki partekatzen",
+"Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen",
"Allow resharing" => "Baimendu birpartekatzea",
-"Allow users to share items shared with them again" => "Baimendu erabiltzaileak haiekin partekatutako fitxategiak berriz ere partekatzen",
-"Allow users to share with anyone" => "Baimendu erabiltzaileak edonorekin partekatzen",
-"Allow users to only share with users in their groups" => "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin partekatzen",
+"Allow users to share items shared with them again" => "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen",
+"Allow users to share with anyone" => "Baimendu erabiltzaileak edonorekin elkarbanatzen",
+"Allow users to only share with users in their groups" => "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen",
"Security" => "Segurtasuna",
"Enforce HTTPS" => "Behartu HTTPS",
"Enforces the clients to connect to ownCloud via an encrypted connection." => "Bezeroak konexio enkriptatu baten bidez ownCloud-era konektatzera behartzen du.",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 20e97b3ffda..196dc4d146f 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -39,6 +39,7 @@
"Forum" => "פורום",
"Commercial Support" => "תמיכה בתשלום",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך",
+"Get the apps to sync your files" => "השג את האפליקציות על מנת לסנכרן את הקבצים שלך",
"Password" => "ססמה",
"Your password was changed" => "הססמה שלך הוחלפה",
"Unable to change your password" => "לא ניתן לשנות את הססמה שלך",
diff --git a/settings/l10n/hy.php b/settings/l10n/hy.php
new file mode 100644
index 00000000000..9a9e46085ef
--- /dev/null
+++ b/settings/l10n/hy.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Delete" => "Ջնջել",
+"Other" => "Այլ"
+);
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index e62b3e15a7a..7f53a50b248 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -20,6 +20,7 @@
"Select an App" => "Pilih satu aplikasi",
"See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com",
"Update" => "Pembaruan",
+"Get the apps to sync your files" => "Dapatkan aplikasi untuk sinkronisasi berkas anda",
"Password" => "Password",
"Unable to change your password" => "Tidak dapat merubah password anda",
"Current password" => "Password saat ini",
diff --git a/settings/l10n/my_MM.php b/settings/l10n/my_MM.php
new file mode 100644
index 00000000000..a332c4d8ce9
--- /dev/null
+++ b/settings/l10n/my_MM.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Authentication error" => "ခွင့်ပြုချက်မအောင်မြင်",
+"Security Warning" => "လုံခြုံရေးသတိပေးချက်",
+"Password" => "စကားဝှက်",
+"New password" => "စကားဝှက်အသစ်"
+);
diff --git a/settings/oauth.php b/settings/oauth.php
index 07b7ae5c31d..8b4759f999e 100644
--- a/settings/oauth.php
+++ b/settings/oauth.php
@@ -5,7 +5,7 @@
* See the COPYING-README file.
*/
-require_once('../lib/base.php');
+require_once '../lib/base.php';
// Logic
$operation = isset($_GET['operation']) ? $_GET['operation'] : '';
$server = OC_OAuth_server::init();
@@ -23,9 +23,10 @@ switch($operation){
$callbackfail = empty($_GET['callback_fail']) ? null : $_GET['callback_fail'];
$consumer = OC_OAuth_Server::register_consumer($_GET['name'], $_GET['url'], $callbacksuccess, $callbackfail);
- echo 'Registered consumer successfully! </br></br>Key: ' . $consumer->key . '</br>Secret: ' . $consumer->secret;
+ echo 'Registered consumer successfully! </br></br>Key: ' . $consumer->key
+ . '</br>Secret: ' . $consumer->secret;
}
- break;
+ break;
case 'request_token':
@@ -38,7 +39,7 @@ switch($operation){
echo $exception->getMessage();
}
- break;
+ break;
case 'authorise';
OC_API::checkLoggedIn();
@@ -61,9 +62,11 @@ switch($operation){
if(!empty($notfound)) {
// We need more apps :( Show error
if(count($notfound)==1) {
- $message = 'requires that you have an extra app installed on your ownCloud. Please contact your ownCloud administrator and ask them to install the app below.';
+ $message = 'requires that you have an extra app installed on your ownCloud.'
+ .' Please contact your ownCloud administrator and ask them to install the app below.';
} else {
- $message = 'requires that you have some extra apps installed on your ownCloud. Please contract your ownCloud administrator and ask them to install the apps below.';
+ $message = 'requires that you have some extra apps installed on your ownCloud.'
+ .' Please contract your ownCloud administrator and ask them to install the apps below.';
}
$t = new OC_Template('settings', 'oauth-required-apps', 'guest');
OC_Util::addStyle('settings', 'oauth');
@@ -77,7 +80,7 @@ switch($operation){
$t->assign('consumer', $consumer);
$t->printPage();
}
- break;
+ break;
case 'access_token';
try {
@@ -89,10 +92,10 @@ switch($operation){
echo $exception->getMessage();
}
- break;
+ break;
default:
// Something went wrong, we need an operation!
OC_Response::setStatus(400);
- break;
+ break;
}
diff --git a/settings/routes.php b/settings/routes.php
index 0a8af0dde2b..b20119b5803 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -39,8 +39,8 @@ $this->create('settings_ajax_removegroup', '/settings/ajax/removegroup.php')
->actionInclude('settings/ajax/removegroup.php');
$this->create('settings_ajax_changepassword', '/settings/ajax/changepassword.php')
->actionInclude('settings/ajax/changepassword.php');
-$this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php')
-->actionInclude('settings/ajax/changedisplayname.php');
+$this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php')
+ ->actionInclude('settings/ajax/changedisplayname.php');
// personel
$this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php')
->actionInclude('settings/ajax/lostpassword.php');
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index ed1232ac322..b6e98c41bd9 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -3,7 +3,8 @@
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*/?>
- <script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('apps_custom');?>?appid=<?php echo $_['appid']; ?>"></script>
+ <script type="text/javascript"
+ src="<?php echo OC_Helper::linkToRoute('apps_custom');?>?appid=<?php echo $_['appid']; ?>"></script>
<script type="text/javascript" src="<?php echo OC_Helper::linkTo('settings/js', 'apps.js');?>"></script>
<div id="controls">
@@ -12,21 +13,27 @@
</div>
<ul id="leftcontent" class="applist hascontrols">
<?php foreach($_['apps'] as $app):?>
- <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>
- <?php if(!$app['internal']) echo '<small class="'.$app['internalclass'].' list">'.$app['internallabel'].'</small>' ?>
+ <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>
+ <?php if(!$app['internal'])
+ echo '<small class="'.$app['internalclass'].' list">'.$app['internallabel'].'</small>' ?>
</li>
<?php endforeach;?>
</ul>
<div id="rightcontent">
<div class="appinfo">
- <h3><strong><span class="name"><?php echo $l->t('Select an App');?></span></strong><span class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
+ <h3><strong><span class="name"><?php echo $l->t('Select an App');?></span></strong><span
+ class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
<span class="score"></span>
<p class="description"></p>
<img src="" class="preview" />
- <p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p>
- <p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p>
+ <p class="appslink hidden"><a href="#" target="_blank"><?php
+ echo $l->t('See application page at apps.owncloud.com');?></a></p>
+ <p class="license hidden"><?php
+ echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p>
<input class="enable hidden" type="submit" />
<input class="update hidden" type="submit" value="<?php echo($l->t('Update')); ?>" />
</div>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 315cbfdb9a2..7b2a3321c29 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,14 +1,20 @@
<div id="controls">
<?php if($_['admin']) { ?>
- <a class="button newquestion <?php echo($_['style1']); ?>" href="<?php echo($_['url1']); ?>"><?php echo $l->t( 'User Documentation' ); ?></a>
- <a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a>
+ <a class="button newquestion <?php echo($_['style1']); ?>"
+ href="<?php echo($_['url1']); ?>"><?php echo $l->t( 'User Documentation' ); ?></a>
+ <a class="button newquestion <?php echo($_['style2']); ?>"
+ href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a>
<?php } ?>
- <a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a>
- <a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a>
+ <a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php
+ echo $l->t( 'Online Documentation' ); ?></a>
+ <a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php
+ echo $l->t( 'Forum' ); ?></a>
<?php if($_['admin']) { ?>
- <a class="button newquestion" href="https://github.com/owncloud/core/issues" target="_blank"><?php echo $l->t( 'Bugtracker' ); ?></a>
+ <a class="button newquestion" href="https://github.com/owncloud/core/issues" target="_blank"><?php
+ echo $l->t( 'Bugtracker' ); ?></a>
<?php } ?>
- <a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a>
+ <a class="button newquestion" href="http://owncloud.com" target="_blank"><?php
+ echo $l->t( 'Commercial Support' ); ?></a>
</div>
<div class="help-includes">
<iframe src="<?php echo($_['url']); ?>" class="help-iframe">abc</iframe>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 6e9ad5e1acb..3a4a6093e77 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -5,7 +5,8 @@
*/?>
<div id="quota" class="personalblock"><div style="width:<?php echo $_['usage_relative'];?>%;">
- <p id="quotatext"><?php echo $l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>', array($_['usage'], $_['total_space']));?></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>
@@ -37,7 +38,8 @@ if($_['passwordChangeSupported']) {
<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="#personal-show" />
+ <input type="password" id="pass2" name="password"
+ placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
</fieldset>
@@ -66,7 +68,8 @@ if($_['displayNameChangeSupported']) {
<form id="lostpassword">
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Email');?></strong></legend>
- <input type="text" name="email" id="email" value="<?php echo $_['email']; ?>" placeholder="<?php echo $l->t('Your email address');?>" /><span class="msg"></span><br />
+ <input type="text" name="email" id="email" value="<?php echo $_['email']; ?>"
+ placeholder="<?php echo $l->t('Your email address');?>" /><span class="msg"></span><br />
<em><?php echo $l->t('Fill in an email address to enable password recovery');?></em>
</fieldset>
</form>
@@ -79,7 +82,8 @@ if($_['displayNameChangeSupported']) {
<option value="<?php echo $language['code'];?>"><?php echo $language['name'];?></option>
<?php endforeach;?>
</select>
- <a href="https://www.transifex.net/projects/p/owncloud/team/<?php echo $_['languages'][0]['code'];?>/" target="_blank"><em><?php echo $l->t('Help translate');?></em></a>
+ <a href="https://www.transifex.net/projects/p/owncloud/team/<?php echo $_['languages'][0]['code'];?>/"
+ target="_blank"><em><?php echo $l->t('Help translate');?></em></a>
</fieldset>
</form>
@@ -96,7 +100,8 @@ if($_['displayNameChangeSupported']) {
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Version');?></strong></legend>
- <strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> <br />
+ <strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?>
+ <?php echo(OC_Util::getEditionString()); ?> <br />
<?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
</fieldset>
diff --git a/settings/users.php b/settings/users.php
index 7fcd1d3ed02..94e6d0a9a10 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -40,12 +40,14 @@ foreach($quotaPreset as &$preset) {
$quotaPreset=array_diff($quotaPreset, array('default', 'none'));
$defaultQuota=OC_Appconfig::getValue('files', 'default_quota', 'none');
-$defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false && array_search($defaultQuota, array('none', 'default'))===false;
+$defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false
+ && array_search($defaultQuota, array('none', 'default'))===false;
// load users and quota
foreach($accessibleusers as $uid => $displayName) {
$quota=OC_Preferences::getValue($uid, 'files', 'quota', 'default');
- $isQuotaUserDefined=array_search($quota, $quotaPreset)===false && array_search($quota, array('none', 'default'))===false;
+ $isQuotaUserDefined=array_search($quota, $quotaPreset)===false
+ && array_search($quota, array('none', 'default'))===false;
$name = $displayName;
if ( $displayName != $uid ) {