summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/ajax/delete.php7
-rw-r--r--apps/files/ajax/upload.php40
-rw-r--r--apps/files/appinfo/update.php57
-rw-r--r--apps/files/command/scan.php36
-rw-r--r--apps/files/css/files.css50
-rw-r--r--apps/files/css/mobile.css9
-rw-r--r--apps/files/js/app.js4
-rw-r--r--apps/files/js/breadcrumb.js144
-rw-r--r--apps/files/js/file-upload.js29
-rw-r--r--apps/files/js/fileactions.js57
-rw-r--r--apps/files/js/filelist.js128
-rw-r--r--apps/files/l10n/eo.php1
-rw-r--r--apps/files/l10n/ml_IN.php1
-rw-r--r--apps/files/l10n/ro.php4
-rw-r--r--apps/files/l10n/ru.php4
-rw-r--r--apps/files/l10n/sl.php4
-rw-r--r--apps/files/l10n/uk.php30
-rw-r--r--apps/files/tests/js/breadcrumbSpec.js79
-rw-r--r--apps/files/tests/js/fileactionsSpec.js56
-rw-r--r--apps/files/tests/js/filelistSpec.js144
-rw-r--r--apps/files_encryption/hooks/hooks.php52
-rw-r--r--apps/files_encryption/js/settings-admin.js2
-rw-r--r--apps/files_encryption/l10n/ca.php2
-rw-r--r--apps/files_encryption/l10n/el.php1
-rw-r--r--apps/files_encryption/l10n/eo.php3
-rw-r--r--apps/files_encryption/l10n/es.php1
-rw-r--r--apps/files_encryption/l10n/et_EE.php1
-rw-r--r--apps/files_encryption/l10n/fr.php1
-rw-r--r--apps/files_encryption/l10n/nl.php1
-rw-r--r--apps/files_encryption/l10n/pl.php1
-rw-r--r--apps/files_encryption/l10n/pt_PT.php1
-rwxr-xr-xapps/files_encryption/lib/helper.php26
-rwxr-xr-xapps/files_encryption/lib/keymanager.php61
-rw-r--r--apps/files_encryption/tests/hooks.php2
-rw-r--r--apps/files_encryption/tests/keymanager.php81
-rwxr-xr-xapps/files_encryption/tests/trashbin.php2
-rwxr-xr-xapps/files_encryption/tests/util.php10
-rwxr-xr-xapps/files_encryption/tests/webdav.php2
-rw-r--r--apps/files_external/appinfo/app.php1
-rw-r--r--apps/files_external/l10n/ca.php24
-rw-r--r--apps/files_external/l10n/de.php2
-rw-r--r--apps/files_external/l10n/de_DE.php2
-rw-r--r--apps/files_external/l10n/et_EE.php17
-rw-r--r--apps/files_external/l10n/fr.php4
-rw-r--r--apps/files_external/l10n/ru.php5
-rw-r--r--apps/files_external/l10n/zh_TW.php19
-rw-r--r--apps/files_external/tests/appSpec.js99
-rw-r--r--apps/files_external/tests/js/mountsfilelistSpec.js156
-rw-r--r--apps/files_sharing/appinfo/app.php15
-rw-r--r--apps/files_sharing/js/external.js46
-rw-r--r--apps/files_sharing/js/public.js2
-rw-r--r--apps/files_sharing/l10n/ar.php1
-rw-r--r--apps/files_sharing/l10n/ast.php12
-rw-r--r--apps/files_sharing/l10n/bg_BG.php1
-rw-r--r--apps/files_sharing/l10n/bn_BD.php1
-rw-r--r--apps/files_sharing/l10n/bs.php3
-rw-r--r--apps/files_sharing/l10n/ca.php19
-rw-r--r--apps/files_sharing/l10n/cs_CZ.php12
-rw-r--r--apps/files_sharing/l10n/cy_GB.php1
-rw-r--r--apps/files_sharing/l10n/da.php1
-rw-r--r--apps/files_sharing/l10n/de.php12
-rw-r--r--apps/files_sharing/l10n/de_AT.php1
-rw-r--r--apps/files_sharing/l10n/de_CH.php1
-rw-r--r--apps/files_sharing/l10n/de_DE.php12
-rw-r--r--apps/files_sharing/l10n/el.php12
-rw-r--r--apps/files_sharing/l10n/en_GB.php12
-rw-r--r--apps/files_sharing/l10n/eo.php15
-rw-r--r--apps/files_sharing/l10n/es.php12
-rw-r--r--apps/files_sharing/l10n/es_AR.php1
-rw-r--r--apps/files_sharing/l10n/es_MX.php1
-rw-r--r--apps/files_sharing/l10n/et_EE.php19
-rw-r--r--apps/files_sharing/l10n/eu.php1
-rw-r--r--apps/files_sharing/l10n/eu_ES.php1
-rw-r--r--apps/files_sharing/l10n/fa.php1
-rw-r--r--apps/files_sharing/l10n/fi_FI.php12
-rw-r--r--apps/files_sharing/l10n/fr.php12
-rw-r--r--apps/files_sharing/l10n/gl.php12
-rw-r--r--apps/files_sharing/l10n/he.php1
-rw-r--r--apps/files_sharing/l10n/hi.php3
-rw-r--r--apps/files_sharing/l10n/hr.php1
-rw-r--r--apps/files_sharing/l10n/hu_HU.php1
-rw-r--r--apps/files_sharing/l10n/hy.php1
-rw-r--r--apps/files_sharing/l10n/ia.php1
-rw-r--r--apps/files_sharing/l10n/id.php1
-rw-r--r--apps/files_sharing/l10n/is.php1
-rw-r--r--apps/files_sharing/l10n/it.php12
-rw-r--r--apps/files_sharing/l10n/ja.php26
-rw-r--r--apps/files_sharing/l10n/ka_GE.php1
-rw-r--r--apps/files_sharing/l10n/km.php1
-rw-r--r--apps/files_sharing/l10n/ko.php1
-rw-r--r--apps/files_sharing/l10n/ku_IQ.php1
-rw-r--r--apps/files_sharing/l10n/lb.php1
-rw-r--r--apps/files_sharing/l10n/lt_LT.php1
-rw-r--r--apps/files_sharing/l10n/lv.php1
-rw-r--r--apps/files_sharing/l10n/mk.php1
-rw-r--r--apps/files_sharing/l10n/ms_MY.php1
-rw-r--r--apps/files_sharing/l10n/nb_NO.php12
-rw-r--r--apps/files_sharing/l10n/nl.php12
-rw-r--r--apps/files_sharing/l10n/nn_NO.php1
-rw-r--r--apps/files_sharing/l10n/oc.php1
-rw-r--r--apps/files_sharing/l10n/pl.php10
-rw-r--r--apps/files_sharing/l10n/pt_BR.php12
-rw-r--r--apps/files_sharing/l10n/pt_PT.php12
-rw-r--r--apps/files_sharing/l10n/ro.php1
-rw-r--r--apps/files_sharing/l10n/ru.php5
-rw-r--r--apps/files_sharing/l10n/si_LK.php1
-rw-r--r--apps/files_sharing/l10n/sk.php1
-rw-r--r--apps/files_sharing/l10n/sk_SK.php12
-rw-r--r--apps/files_sharing/l10n/sl.php1
-rw-r--r--apps/files_sharing/l10n/sq.php1
-rw-r--r--apps/files_sharing/l10n/sr.php1
-rw-r--r--apps/files_sharing/l10n/sr@latin.php1
-rw-r--r--apps/files_sharing/l10n/sv.php1
-rw-r--r--apps/files_sharing/l10n/ta_LK.php1
-rw-r--r--apps/files_sharing/l10n/te.php3
-rw-r--r--apps/files_sharing/l10n/th_TH.php1
-rw-r--r--apps/files_sharing/l10n/tr.php12
-rw-r--r--apps/files_sharing/l10n/ug.php1
-rw-r--r--apps/files_sharing/l10n/uk.php2
-rw-r--r--apps/files_sharing/l10n/ur_PK.php1
-rw-r--r--apps/files_sharing/l10n/vi.php1
-rw-r--r--apps/files_sharing/l10n/zh_CN.php1
-rw-r--r--apps/files_sharing/l10n/zh_HK.php1
-rw-r--r--apps/files_sharing/l10n/zh_TW.php1
-rw-r--r--apps/files_sharing/lib/cache.php6
-rw-r--r--apps/files_sharing/lib/external/manager.php12
-rw-r--r--apps/files_sharing/lib/external/storage.php4
-rw-r--r--apps/files_sharing/lib/helper.php14
-rw-r--r--apps/files_sharing/lib/updater.php62
-rw-r--r--apps/files_sharing/templates/settings-admin.php2
-rw-r--r--apps/files_sharing/tests/externalstorage.php89
-rw-r--r--apps/files_sharing/tests/js/appSpec.js2
-rw-r--r--apps/files_sharing/tests/js/shareSpec.js2
-rw-r--r--apps/files_sharing/tests/js/sharedfilelistSpec.js1
-rw-r--r--apps/files_sharing/tests/permissions.php5
-rw-r--r--apps/files_sharing/tests/sharedstorage.php31
-rw-r--r--apps/files_sharing/tests/updater.php115
-rw-r--r--apps/files_trashbin/ajax/delete.php2
-rw-r--r--apps/files_trashbin/ajax/list.php2
-rw-r--r--apps/files_trashbin/ajax/undelete.php2
-rw-r--r--apps/files_trashbin/css/trash.css4
-rw-r--r--apps/files_trashbin/l10n/uk.php2
-rw-r--r--apps/files_trashbin/lib/helper.php4
-rw-r--r--apps/files_trashbin/lib/trashbin.php96
-rw-r--r--apps/files_trashbin/tests/js/filelistSpec.js1
-rw-r--r--apps/files_trashbin/tests/trashbin.php321
-rw-r--r--apps/files_versions/js/versions.js2
-rw-r--r--apps/files_versions/lib/versions.php1
-rw-r--r--apps/user_ldap/l10n/ca.php11
-rw-r--r--apps/user_ldap/l10n/cs_CZ.php6
-rw-r--r--apps/user_ldap/l10n/eo.php14
-rw-r--r--apps/user_ldap/l10n/et_EE.php3
-rw-r--r--apps/user_ldap/l10n/pt_BR.php18
-rw-r--r--apps/user_ldap/l10n/pt_PT.php13
-rw-r--r--apps/user_ldap/l10n/sl.php6
-rw-r--r--apps/user_ldap/lib/access.php23
-rw-r--r--apps/user_ldap/lib/connection.php16
-rw-r--r--apps/user_ldap/lib/helper.php3
-rw-r--r--apps/user_ldap/lib/wizard.php167
-rw-r--r--apps/user_ldap/tests/wizard.php6
-rw-r--r--apps/user_webdavauth/l10n/et_EE.php1
-rw-r--r--core/css/mobile.css1
-rw-r--r--core/css/share.css2
-rw-r--r--core/css/styles.css10
-rw-r--r--core/js/js.js4
-rw-r--r--core/js/oc-dialogs.js7
-rw-r--r--core/js/share.js6
-rw-r--r--core/js/tests/specHelper.js2
-rw-r--r--core/l10n/af_ZA.php1
-rw-r--r--core/l10n/ar.php1
-rw-r--r--core/l10n/ast.php1
-rw-r--r--core/l10n/bg_BG.php1
-rw-r--r--core/l10n/bn_BD.php1
-rw-r--r--core/l10n/ca.php1
-rw-r--r--core/l10n/cs_CZ.php3
-rw-r--r--core/l10n/cy_GB.php1
-rw-r--r--core/l10n/da.php6
-rw-r--r--core/l10n/de.php1
-rw-r--r--core/l10n/de_CH.php1
-rw-r--r--core/l10n/de_DE.php1
-rw-r--r--core/l10n/el.php10
-rw-r--r--core/l10n/en_GB.php1
-rw-r--r--core/l10n/eo.php1
-rw-r--r--core/l10n/es.php5
-rw-r--r--core/l10n/es_AR.php1
-rw-r--r--core/l10n/es_MX.php1
-rw-r--r--core/l10n/et_EE.php24
-rw-r--r--core/l10n/eu.php1
-rw-r--r--core/l10n/fa.php1
-rw-r--r--core/l10n/fi_FI.php1
-rw-r--r--core/l10n/fr.php12
-rw-r--r--core/l10n/gl.php1
-rw-r--r--core/l10n/he.php1
-rw-r--r--core/l10n/hr.php1
-rw-r--r--core/l10n/hu_HU.php1
-rw-r--r--core/l10n/ia.php1
-rw-r--r--core/l10n/id.php1
-rw-r--r--core/l10n/is.php1
-rw-r--r--core/l10n/it.php1
-rw-r--r--core/l10n/ja.php13
-rw-r--r--core/l10n/ka_GE.php1
-rw-r--r--core/l10n/km.php1
-rw-r--r--core/l10n/ko.php1
-rw-r--r--core/l10n/lb.php1
-rw-r--r--core/l10n/lt_LT.php1
-rw-r--r--core/l10n/lv.php1
-rw-r--r--core/l10n/mk.php1
-rw-r--r--core/l10n/my_MM.php1
-rw-r--r--core/l10n/nb_NO.php1
-rw-r--r--core/l10n/nl.php11
-rw-r--r--core/l10n/nn_NO.php1
-rw-r--r--core/l10n/oc.php1
-rw-r--r--core/l10n/pl.php9
-rw-r--r--core/l10n/pt_BR.php1
-rw-r--r--core/l10n/pt_PT.php17
-rw-r--r--core/l10n/ro.php1
-rw-r--r--core/l10n/ru.php13
-rw-r--r--core/l10n/si_LK.php1
-rw-r--r--core/l10n/sk_SK.php1
-rw-r--r--core/l10n/sl.php7
-rw-r--r--core/l10n/sq.php1
-rw-r--r--core/l10n/sr.php1
-rw-r--r--core/l10n/sr@latin.php1
-rw-r--r--core/l10n/sv.php1
-rw-r--r--core/l10n/ta_LK.php1
-rw-r--r--core/l10n/th_TH.php1
-rw-r--r--core/l10n/tr.php1
-rw-r--r--core/l10n/ug.php1
-rw-r--r--core/l10n/uk.php2
-rw-r--r--core/l10n/ur_PK.php1
-rw-r--r--core/l10n/vi.php1
-rw-r--r--core/l10n/zh_CN.php1
-rw-r--r--core/l10n/zh_HK.php1
-rw-r--r--core/l10n/zh_TW.php2
-rw-r--r--l10n/ach/core.po52
-rw-r--r--l10n/ach/files_sharing.po14
-rw-r--r--l10n/ady/core.po52
-rw-r--r--l10n/ady/files_sharing.po14
-rw-r--r--l10n/af_ZA/core.po54
-rw-r--r--l10n/af_ZA/files_sharing.po14
-rw-r--r--l10n/ak/core.po52
-rw-r--r--l10n/ak/files_sharing.po14
-rw-r--r--l10n/am_ET/core.po52
-rw-r--r--l10n/am_ET/files_sharing.po14
-rw-r--r--l10n/ar/core.po54
-rw-r--r--l10n/ar/files.po30
-rw-r--r--l10n/ar/files_sharing.po16
-rw-r--r--l10n/ar/user_ldap.po4
-rw-r--r--l10n/ar/user_webdavauth.po4
-rw-r--r--l10n/ast/core.po56
-rw-r--r--l10n/ast/files.po30
-rw-r--r--l10n/ast/files_sharing.po34
-rw-r--r--l10n/ast/lib.po8
-rw-r--r--l10n/ast/settings.po106
-rw-r--r--l10n/ast/user_ldap.po4
-rw-r--r--l10n/ast/user_webdavauth.po4
-rw-r--r--l10n/az/core.po52
-rw-r--r--l10n/az/files_sharing.po14
-rw-r--r--l10n/be/core.po52
-rw-r--r--l10n/be/files_sharing.po14
-rw-r--r--l10n/bg_BG/core.po54
-rw-r--r--l10n/bg_BG/files.po30
-rw-r--r--l10n/bg_BG/files_sharing.po16
-rw-r--r--l10n/bg_BG/user_ldap.po4
-rw-r--r--l10n/bg_BG/user_webdavauth.po4
-rw-r--r--l10n/bn_BD/core.po54
-rw-r--r--l10n/bn_BD/files.po30
-rw-r--r--l10n/bn_BD/files_sharing.po16
-rw-r--r--l10n/bn_BD/user_ldap.po4
-rw-r--r--l10n/bn_BD/user_webdavauth.po4
-rw-r--r--l10n/bn_IN/core.po52
-rw-r--r--l10n/bn_IN/files_sharing.po14
-rw-r--r--l10n/bs/core.po52
-rw-r--r--l10n/bs/files.po30
-rw-r--r--l10n/bs/files_sharing.po16
-rw-r--r--l10n/bs/user_ldap.po4
-rw-r--r--l10n/bs/user_webdavauth.po4
-rw-r--r--l10n/ca/core.po56
-rw-r--r--l10n/ca/files.po4
-rw-r--r--l10n/ca/files_encryption.po10
-rw-r--r--l10n/ca/files_external.po56
-rw-r--r--l10n/ca/files_sharing.po48
-rw-r--r--l10n/ca/user_ldap.po28
-rw-r--r--l10n/ca/user_webdavauth.po4
-rw-r--r--l10n/ca@valencia/core.po52
-rw-r--r--l10n/ca@valencia/files_sharing.po14
-rw-r--r--l10n/cs_CZ/core.po58
-rw-r--r--l10n/cs_CZ/files.po30
-rw-r--r--l10n/cs_CZ/files_sharing.po34
-rw-r--r--l10n/cs_CZ/settings.po32
-rw-r--r--l10n/cs_CZ/user_ldap.po22
-rw-r--r--l10n/cs_CZ/user_webdavauth.po4
-rw-r--r--l10n/cy_GB/core.po54
-rw-r--r--l10n/cy_GB/files.po30
-rw-r--r--l10n/cy_GB/files_sharing.po16
-rw-r--r--l10n/cy_GB/user_ldap.po4
-rw-r--r--l10n/cy_GB/user_webdavauth.po4
-rw-r--r--l10n/da/core.po65
-rw-r--r--l10n/da/files.po30
-rw-r--r--l10n/da/files_sharing.po16
-rw-r--r--l10n/da/user_ldap.po4
-rw-r--r--l10n/da/user_webdavauth.po4
-rw-r--r--l10n/de/core.po56
-rw-r--r--l10n/de/files.po30
-rw-r--r--l10n/de/files_external.po8
-rw-r--r--l10n/de/files_sharing.po34
-rw-r--r--l10n/de/settings.po30
-rw-r--r--l10n/de/user_ldap.po4
-rw-r--r--l10n/de/user_webdavauth.po4
-rw-r--r--l10n/de_AT/core.po54
-rw-r--r--l10n/de_AT/files.po30
-rw-r--r--l10n/de_AT/files_sharing.po16
-rw-r--r--l10n/de_AT/user_ldap.po4
-rw-r--r--l10n/de_AT/user_webdavauth.po4
-rw-r--r--l10n/de_CH/core.po54
-rw-r--r--l10n/de_CH/files.po30
-rw-r--r--l10n/de_CH/files_sharing.po16
-rw-r--r--l10n/de_CH/user_ldap.po4
-rw-r--r--l10n/de_CH/user_webdavauth.po4
-rw-r--r--l10n/de_DE/core.po56
-rw-r--r--l10n/de_DE/files.po30
-rw-r--r--l10n/de_DE/files_external.po11
-rw-r--r--l10n/de_DE/files_sharing.po34
-rw-r--r--l10n/de_DE/settings.po22
-rw-r--r--l10n/de_DE/user_ldap.po4
-rw-r--r--l10n/de_DE/user_webdavauth.po4
-rw-r--r--l10n/el/core.po74
-rw-r--r--l10n/el/files.po30
-rw-r--r--l10n/el/files_encryption.po10
-rw-r--r--l10n/el/files_sharing.po34
-rw-r--r--l10n/el/settings.po34
-rw-r--r--l10n/el/user_ldap.po4
-rw-r--r--l10n/el/user_webdavauth.po4
-rw-r--r--l10n/en@pirate/core.po52
-rw-r--r--l10n/en@pirate/files_sharing.po14
-rw-r--r--l10n/en_GB/core.po56
-rw-r--r--l10n/en_GB/files.po30
-rw-r--r--l10n/en_GB/files_sharing.po34
-rw-r--r--l10n/en_GB/user_ldap.po4
-rw-r--r--l10n/en_GB/user_webdavauth.po4
-rw-r--r--l10n/en_NZ/core.po52
-rw-r--r--l10n/en_NZ/files_sharing.po14
-rw-r--r--l10n/eo/core.po54
-rw-r--r--l10n/eo/files.po66
-rw-r--r--l10n/eo/files_encryption.po10
-rw-r--r--l10n/eo/files_sharing.po46
-rw-r--r--l10n/eo/lib.po82
-rw-r--r--l10n/eo/settings.po148
-rw-r--r--l10n/eo/user_ldap.po50
-rw-r--r--l10n/eo/user_webdavauth.po4
-rw-r--r--l10n/es/core.po64
-rw-r--r--l10n/es/files.po4
-rw-r--r--l10n/es/files_encryption.po10
-rw-r--r--l10n/es/files_sharing.po35
-rw-r--r--l10n/es/user_ldap.po4
-rw-r--r--l10n/es/user_webdavauth.po4
-rw-r--r--l10n/es_AR/core.po54
-rw-r--r--l10n/es_AR/files.po30
-rw-r--r--l10n/es_AR/files_sharing.po16
-rw-r--r--l10n/es_AR/user_ldap.po4
-rw-r--r--l10n/es_AR/user_webdavauth.po4
-rw-r--r--l10n/es_BO/core.po52
-rw-r--r--l10n/es_BO/files_sharing.po14
-rw-r--r--l10n/es_CL/core.po52
-rw-r--r--l10n/es_CL/files_sharing.po14
-rw-r--r--l10n/es_CO/core.po52
-rw-r--r--l10n/es_CO/files_sharing.po14
-rw-r--r--l10n/es_CR/core.po52
-rw-r--r--l10n/es_CR/files_sharing.po14
-rw-r--r--l10n/es_EC/core.po52
-rw-r--r--l10n/es_EC/files_sharing.po14
-rw-r--r--l10n/es_MX/core.po54
-rw-r--r--l10n/es_MX/files.po30
-rw-r--r--l10n/es_MX/files_sharing.po16
-rw-r--r--l10n/es_MX/user_ldap.po4
-rw-r--r--l10n/es_MX/user_webdavauth.po4
-rw-r--r--l10n/es_PE/core.po52
-rw-r--r--l10n/es_PE/files_sharing.po14
-rw-r--r--l10n/es_PY/core.po52
-rw-r--r--l10n/es_PY/files_sharing.po14
-rw-r--r--l10n/es_US/core.po52
-rw-r--r--l10n/es_US/files_sharing.po14
-rw-r--r--l10n/es_UY/core.po52
-rw-r--r--l10n/es_UY/files_sharing.po14
-rw-r--r--l10n/et_EE/core.po100
-rw-r--r--l10n/et_EE/files.po30
-rw-r--r--l10n/et_EE/files_encryption.po8
-rw-r--r--l10n/et_EE/files_external.po42
-rw-r--r--l10n/et_EE/files_sharing.po48
-rw-r--r--l10n/et_EE/lib.po12
-rw-r--r--l10n/et_EE/settings.po156
-rw-r--r--l10n/et_EE/user_ldap.po12
-rw-r--r--l10n/et_EE/user_webdavauth.po10
-rw-r--r--l10n/eu/core.po54
-rw-r--r--l10n/eu/files.po30
-rw-r--r--l10n/eu/files_sharing.po16
-rw-r--r--l10n/eu/user_ldap.po4
-rw-r--r--l10n/eu/user_webdavauth.po4
-rw-r--r--l10n/eu_ES/core.po52
-rw-r--r--l10n/eu_ES/files.po30
-rw-r--r--l10n/eu_ES/files_sharing.po16
-rw-r--r--l10n/eu_ES/user_ldap.po4
-rw-r--r--l10n/eu_ES/user_webdavauth.po4
-rw-r--r--l10n/fa/core.po54
-rw-r--r--l10n/fa/files.po30
-rw-r--r--l10n/fa/files_sharing.po16
-rw-r--r--l10n/fa/user_ldap.po4
-rw-r--r--l10n/fa/user_webdavauth.po4
-rw-r--r--l10n/fi_FI/core.po56
-rw-r--r--l10n/fi_FI/files.po30
-rw-r--r--l10n/fi_FI/files_sharing.po34
-rw-r--r--l10n/fi_FI/user_ldap.po4
-rw-r--r--l10n/fi_FI/user_webdavauth.po4
-rw-r--r--l10n/fr/core.po76
-rw-r--r--l10n/fr/files.po30
-rw-r--r--l10n/fr/files_encryption.po8
-rw-r--r--l10n/fr/files_external.po16
-rw-r--r--l10n/fr/files_sharing.po34
-rw-r--r--l10n/fr/lib.po52
-rw-r--r--l10n/fr/settings.po112
-rw-r--r--l10n/fr/user_ldap.po4
-rw-r--r--l10n/fr/user_webdavauth.po4
-rw-r--r--l10n/fr_CA/core.po52
-rw-r--r--l10n/fr_CA/files_sharing.po14
-rw-r--r--l10n/gl/core.po56
-rw-r--r--l10n/gl/files.po30
-rw-r--r--l10n/gl/files_sharing.po34
-rw-r--r--l10n/gl/user_ldap.po4
-rw-r--r--l10n/gl/user_webdavauth.po4
-rw-r--r--l10n/he/core.po54
-rw-r--r--l10n/he/files.po30
-rw-r--r--l10n/he/files_sharing.po16
-rw-r--r--l10n/he/user_ldap.po4
-rw-r--r--l10n/he/user_webdavauth.po4
-rw-r--r--l10n/hi/core.po52
-rw-r--r--l10n/hi/files.po30
-rw-r--r--l10n/hi/files_sharing.po16
-rw-r--r--l10n/hi/user_ldap.po4
-rw-r--r--l10n/hi/user_webdavauth.po4
-rw-r--r--l10n/hi_IN/core.po52
-rw-r--r--l10n/hi_IN/files_sharing.po14
-rw-r--r--l10n/hr/core.po54
-rw-r--r--l10n/hr/files.po30
-rw-r--r--l10n/hr/files_sharing.po16
-rw-r--r--l10n/hr/user_ldap.po4
-rw-r--r--l10n/hr/user_webdavauth.po4
-rw-r--r--l10n/hu_HU/core.po54
-rw-r--r--l10n/hu_HU/files.po4
-rw-r--r--l10n/hu_HU/files_sharing.po16
-rw-r--r--l10n/hu_HU/user_ldap.po4
-rw-r--r--l10n/hu_HU/user_webdavauth.po4
-rw-r--r--l10n/hy/core.po52
-rw-r--r--l10n/hy/files.po30
-rw-r--r--l10n/hy/files_sharing.po16
-rw-r--r--l10n/hy/user_ldap.po4
-rw-r--r--l10n/hy/user_webdavauth.po4
-rw-r--r--l10n/ia/core.po54
-rw-r--r--l10n/ia/files.po30
-rw-r--r--l10n/ia/files_sharing.po16
-rw-r--r--l10n/ia/user_ldap.po4
-rw-r--r--l10n/ia/user_webdavauth.po4
-rw-r--r--l10n/id/core.po54
-rw-r--r--l10n/id/files.po30
-rw-r--r--l10n/id/files_sharing.po16
-rw-r--r--l10n/id/user_ldap.po4
-rw-r--r--l10n/id/user_webdavauth.po4
-rw-r--r--l10n/is/core.po54
-rw-r--r--l10n/is/files.po30
-rw-r--r--l10n/is/files_sharing.po16
-rw-r--r--l10n/is/user_ldap.po4
-rw-r--r--l10n/is/user_webdavauth.po4
-rw-r--r--l10n/it/core.po56
-rw-r--r--l10n/it/files.po30
-rw-r--r--l10n/it/files_sharing.po35
-rw-r--r--l10n/it/lib.po70
-rw-r--r--l10n/it/settings.po24
-rw-r--r--l10n/it/user_ldap.po4
-rw-r--r--l10n/it/user_webdavauth.po4
-rw-r--r--l10n/ja/core.po72
-rw-r--r--l10n/ja/files.po30
-rw-r--r--l10n/ja/files_external.po6
-rw-r--r--l10n/ja/files_sharing.po50
-rw-r--r--l10n/ja/lib.po8
-rw-r--r--l10n/ja/settings.po118
-rw-r--r--l10n/ja/user_ldap.po4
-rw-r--r--l10n/ja/user_webdavauth.po4
-rw-r--r--l10n/jv/core.po52
-rw-r--r--l10n/jv/files_sharing.po14
-rw-r--r--l10n/ka_GE/core.po54
-rw-r--r--l10n/ka_GE/files.po30
-rw-r--r--l10n/ka_GE/files_sharing.po16
-rw-r--r--l10n/ka_GE/user_ldap.po4
-rw-r--r--l10n/ka_GE/user_webdavauth.po4
-rw-r--r--l10n/km/core.po54
-rw-r--r--l10n/km/files.po30
-rw-r--r--l10n/km/files_sharing.po16
-rw-r--r--l10n/km/user_ldap.po4
-rw-r--r--l10n/km/user_webdavauth.po4
-rw-r--r--l10n/kn/core.po52
-rw-r--r--l10n/kn/files_sharing.po14
-rw-r--r--l10n/ko/core.po54
-rw-r--r--l10n/ko/files.po30
-rw-r--r--l10n/ko/files_sharing.po16
-rw-r--r--l10n/ko/user_ldap.po4
-rw-r--r--l10n/ko/user_webdavauth.po4
-rw-r--r--l10n/ku_IQ/core.po52
-rw-r--r--l10n/ku_IQ/files.po30
-rw-r--r--l10n/ku_IQ/files_sharing.po16
-rw-r--r--l10n/ku_IQ/user_ldap.po4
-rw-r--r--l10n/ku_IQ/user_webdavauth.po4
-rw-r--r--l10n/lb/core.po54
-rw-r--r--l10n/lb/files.po30
-rw-r--r--l10n/lb/files_sharing.po16
-rw-r--r--l10n/lb/user_ldap.po4
-rw-r--r--l10n/lb/user_webdavauth.po4
-rw-r--r--l10n/lt_LT/core.po54
-rw-r--r--l10n/lt_LT/files.po30
-rw-r--r--l10n/lt_LT/files_sharing.po16
-rw-r--r--l10n/lt_LT/user_ldap.po4
-rw-r--r--l10n/lt_LT/user_webdavauth.po4
-rw-r--r--l10n/lv/core.po54
-rw-r--r--l10n/lv/files.po30
-rw-r--r--l10n/lv/files_sharing.po16
-rw-r--r--l10n/lv/user_ldap.po4
-rw-r--r--l10n/lv/user_webdavauth.po4
-rw-r--r--l10n/mk/core.po54
-rw-r--r--l10n/mk/files.po30
-rw-r--r--l10n/mk/files_sharing.po16
-rw-r--r--l10n/mk/user_ldap.po4
-rw-r--r--l10n/mk/user_webdavauth.po4
-rw-r--r--l10n/ml/core.po52
-rw-r--r--l10n/ml/files_sharing.po14
-rw-r--r--l10n/ml_IN/core.po52
-rw-r--r--l10n/ml_IN/files.po68
-rw-r--r--l10n/ml_IN/files_sharing.po14
-rw-r--r--l10n/mn/core.po52
-rw-r--r--l10n/mn/files_sharing.po14
-rw-r--r--l10n/ms_MY/core.po52
-rw-r--r--l10n/ms_MY/files.po30
-rw-r--r--l10n/ms_MY/files_sharing.po16
-rw-r--r--l10n/ms_MY/user_ldap.po4
-rw-r--r--l10n/ms_MY/user_webdavauth.po4
-rw-r--r--l10n/my_MM/core.po54
-rw-r--r--l10n/my_MM/files_sharing.po14
-rw-r--r--l10n/nb_NO/core.po56
-rw-r--r--l10n/nb_NO/files.po4
-rw-r--r--l10n/nb_NO/files_sharing.po34
-rw-r--r--l10n/nb_NO/settings.po22
-rw-r--r--l10n/nb_NO/user_ldap.po4
-rw-r--r--l10n/nb_NO/user_webdavauth.po4
-rw-r--r--l10n/nds/core.po52
-rw-r--r--l10n/nds/files_sharing.po14
-rw-r--r--l10n/ne/core.po52
-rw-r--r--l10n/ne/files_sharing.po14
-rw-r--r--l10n/nl/core.po74
-rw-r--r--l10n/nl/files.po30
-rw-r--r--l10n/nl/files_encryption.po8
-rw-r--r--l10n/nl/files_sharing.po34
-rw-r--r--l10n/nl/lib.po52
-rw-r--r--l10n/nl/settings.po110
-rw-r--r--l10n/nl/user_ldap.po4
-rw-r--r--l10n/nl/user_webdavauth.po4
-rw-r--r--l10n/nn_NO/core.po54
-rw-r--r--l10n/nn_NO/files.po30
-rw-r--r--l10n/nn_NO/files_sharing.po16
-rw-r--r--l10n/nn_NO/user_ldap.po4
-rw-r--r--l10n/nn_NO/user_webdavauth.po4
-rw-r--r--l10n/nqo/core.po52
-rw-r--r--l10n/nqo/files_sharing.po14
-rw-r--r--l10n/oc/core.po54
-rw-r--r--l10n/oc/files.po30
-rw-r--r--l10n/oc/files_sharing.po16
-rw-r--r--l10n/oc/user_ldap.po4
-rw-r--r--l10n/oc/user_webdavauth.po4
-rw-r--r--l10n/or_IN/core.po52
-rw-r--r--l10n/or_IN/files_sharing.po14
-rw-r--r--l10n/pa/core.po52
-rw-r--r--l10n/pa/files_sharing.po14
-rw-r--r--l10n/pl/core.po72
-rw-r--r--l10n/pl/files.po30
-rw-r--r--l10n/pl/files_encryption.po10
-rw-r--r--l10n/pl/files_sharing.po32
-rw-r--r--l10n/pl/settings.po110
-rw-r--r--l10n/pl/user_ldap.po4
-rw-r--r--l10n/pl/user_webdavauth.po4
-rw-r--r--l10n/pt_BR/core.po56
-rw-r--r--l10n/pt_BR/files.po64
-rw-r--r--l10n/pt_BR/files_external.po6
-rw-r--r--l10n/pt_BR/files_sharing.po34
-rw-r--r--l10n/pt_BR/files_trashbin.po8
-rw-r--r--l10n/pt_BR/files_versions.po20
-rw-r--r--l10n/pt_BR/lib.po60
-rw-r--r--l10n/pt_BR/settings.po42
-rw-r--r--l10n/pt_BR/user_ldap.po34
-rw-r--r--l10n/pt_BR/user_webdavauth.po4
-rw-r--r--l10n/pt_PT/core.po89
-rw-r--r--l10n/pt_PT/files.po64
-rw-r--r--l10n/pt_PT/files_encryption.po8
-rw-r--r--l10n/pt_PT/files_external.po4
-rw-r--r--l10n/pt_PT/files_sharing.po35
-rw-r--r--l10n/pt_PT/settings.po98
-rw-r--r--l10n/pt_PT/user_ldap.po39
-rw-r--r--l10n/pt_PT/user_webdavauth.po4
-rw-r--r--l10n/ro/core.po54
-rw-r--r--l10n/ro/files.po63
-rw-r--r--l10n/ro/files_sharing.po16
-rw-r--r--l10n/ro/user_ldap.po4
-rw-r--r--l10n/ro/user_webdavauth.po4
-rw-r--r--l10n/ru/core.po77
-rw-r--r--l10n/ru/files.po71
-rw-r--r--l10n/ru/files_external.po20
-rw-r--r--l10n/ru/files_sharing.po25
-rw-r--r--l10n/ru/lib.po93
-rw-r--r--l10n/ru/settings.po180
-rw-r--r--l10n/ru/user_ldap.po4
-rw-r--r--l10n/ru/user_webdavauth.po4
-rw-r--r--l10n/si_LK/core.po54
-rw-r--r--l10n/si_LK/files.po30
-rw-r--r--l10n/si_LK/files_sharing.po16
-rw-r--r--l10n/si_LK/user_ldap.po4
-rw-r--r--l10n/si_LK/user_webdavauth.po4
-rw-r--r--l10n/sk/core.po52
-rw-r--r--l10n/sk/files.po30
-rw-r--r--l10n/sk/files_sharing.po16
-rw-r--r--l10n/sk/user_ldap.po4
-rw-r--r--l10n/sk/user_webdavauth.po4
-rw-r--r--l10n/sk_SK/core.po56
-rw-r--r--l10n/sk_SK/files.po4
-rw-r--r--l10n/sk_SK/files_sharing.po34
-rw-r--r--l10n/sk_SK/lib.po8
-rw-r--r--l10n/sk_SK/settings.po106
-rw-r--r--l10n/sk_SK/user_ldap.po4
-rw-r--r--l10n/sk_SK/user_webdavauth.po4
-rw-r--r--l10n/sl/core.po66
-rw-r--r--l10n/sl/files.po70
-rw-r--r--l10n/sl/files_sharing.po16
-rw-r--r--l10n/sl/settings.po108
-rw-r--r--l10n/sl/user_ldap.po28
-rw-r--r--l10n/sl/user_webdavauth.po4
-rw-r--r--l10n/sq/core.po54
-rw-r--r--l10n/sq/files.po30
-rw-r--r--l10n/sq/files_sharing.po16
-rw-r--r--l10n/sq/user_ldap.po4
-rw-r--r--l10n/sq/user_webdavauth.po4
-rw-r--r--l10n/sr/core.po54
-rw-r--r--l10n/sr/files.po30
-rw-r--r--l10n/sr/files_sharing.po16
-rw-r--r--l10n/sr/user_ldap.po4
-rw-r--r--l10n/sr/user_webdavauth.po4
-rw-r--r--l10n/sr@latin/core.po54
-rw-r--r--l10n/sr@latin/files.po30
-rw-r--r--l10n/sr@latin/files_sharing.po16
-rw-r--r--l10n/sr@latin/user_ldap.po4
-rw-r--r--l10n/sr@latin/user_webdavauth.po4
-rw-r--r--l10n/su/core.po52
-rw-r--r--l10n/su/files_sharing.po14
-rw-r--r--l10n/sv/core.po54
-rw-r--r--l10n/sv/files.po4
-rw-r--r--l10n/sv/files_sharing.po16
-rw-r--r--l10n/sv/user_ldap.po4
-rw-r--r--l10n/sv/user_webdavauth.po4
-rw-r--r--l10n/sw_KE/core.po52
-rw-r--r--l10n/sw_KE/files_sharing.po14
-rw-r--r--l10n/ta_IN/core.po52
-rw-r--r--l10n/ta_IN/files_sharing.po14
-rw-r--r--l10n/ta_LK/core.po54
-rw-r--r--l10n/ta_LK/files.po30
-rw-r--r--l10n/ta_LK/files_sharing.po16
-rw-r--r--l10n/ta_LK/user_ldap.po4
-rw-r--r--l10n/ta_LK/user_webdavauth.po4
-rw-r--r--l10n/te/core.po54
-rw-r--r--l10n/te/files.po30
-rw-r--r--l10n/te/files_sharing.po16
-rw-r--r--l10n/te/user_ldap.po4
-rw-r--r--l10n/te/user_webdavauth.po4
-rw-r--r--l10n/templates/core.pot50
-rw-r--r--l10n/templates/files.pot62
-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.pot4
-rw-r--r--l10n/templates/files_versions.pot2
-rw-r--r--l10n/templates/lib.pot66
-rw-r--r--l10n/templates/private.pot62
-rw-r--r--l10n/templates/settings.pot22
-rw-r--r--l10n/templates/user_ldap.pot14
-rw-r--r--l10n/templates/user_webdavauth.pot2
-rw-r--r--l10n/th_TH/core.po54
-rw-r--r--l10n/th_TH/files.po30
-rw-r--r--l10n/th_TH/files_sharing.po16
-rw-r--r--l10n/th_TH/user_ldap.po4
-rw-r--r--l10n/th_TH/user_webdavauth.po4
-rw-r--r--l10n/tr/core.po56
-rw-r--r--l10n/tr/files.po30
-rw-r--r--l10n/tr/files_sharing.po34
-rw-r--r--l10n/tr/user_ldap.po4
-rw-r--r--l10n/tr/user_webdavauth.po4
-rw-r--r--l10n/tzm/core.po52
-rw-r--r--l10n/tzm/files_sharing.po14
-rw-r--r--l10n/ug/core.po54
-rw-r--r--l10n/ug/files.po30
-rw-r--r--l10n/ug/files_sharing.po16
-rw-r--r--l10n/ug/user_ldap.po4
-rw-r--r--l10n/ug/user_webdavauth.po4
-rw-r--r--l10n/uk/core.po56
-rw-r--r--l10n/uk/files.po125
-rw-r--r--l10n/uk/files_sharing.po19
-rw-r--r--l10n/uk/files_trashbin.po11
-rw-r--r--l10n/uk/user_ldap.po4
-rw-r--r--l10n/uk/user_webdavauth.po4
-rw-r--r--l10n/ur/core.po52
-rw-r--r--l10n/ur/files_sharing.po14
-rw-r--r--l10n/ur_PK/core.po54
-rw-r--r--l10n/ur_PK/files.po30
-rw-r--r--l10n/ur_PK/files_sharing.po16
-rw-r--r--l10n/ur_PK/user_ldap.po4
-rw-r--r--l10n/ur_PK/user_webdavauth.po4
-rw-r--r--l10n/uz/core.po52
-rw-r--r--l10n/uz/files_sharing.po14
-rw-r--r--l10n/vi/core.po54
-rw-r--r--l10n/vi/files.po30
-rw-r--r--l10n/vi/files_sharing.po16
-rw-r--r--l10n/vi/user_ldap.po4
-rw-r--r--l10n/vi/user_webdavauth.po4
-rw-r--r--l10n/zh_CN/core.po54
-rw-r--r--l10n/zh_CN/files.po4
-rw-r--r--l10n/zh_CN/files_sharing.po16
-rw-r--r--l10n/zh_CN/user_ldap.po4
-rw-r--r--l10n/zh_CN/user_webdavauth.po4
-rw-r--r--l10n/zh_HK/core.po54
-rw-r--r--l10n/zh_HK/files.po30
-rw-r--r--l10n/zh_HK/files_sharing.po16
-rw-r--r--l10n/zh_HK/user_ldap.po4
-rw-r--r--l10n/zh_HK/user_webdavauth.po4
-rw-r--r--l10n/zh_TW/core.po56
-rw-r--r--l10n/zh_TW/files.po30
-rw-r--r--l10n/zh_TW/files_external.po47
-rw-r--r--l10n/zh_TW/files_sharing.po16
-rw-r--r--l10n/zh_TW/user_ldap.po4
-rw-r--r--l10n/zh_TW/user_webdavauth.po4
-rw-r--r--lib/base.php17
-rw-r--r--lib/l10n/ast.php1
-rw-r--r--lib/l10n/eo.php6
-rw-r--r--lib/l10n/et_EE.php5
-rw-r--r--lib/l10n/fr.php1
-rw-r--r--lib/l10n/ja.php1
-rw-r--r--lib/l10n/nl.php1
-rw-r--r--lib/l10n/pt_BR.php12
-rw-r--r--lib/l10n/ru.php12
-rw-r--r--lib/l10n/sk_SK.php1
-rw-r--r--lib/private/app.php13
-rw-r--r--lib/private/backgroundjob/joblist.php4
-rw-r--r--lib/private/backgroundjob/legacy/queuedjob.php4
-rw-r--r--lib/private/backgroundjob/legacy/regularjob.php4
-rw-r--r--lib/private/connector/sabre/objecttree.php5
-rw-r--r--lib/private/files/storage/dav.php (renamed from apps/files_external/lib/webdav.php)6
-rw-r--r--lib/private/files/utils/scanner.php11
-rw-r--r--lib/private/files/view.php2
-rw-r--r--lib/private/helper.php17
-rw-r--r--lib/private/installer.php6
-rw-r--r--lib/private/repair.php18
-rw-r--r--lib/private/route/router.php4
-rw-r--r--lib/private/setup.php8
-rw-r--r--lib/private/share/helper.php22
-rw-r--r--lib/private/share/share.php60
-rwxr-xr-xlib/private/util.php17
-rw-r--r--lib/public/util.php9
-rw-r--r--lib/repair/repairmimetypes.php125
-rw-r--r--remote.php9
-rw-r--r--settings/css/settings.css1
-rw-r--r--settings/js/users/users.js16
-rw-r--r--settings/l10n/ast.php5
-rw-r--r--settings/l10n/cs_CZ.php8
-rw-r--r--settings/l10n/de.php8
-rw-r--r--settings/l10n/el.php6
-rw-r--r--settings/l10n/eo.php24
-rw-r--r--settings/l10n/et_EE.php38
-rw-r--r--settings/l10n/fr.php8
-rw-r--r--settings/l10n/it.php2
-rw-r--r--settings/l10n/ja.php13
-rw-r--r--settings/l10n/nb_NO.php2
-rw-r--r--settings/l10n/nl.php5
-rw-r--r--settings/l10n/pl.php5
-rw-r--r--settings/l10n/pt_BR.php22
-rw-r--r--settings/l10n/ru.php46
-rw-r--r--settings/l10n/sk_SK.php5
-rw-r--r--settings/l10n/sl.php4
-rw-r--r--settings/templates/users/part.grouplist.php4
-rw-r--r--settings/templates/users/part.userlist.php4
-rw-r--r--settings/users.php1
-rw-r--r--tests/enable_all.php1
-rw-r--r--tests/karma.config.js28
-rw-r--r--tests/lib/connector/sabre/objecttree.php4
-rw-r--r--tests/lib/helper.php24
-rw-r--r--tests/lib/repair/repairmimetypes.php207
-rw-r--r--version.php4
796 files changed, 10357 insertions, 7917 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index f6aa4f0c90e..a28b7b76c95 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -7,20 +7,17 @@ OCP\JSON::callCheck();
// Get data
$dir = stripslashes($_POST["dir"]);
-$files = isset($_POST["file"]) ? $_POST["file"] : $_POST["files"];
$allFiles = isset($_POST["allfiles"]) ? $_POST["allfiles"] : false;
-if ($allFiles === 'true') {
- $allFiles = true;
-}
// delete all files in dir ?
-if ($allFiles) {
+if ($allFiles === 'true') {
$files = array();
$fileList = \OC\Files\Filesystem::getDirectoryContent($dir);
foreach ($fileList as $fileInfo) {
$files[] = $fileInfo['name'];
}
} else {
+ $files = isset($_POST["file"]) ? $_POST["file"] : $_POST["files"];
$files = json_decode($files);
}
$filesWithError = '';
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 9750173d110..f9fcfaf13c5 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -26,7 +26,7 @@ if (empty($_POST['dirToken'])) {
// return only read permissions for public upload
$allowedPermissions = OCP\PERMISSION_READ;
- $public_directory = !empty($_POST['subdir']) ? $_POST['subdir'] : '/';
+ $publicDirectory = !empty($_POST['subdir']) ? $_POST['subdir'] : '/';
$linkItem = OCP\Share::getShareByToken($_POST['dirToken']);
if ($linkItem === false) {
@@ -50,13 +50,15 @@ if (empty($_POST['dirToken'])) {
$dir = sprintf(
"/%s/%s",
$path,
- $public_directory
+ $publicDirectory
);
if (!$dir || empty($dir) || $dir === false) {
OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
die();
}
+
+ $dir = rtrim($dir, '/');
}
}
@@ -113,33 +115,33 @@ if ($maxUploadFileSize >= 0 and $totalSize > $maxUploadFileSize) {
}
$result = array();
-$directory = '';
if (strpos($dir, '..') === false) {
$fileCount = count($files['name']);
for ($i = 0; $i < $fileCount; $i++) {
- // Get the files directory
- if(isset($_POST['file_directory']) === true) {
- $directory = '/'.$_POST['file_directory'];
+ // target directory for when uploading folders
+ $relativePath = '';
+ if(!empty($_POST['file_directory'])) {
+ $relativePath = '/'.$_POST['file_directory'];
}
// $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder
if (isset($_POST['resolution']) && $_POST['resolution']==='autorename') {
// append a number in brackets like 'filename (2).ext'
- $target = OCP\Files::buildNotExistingFileName(stripslashes($dir.$directory), $files['name'][$i]);
+ $target = OCP\Files::buildNotExistingFileName(stripslashes($dir . $relativePath), $files['name'][$i]);
} else {
- $target = \OC\Files\Filesystem::normalizePath(stripslashes($dir.$directory).'/'.$files['name'][$i]);
+ $target = \OC\Files\Filesystem::normalizePath(stripslashes($dir . $relativePath).'/'.$files['name'][$i]);
}
-
- if(empty($directory) === true)
- {
- $directory = \OC\Files\Filesystem::normalizePath(stripslashes($dir));
- if (isset($public_directory)) {
- // If we are uploading from the public app,
- // we want to send the relative path in the ajax request.
- $directory = $public_directory;
- }
+
+ // relative dir to return to the client
+ if (isset($publicDirectory)) {
+ // path relative to the public root
+ $returnedDir = $publicDirectory . $relativePath;
+ } else {
+ // full path
+ $returnedDir = $dir . $relativePath;
}
+ $returnedDir = \OC\Files\Filesystem::normalizePath($returnedDir);
if ( ! \OC\Files\Filesystem::file_exists($target)
|| (isset($_POST['resolution']) && $_POST['resolution']==='replace')
@@ -163,7 +165,7 @@ if (strpos($dir, '..') === false) {
$data['uploadMaxFilesize'] = $maxUploadFileSize;
$data['maxHumanFilesize'] = $maxHumanFileSize;
$data['permissions'] = $meta['permissions'] & $allowedPermissions;
- $data['directory'] = $directory;
+ $data['directory'] = $returnedDir;
$result[] = $data;
}
@@ -187,7 +189,7 @@ if (strpos($dir, '..') === false) {
$data['uploadMaxFilesize'] = $maxUploadFileSize;
$data['maxHumanFilesize'] = $maxHumanFileSize;
$data['permissions'] = $meta['permissions'] & $allowedPermissions;
- $data['directory'] = $directory;
+ $data['directory'] = $returnedDir;
$result[] = $data;
}
}
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index a9b8ccbf824..de635e5ce6b 100644
--- a/apps/files/appinfo/update.php
+++ b/apps/files/appinfo/update.php
@@ -6,60 +6,3 @@ if (version_compare(\OCP\Config::getSystemValue('version', '0.0.0'), '7.0.0', '<
\OCP\Config::deleteSystemValue('allowZipDownload');
\OCP\Config::deleteSystemValue('maxZipInputSize');
}
-
-if (version_compare(\OCP\Config::getAppValue('files', 'installed_version'), '1.1.9', '<')) {
-
- // update wrong mimetypes
- $wrongMimetypes = array(
- 'application/mspowerpoint' => 'application/vnd.ms-powerpoint',
- 'application/msexcel' => 'application/vnd.ms-excel',
- );
-
- $stmt = OC_DB::prepare('
- UPDATE `*PREFIX*mimetypes`
- SET `mimetype` = ?
- WHERE `mimetype` = ?
- ');
-
- foreach ($wrongMimetypes as $wrong => $correct) {
- OC_DB::executeAudited($stmt, array($wrong, $correct));
- }
-
- $updatedMimetypes = array(
- 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
- 'xlsx' => 'application/vnd.ms-excel',
- 'pptx' => 'application/vnd.ms-powerpoint',
- );
-
- // separate doc from docx etc
- foreach ($updatedMimetypes as $extension => $mimetype ) {
- $result = OC_DB::executeAudited('
- SELECT count(`mimetype`)
- FROM `*PREFIX*mimetypes`
- WHERE `mimetype` = ?
- ', array($mimetype)
- );
-
- $exists = $result->fetchOne();
-
- if ( ! $exists ) {
- // insert mimetype
- OC_DB::executeAudited('
- INSERT INTO `*PREFIX*mimetypes` ( `mimetype` )
- VALUES ( ? )
- ', array($mimetype)
- );
- }
-
- // change mimetype for files with x extension
- OC_DB::executeAudited('
- UPDATE `*PREFIX*filecache`
- SET `mimetype` = (
- SELECT `id`
- FROM `*PREFIX*mimetypes`
- WHERE `mimetype` = ?
- ) WHERE `name` LIKE ?
- ', array($mimetype, '%.'.$extension)
- );
- }
-} \ No newline at end of file
diff --git a/apps/files/command/scan.php b/apps/files/command/scan.php
index 25ab70af362..3412cf80dea 100644
--- a/apps/files/command/scan.php
+++ b/apps/files/command/scan.php
@@ -9,6 +9,7 @@
namespace OCA\Files\Command;
+use OC\ForbiddenException;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
@@ -32,28 +33,32 @@ class Scan extends Command {
->setName('files:scan')
->setDescription('rescan filesystem')
->addArgument(
- 'user_id',
- InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
- 'will rescan all files of the given user(s)'
- )
+ 'user_id',
+ InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+ 'will rescan all files of the given user(s)'
+ )
->addOption(
- 'all',
- null,
- InputOption::VALUE_NONE,
- 'will rescan all files of all known users'
- )
- ;
+ 'all',
+ null,
+ InputOption::VALUE_NONE,
+ 'will rescan all files of all known users'
+ );
}
protected function scanFiles($user, OutputInterface $output) {
$scanner = new \OC\Files\Utils\Scanner($user);
- $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) use ($output) {
+ $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function ($path) use ($output) {
$output->writeln("Scanning <info>$path</info>");
});
- $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) use ($output) {
+ $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function ($path) use ($output) {
$output->writeln("Scanning <info>$path</info>");
});
- $scanner->scan('');
+ try {
+ $scanner->scan('');
+ } catch (ForbiddenException $e) {
+ $output->writeln("<error>Home storage for user $user not writable</error>");
+ $output->writeln("Make sure you're running the scan command only as the user the web server runs as");
+ }
}
protected function execute(InputInterface $input, OutputInterface $output) {
@@ -63,6 +68,11 @@ class Scan extends Command {
$users = $input->getArgument('user_id');
}
+ if (count($users) === 0) {
+ $output->writeln("<error>Please specify the user id to scan or \"--all\" to scan for all users</error>");
+ return;
+ }
+
foreach ($users as $user) {
if (is_object($user)) {
$user = $user->getUID();
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index e138261b9f2..bf76682f03c 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -140,9 +140,8 @@ table.multiselect th a {
color: #000;
}
table th .columntitle {
- display: inline-block;
+ display: block;
padding: 15px;
- width: 100%;
height: 50px;
box-sizing: border-box;
-moz-box-sizing: border-box;
@@ -150,8 +149,8 @@ table th .columntitle {
}
table th .columntitle.name {
padding-left: 5px;
+ padding-right: 80px;
margin-left: 50px;
- max-width: 300px;
}
/* hover effect on sortable column */
table th a.columntitle:hover {
@@ -165,6 +164,7 @@ table th .sort-indicator {
}
table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; }
table td {
+ padding: 0 15px;
border-bottom: 1px solid #eee;
font-style: normal;
background-position: 8px center;
@@ -180,12 +180,7 @@ table th#headerName {
height: 50px;
}
table th#headerSize, table td.filesize {
- min-width: 48px;
text-align: right;
- padding: 0;
-}
-table table td.filesize {
- padding: 0 16px;
}
table th#headerDate, table td.date,
table th.column-last, table td.column-last {
@@ -227,23 +222,22 @@ table td.filename a.name {
box-sizing: border-box;
display: block;
height: 50px;
- vertical-align: middle;
+ line-height: 50px;
padding: 0;
}
table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
table td.filename input.filename {
width: 80%;
font-size: 14px;
- margin-top: 8px;
+ margin-top: 0;
margin-left: 2px;
cursor: text;
}
table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:3px 8px 8px 3px; }
-table td.filename .nametext, .uploadtext, .modified, .column-last>span:first-child { float:left; padding:14px 0; }
+table td.filename .nametext, .uploadtext, .modified, .column-last>span:first-child { float:left; padding:15px 0; }
.modified, .column-last>span:first-child {
position: relative;
- padding-left: 15px;
overflow: hidden;
text-overflow: ellipsis;
width: 90%;
@@ -257,7 +251,6 @@ table td.filename .nametext, .uploadtext, .modified, .column-last>span:first-chi
/* TODO fix usability bug (accidental file/folder selection) */
table td.filename .nametext {
position: absolute;
- top: 16px;
left: 55px;
padding: 0;
overflow: hidden;
@@ -315,7 +308,7 @@ table td.filename .nametext .innernametext {
/* for smaller resolutions - see mobile.css */
table td.filename .uploadtext { font-weight:normal; margin-left:8px; }
-table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; }
+table td.filename form { font-size:14px; margin-left:46px; height: 40px; padding-top: 10px}
.ie8 input[type="checkbox"]{
padding: 0;
@@ -369,7 +362,9 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; }
#fileList tr td.filename {
- position:relative; width:100%;
+ position: relative;
+ width: 100%;
+ padding-left: 0;
-webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms;
}
@@ -384,7 +379,6 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; }
/* File actions */
.fileactions {
position: absolute;
- top: 14px;
right: 0;
font-size: 11px;
}
@@ -393,39 +387,49 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; }
#fileList a.action.delete {
position: absolute;
right: 0;
- padding: 28px 14px 19px !important;
+ padding: 17px 14px;
}
#fileList .action.action-share-notification span, #fileList a {
cursor: default !important;
}
-a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
+a.action>img {
+ max-height:16px;
+ max-width:16px;
+ vertical-align:text-bottom;
+ margin-bottom: -1px;
+}
/* Actions for selected files */
.selectedActions {
position: absolute;
- top: -1px;
+ top: 0;
right: 0;
- padding: 15px 8px;
}
.selectedActions a {
display: inline;
- padding: 17px 5px;
+ font-size: 11px;
+ line-height: 50px;
+ padding: 18px 5px;
+}
+.selectedActions a.delete-selected {
+ padding-right: 15px;
}
.selectedActions a.hidden {
display: none;
}
.selectedActions a img {
position:relative;
- top:5px;
+ vertical-align: text-bottom;
+ margin-bottom: -1px;
}
#fileList a.action {
display: inline;
- margin: -8px 0;
padding: 18px 8px;
+ line-height: 50px;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
filter: alpha(opacity=0);
opacity: 0;
diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index a0b92ca6949..04a9a3079e8 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -18,6 +18,11 @@ table td.date {
display: none;
}
+/* remove padding to let border bottom fill the whole width*/
+table td {
+ padding: 0;
+}
+
/* remove shift for multiselect bar to account for missing navigation */
table.multiselect thead {
padding-left: 0;
@@ -25,7 +30,7 @@ table.multiselect thead {
/* restrict length of displayed filename to prevent overflow */
table td.filename .nametext {
- max-width: 75% !important;
+ width: 100%;
}
/* always show actions on mobile, not only on hover */
@@ -51,7 +56,7 @@ table td.filename .nametext {
/* ellipsis on file names */
table td.filename .nametext .innernametext {
- max-width: 75%;
+ max-width: 50%;
}
/* proper notification area for multi line messages */
diff --git a/apps/files/js/app.js b/apps/files/js/app.js
index 71802948a5c..45b6b6a0e16 100644
--- a/apps/files/js/app.js
+++ b/apps/files/js/app.js
@@ -32,6 +32,10 @@
// regular actions
fileActions.merge(OCA.Files.fileActions);
+ // in case apps would decide to register file actions later,
+ // replace the global object with this one
+ OCA.Files.fileActions = fileActions;
+
this.files = OCA.Files.Files;
// TODO: ideally these should be in a separate class / app (the embedded "all files" app)
diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js
index c017d710d6d..7381fa8e432 100644
--- a/apps/files/js/breadcrumb.js
+++ b/apps/files/js/breadcrumb.js
@@ -41,8 +41,9 @@
$el: null,
dir: null,
- lastWidth: 0,
- hiddenBreadcrumbs: 0,
+ /**
+ * Total width of all breadcrumbs
+ */
totalWidth: 0,
breadcrumbs: [],
onClick: null,
@@ -116,7 +117,6 @@
}
this._updateTotalWidth();
- this.resize($(window).width(), true);
},
/**
@@ -150,93 +150,93 @@
return crumbs;
},
+ /**
+ * Calculate the total breadcrumb width when
+ * all crumbs are expanded
+ */
_updateTotalWidth: function () {
- var self = this;
-
- this.lastWidth = 0;
-
- // initialize with some extra space
- this.totalWidth = 64;
- // FIXME: this class should not know about global elements
- if ( $('#navigation').length ) {
- this.totalWidth += $('#navigation').outerWidth();
+ this.totalWidth = 0;
+ for (var i = 0; i < this.breadcrumbs.length; i++ ) {
+ var $crumb = $(this.breadcrumbs[i]);
+ $crumb.data('real-width', $crumb.width());
+ this.totalWidth += $crumb.width();
}
+ this._resize();
+ },
- if ( $('#app-navigation').length && !$('#app-navigation').hasClass('hidden')) {
- this.totalWidth += $('#app-navigation').outerWidth();
+ /**
+ * Show/hide breadcrumbs to fit the given width
+ */
+ setMaxWidth: function (availableWidth) {
+ if (this.availableWidth !== availableWidth) {
+ this.availableWidth = availableWidth;
+ this._resize();
}
- this.hiddenBreadcrumbs = 0;
+ },
- for (var i = 0; i < this.breadcrumbs.length; i++ ) {
- this.totalWidth += $(this.breadcrumbs[i]).get(0).offsetWidth;
+ _resize: function() {
+ var i, $crumb, $ellipsisCrumb;
+
+ if (!this.availableWidth) {
+ this.availableWidth = this.$el.width();
}
- $.each($('#controls .actions'), function(index, action) {
- self.totalWidth += $(action).outerWidth();
- });
+ if (this.breadcrumbs.length <= 1) {
+ return;
+ }
- },
+ // reset crumbs
+ this.$el.find('.crumb.ellipsized').remove();
- /**
- * Show/hide breadcrumbs to fit the given width
- */
- resize: function (width, firstRun) {
- var i, $crumb;
+ // unhide all
+ this.$el.find('.crumb.hidden').removeClass('hidden');
- if (width === this.lastWidth) {
+ if (this.totalWidth <= this.availableWidth) {
+ // no need to compute breadcrumbs, there is enough space
return;
}
- // window was shrinked since last time or first run ?
- if ((width < this.lastWidth || firstRun) && width < this.totalWidth) {
- if (this.hiddenBreadcrumbs === 0 && this.breadcrumbs.length > 1) {
- // start by hiding the first breadcrumb after home,
- // that one will have extra three dots displayed
- $crumb = this.breadcrumbs[1];
- this.totalWidth -= $crumb.get(0).offsetWidth;
- $crumb.find('a').addClass('hidden');
- $crumb.append('<span class="ellipsis">...</span>');
- this.totalWidth += $crumb.get(0).offsetWidth;
- this.hiddenBreadcrumbs = 2;
- }
- i = this.hiddenBreadcrumbs;
- // hide subsequent breadcrumbs if the space is still not enough
- while (width < this.totalWidth && i > 1 && i < this.breadcrumbs.length - 1) {
- $crumb = this.breadcrumbs[i];
- this.totalWidth -= $crumb.get(0).offsetWidth;
+ // running width, considering the hidden crumbs
+ var currentTotalWidth = $(this.breadcrumbs[0]).data('real-width');
+ var firstHidden = true;
+
+ // insert ellipsis after root part (root part is always visible)
+ $ellipsisCrumb = $('<div class="crumb ellipsized svg"><span class="ellipsis">...</span></div>');
+ $(this.breadcrumbs[0]).after($ellipsisCrumb);
+ currentTotalWidth += $ellipsisCrumb.width();
+
+ i = this.breadcrumbs.length - 1;
+
+ // find the first section that would cause the overflow
+ // then hide everything in front of that
+ //
+ // this ensures that the last crumb section stays visible
+ // for most of the cases and is always the last one to be
+ // hidden when the screen becomes very narrow
+ while (i > 0) {
+ $crumb = $(this.breadcrumbs[i]);
+ // if the current breadcrumb would cause overflow
+ if (!firstHidden || currentTotalWidth + $crumb.data('real-width') > this.availableWidth) {
+ // hide it
$crumb.addClass('hidden');
- this.hiddenBreadcrumbs = i;
- i++;
- }
- // window is bigger than last time
- } else if (width > this.lastWidth && this.hiddenBreadcrumbs > 0) {
- i = this.hiddenBreadcrumbs;
- while (width > this.totalWidth && i > 0) {
- if (this.hiddenBreadcrumbs === 1) {
- // special handling for last one as it has the three dots
- $crumb = this.breadcrumbs[1];
- if ($crumb) {
- this.totalWidth -= $crumb.get(0).offsetWidth;
- $crumb.find('.ellipsis').remove();
- $crumb.find('a').removeClass('hidden');
- this.totalWidth += $crumb.get(0).offsetWidth;
- }
- } else {
- $crumb = this.breadcrumbs[i];
- $crumb.removeClass('hidden');
- this.totalWidth += $crumb.get(0).offsetWidth;
- if (this.totalWidth > width) {
- this.totalWidth -= $crumb.get(0).offsetWidth;
- $crumb.addClass('hidden');
- break;
- }
+ if (firstHidden) {
+ // set the path of this one as title for the ellipsis
+ this.$el.find('.crumb.ellipsized')
+ .attr('title', $crumb.attr('data-dir'))
+ .tipsy();
}
- i--;
- this.hiddenBreadcrumbs = i;
+ // and all the previous ones (going backwards)
+ firstHidden = false;
+ } else {
+ // add to total width
+ currentTotalWidth += $crumb.data('real-width');
}
+ i--;
}
- this.lastWidth = width;
+ if (!OC.Util.hasSVGSupport()) {
+ OC.Util.replaceSVG(this.$el);
+ }
}
};
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 6b0ca793681..2637d13f9ba 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -179,9 +179,20 @@ OC.Upload = {
callbacks.onNoConflicts(selection);
},
+ _hideProgressBar: function() {
+ $('#uploadprogresswrapper input.stop').fadeOut();
+ $('#uploadprogressbar').fadeOut(function() {
+ $('#file_upload_start').trigger(new $.Event('resized'));
+ });
+ },
+
+ _showProgressBar: function() {
+ $('#uploadprogressbar').fadeIn();
+ $('#file_upload_start').trigger(new $.Event('resized'));
+ },
+
init: function() {
if ( $('#file_upload_start').exists() ) {
-
var file_upload_param = {
dropZone: $('#content'), // restrict dropZone to content div
autoUpload: false,
@@ -346,7 +357,7 @@ OC.Upload = {
// noone set update parameters, we set the minimum
data.formData = {
requesttoken: oc_requesttoken,
- dir: FileList.getCurrentDirectory(),
+ dir: data.targetDir || FileList.getCurrentDirectory(),
file_directory: fileDirectory
};
}
@@ -444,7 +455,7 @@ OC.Upload = {
OC.Upload.log('progress handle fileuploadstart', e, data);
$('#uploadprogresswrapper input.stop').show();
$('#uploadprogressbar').progressbar({value: 0});
- $('#uploadprogressbar').fadeIn();
+ OC.Upload._showProgressBar();
});
fileupload.on('fileuploadprogress', function(e, data) {
OC.Upload.log('progress handle fileuploadprogress', e, data);
@@ -458,15 +469,13 @@ OC.Upload = {
fileupload.on('fileuploadstop', function(e, data) {
OC.Upload.log('progress handle fileuploadstop', e, data);
- $('#uploadprogresswrapper input.stop').fadeOut();
- $('#uploadprogressbar').fadeOut();
+ OC.Upload._hideProgressBar();
});
fileupload.on('fileuploadfail', function(e, data) {
OC.Upload.log('progress handle fileuploadfail', e, data);
//if user pressed cancel hide upload progress bar and cancel button
if (data.errorThrown === 'abort') {
- $('#uploadprogresswrapper input.stop').fadeOut();
- $('#uploadprogressbar').fadeOut();
+ OC.Upload._hideProgressBar();
}
});
@@ -649,7 +658,7 @@ OC.Upload = {
//IE < 10 does not fire the necessary events for the progress bar.
if ($('html.lte9').length === 0) {
$('#uploadprogressbar').progressbar({value: 0});
- $('#uploadprogressbar').fadeIn();
+ OC.Upload._showProgressBar();
}
var eventSource = new OC.EventSource(
@@ -668,12 +677,12 @@ OC.Upload = {
});
eventSource.listen('success', function(data) {
var file = data;
- $('#uploadprogressbar').fadeOut();
+ OC.Upload._hideProgressBar();
FileList.add(file, {hidden: hidden, animate: true});
});
eventSource.listen('error', function(error) {
- $('#uploadprogressbar').fadeOut();
+ OC.Upload._hideProgressBar();
var message = (error && error.message) || t('core', 'Error fetching URL');
OC.Notification.show(message);
//hide notification after 10 sec
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index de02bf5e730..fc7c9ccacef 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -22,9 +22,51 @@
defaults: {},
icons: {},
currentFile: null,
+
+ /**
+ * List of handlers to be notified whenever a register() or
+ * setDefault() was called.
+ */
+ _updateListeners: [],
+
initialize: function() {
this.clear();
},
+
+ /**
+ * Adds an update listener to be notified whenever register()
+ * or setDefault() has been called.
+ *
+ * @param Function callback
+ */
+ addUpdateListener: function(callback) {
+ if (!_.isFunction(callback)) {
+ throw 'Argument passed to FileActions.addUpdateListener must be a function';
+ }
+ this._updateListeners.push(callback);
+ },
+
+ /**
+ * Removes an update listener.
+ *
+ * @param Function callback
+ */
+ removeUpdateListener: function(callback) {
+ if (!_.isFunction(callback)) {
+ throw 'Argument passed to FileActions.removeUpdateListener must be a function';
+ }
+ this._updateListeners = _.without(this._updateListeners, callback);
+ },
+
+ /**
+ * Notifies the registered update listeners
+ */
+ _notifyUpdateListeners: function() {
+ for (var i = 0; i < this._updateListeners.length; i++) {
+ this._updateListeners[i](this);
+ }
+ },
+
/**
* Merges the actions from the given fileActions into
* this instance.
@@ -59,15 +101,18 @@
this.actions[mime][name]['permissions'] = permissions;
this.actions[mime][name]['displayName'] = displayName;
this.icons[name] = icon;
+ this._notifyUpdateListeners();
},
clear: function() {
this.actions = {};
this.defaults = {};
this.icons = {};
this.currentFile = null;
+ this._updateListeners = [];
},
setDefault: function (mime, name) {
this.defaults[mime] = name;
+ this._notifyUpdateListeners();
},
get: function (mime, type, permissions) {
var actions = this.getActions(mime, type, permissions);
@@ -133,6 +178,7 @@
display: function (parent, triggerEvent, fileList) {
if (!fileList) {
console.warn('FileActions.display() MUST be called with a OCA.Files.FileList instance');
+ return;
}
this.currentFile = parent;
var self = this;
@@ -162,7 +208,7 @@
event.data.actionFunc(file, {
$file: $tr,
- fileList: fileList || OCA.Files.App.fileList,
+ fileList: fileList,
fileActions: self,
dir: $tr.attr('data-path') || fileList.getCurrentDirectory()
});
@@ -255,7 +301,7 @@
this.register('all', 'Delete', OC.PERMISSION_DELETE, function () {
return OC.imagePath('core', 'actions/delete');
}, function (filename, context) {
- context.fileList.do_delete(filename);
+ context.fileList.do_delete(filename, context.dir);
$('.tipsy').remove();
});
@@ -307,9 +353,10 @@
window.FileActions, mime, name, permissions, icon, action, displayName
);
};
- window.FileActions.setDefault = function (mime, name) {
- console.warn('FileActions.setDefault() is deprecated, please use OCA.Files.fileActions.setDefault() instead', mime, name);
- OCA.Files.FileActions.prototype.setDefault.call(window.FileActions, mime, name);
+ window.FileActions.display = function (parent, triggerEvent, fileList) {
+ fileList = fileList || OCA.Files.App.fileList;
+ console.warn('FileActions.display() is deprecated, please use OCA.Files.fileActions.register() which automatically redisplays actions', mime, name);
+ OCA.Files.FileActions.prototype.display.call(window.FileActions, parent, triggerEvent, fileList);
};
})();
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 85c5d3f1bb0..dd77b534f51 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -150,11 +150,10 @@
this.$el.find('thead th .columntitle').click(_.bind(this._onClickHeader, this));
- $(window).resize(function() {
- // TODO: debounce this ?
- var width = $(this).width();
- self.breadcrumb.resize(width, false);
- });
+ this._onResize = _.debounce(_.bind(this._onResize, this), 100);
+ $(window).resize(this._onResize);
+
+ this.$el.on('show', this._onResize);
this.$fileList.on('click','td.filename>a.name', _.bind(this._onClickFile, this));
this.$fileList.on('change', 'td.filename>input:checkbox', _.bind(this._onClickFileCheckbox, this));
@@ -168,12 +167,38 @@
this.$container.on('scroll', _.bind(this._onScroll, this));
},
+ /**
+ * Destroy / uninitialize this instance.
+ */
+ destroy: function() {
+ // TODO: also unregister other event handlers
+ this.fileActions.removeUpdateListener(this._onFileActionsUpdated);
+ },
+
_initFileActions: function(fileActions) {
this.fileActions = fileActions;
if (!this.fileActions) {
this.fileActions = new OCA.Files.FileActions();
this.fileActions.registerDefaultActions();
}
+ this._onFileActionsUpdated = _.debounce(_.bind(this._onFileActionsUpdated, this), 100);
+ this.fileActions.addUpdateListener(this._onFileActionsUpdated);
+ },
+
+ /**
+ * Event handler for when the window size changed
+ */
+ _onResize: function() {
+ var containerWidth = this.$el.width();
+ var actionsWidth = 0;
+ $.each(this.$el.find('#controls .actions'), function(index, action) {
+ actionsWidth += $(action).outerWidth();
+ });
+
+ // substract app navigation toggle when visible
+ containerWidth -= $('#app-navigation-toggle').width();
+
+ this.breadcrumb.setMaxWidth(containerWidth - actionsWidth - 10);
},
/**
@@ -488,6 +513,18 @@
},
/**
+ * Event handler for when file actions were updated.
+ * This will refresh the file actions on the list.
+ */
+ _onFileActionsUpdated: function() {
+ console.log('onFileActionsUpdated');
+ var self = this;
+ this.$fileList.find('tr td.filename').each(function() {
+ self.fileActions.display($(this), true, self);
+ });
+ },
+
+ /**
* Sets the files to be displayed in the list.
* This operation will re-render the list and update the summary.
* @param filesArray array of file data (map)
@@ -512,6 +549,8 @@
this.fileSummary.calculate(filesArray);
+ this._selectedFiles = {};
+ this._selectionSummary.clear();
this.updateSelectionSummary();
$(window).scrollTop(0);
@@ -1193,9 +1232,20 @@
return true;
};
+ function restore() {
+ input.tipsy('hide');
+ tr.data('renaming',false);
+ form.remove();
+ td.children('a.name').show();
+ }
+
form.submit(function(event) {
event.stopPropagation();
event.preventDefault();
+ if (input.hasClass('error')) {
+ return;
+ }
+
try {
var newName = input.val();
input.tipsy('hide');
@@ -1217,7 +1267,7 @@
$.ajax({
url: OC.filePath('files','ajax','rename.php'),
data: {
- dir : self.getCurrentDirectory(),
+ dir : tr.attr('data-path') || self.getCurrentDirectory(),
newname: newName,
file: oldname
},
@@ -1265,10 +1315,7 @@
input.addClass('error');
}
if (event.keyCode === 27) {
- input.tipsy('hide');
- tr.data('renaming',false);
- form.remove();
- td.children('a.name').show();
+ restore();
}
});
input.click(function(event) {
@@ -1528,6 +1575,9 @@
// handle upload events
var fileUploadStart = this.$el.find('#file_upload_start');
+ // detect the progress bar resize
+ fileUploadStart.on('resized', this._onResize);
+
fileUploadStart.on('fileuploaddrop', function(e, data) {
OC.Upload.log('filelist handle fileuploaddrop', e, data);
@@ -1561,17 +1611,12 @@
dir = dropTarget.data('dir') || '/';
}
- // update folder in form
- data.formData = function() {
- return [
- {name: 'dir', value: dir},
- {name: 'requesttoken', value: oc_requesttoken},
- {name: 'file_directory', value: data.files[0].relativePath}
- ];
- };
+ // add target dir
+ data.targetDir = dir;
} else {
// we are dropping somewhere inside the file list, which will
// upload the file to the current directory
+ data.targetDir = self.getCurrentDirectory();
// cancel uploads to current dir if no permission
var isCreatable = (self.getDirectoryPermissions() & OC.PERMISSION_CREATE) !== 0;
@@ -1654,15 +1699,34 @@
data.context.find('td.filesize').text(humanFileSize(size));
} else {
// only append new file if uploaded into the current folder
- if (file.directory !== '/' && file.directory !== self.getCurrentDirectory()) {
+ if (file.directory !== self.getCurrentDirectory()) {
+ // Uploading folders actually uploads a list of files
+ // for which the target directory (file.directory) might lie deeper
+ // than the current directory
+
+ var fileDirectory = file.directory.replace('/','').replace(/\/$/, "");
+ var currentDirectory = self.getCurrentDirectory().replace('/','').replace(/\/$/, "") + '/';
+
+ if (currentDirectory !== '/') {
+ // abort if fileDirectory does not start with current one
+ if (fileDirectory.indexOf(currentDirectory) !== 0) {
+ return;
+ }
- var fileDirectory = file.directory.replace('/','').replace(/\/$/, "").split('/');
+ // remove the current directory part
+ fileDirectory = fileDirectory.substr(currentDirectory.length);
+ }
- if (fileDirectory.length === 1) {
+ // only take the first section of the path
+ fileDirectory = fileDirectory.split('/');
+
+ var fd;
+ // if the first section exists / is a subdir
+ if (fileDirectory.length) {
fileDirectory = fileDirectory[0];
- // Get the directory
- var fd = self.findFileEl(fileDirectory);
+ // See whether it is already in the list
+ fd = self.findFileEl(fileDirectory);
if (fd.length === 0) {
var dir = {
name: fileDirectory,
@@ -1672,19 +1736,15 @@
size: 0,
id: file.parentId
};
- self.add(dir, {insert: true});
+ fd = self.add(dir, {insert: true});
}
- } else {
- fileDirectory = fileDirectory[0];
- }
- fileDirectory = self.findFileEl(fileDirectory);
-
- // update folder size
- size = parseInt(fileDirectory.attr('data-size'), 10);
- size += parseInt(file.size, 10);
- fileDirectory.attr('data-size', size);
- fileDirectory.find('td.filesize').text(humanFileSize(size));
+ // update folder size
+ size = parseInt(fd.attr('data-size'), 10);
+ size += parseInt(file.size, 10);
+ fd.attr('data-size', size);
+ fd.find('td.filesize').text(OC.Util.humanFileSize(size));
+ }
return;
}
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 45c9ca78aad..26e2cd6f29c 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -51,6 +51,7 @@ $TRANSLATIONS = array(
"Your storage is almost full ({usedSpacePercent}%)" => "Via memoro preskaŭ plenas ({usedSpacePercent}%)",
"{dirs} and {files}" => "{dirs} kaj {files}",
"%s could not be renamed" => "%s ne povis alinomiĝi",
+"Upload (max. %s)" => "Alŝuti (maks. %s)",
"File handling" => "Dosieradministro",
"Maximum upload size" => "Maksimuma alŝutogrando",
"max. possible: " => "maks. ebla: ",
diff --git a/apps/files/l10n/ml_IN.php b/apps/files/l10n/ml_IN.php
index 0157af093e9..9cf8ea034ab 100644
--- a/apps/files/l10n/ml_IN.php
+++ b/apps/files/l10n/ml_IN.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Files" => "ഫയലുകൾ",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 2ac5a549607..0d80729f8df 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
"Upload failed. Could not get file info." => "Încărcare eșuată. Nu se pot obține informații despre fișier.",
"Invalid directory." => "Dosar nevalid.",
"Files" => "Fișiere",
+"All files" => "Toate fișierele.",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți",
"Total file size {size1} exceeds upload limit {size2}" => "Mărimea fișierului este {size1} ce depășește limita de incarcare de {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Spațiu liber insuficient, încărcați {size1} însă doar {size2} disponibil rămas",
@@ -83,6 +84,7 @@ $TRANSLATIONS = array(
"Download" => "Descarcă",
"Upload too large" => "Fișierul încărcat este prea mare",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server.",
-"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteaptă."
+"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteaptă.",
+"Currently scanning" => "Acum scaneaza"
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index f63c4419302..ea47eba921f 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -53,7 +53,7 @@ $TRANSLATIONS = array(
"Error deleting file." => "Ошибка при удалении файла.",
"Name" => "Имя",
"Size" => "Размер",
-"Modified" => "Дата изменения",
+"Modified" => "Изменён",
"_%n folder_::_%n folders_" => array("%n каталог","%n каталога","%n каталогов"),
"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"),
"_Uploading %n file_::_Uploading %n files_" => array("Закачка %n файла","Закачка %n файлов","Закачка %n файлов"),
@@ -65,7 +65,7 @@ $TRANSLATIONS = array(
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Шифрование было отключено, но ваши файлы остались зашифрованными. Зайдите на страницу личных настроек для того, чтобы расшифровать их.",
"{dirs} and {files}" => "{dirs} и {files}",
"%s could not be renamed" => "%s не может быть переименован",
-"Upload (max. %s)" => "Загружено (max. %s)",
+"Upload (max. %s)" => "Загрузка (Максимум: %s)",
"File handling" => "Управление файлами",
"Maximum upload size" => "Максимальный размер загружаемого файла",
"max. possible: " => "макс. возможно: ",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index c155e79c211..a0238646b28 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -71,7 +71,7 @@ $TRANSLATIONS = array(
"max. possible: " => "največ mogoče:",
"Save" => "Shrani",
"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>.",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek peko sistema WebDAV</a>.",
"New" => "Novo",
"New text file" => "Nova besedilna datoteka",
"Text file" => "Besedilna datoteka",
@@ -85,6 +85,6 @@ $TRANSLATIONS = array(
"Upload too large" => "Prekoračenje omejitve velikosti",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.",
"Files are being scanned, please wait." => "Poteka preučevanje datotek, počakajte ...",
-"Currently scanning" => "Trenutno preverjam"
+"Currently scanning" => "Poteka preverjanje"
);
$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 740c4f5c0cc..5a098561d65 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -3,8 +3,15 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Не вдалося перемістити %s - Файл з таким ім'ям вже існує",
"Could not move %s" => "Не вдалося перемістити %s",
"File name cannot be empty." => " Ім'я файлу не може бути порожнім.",
+"\"%s\" is an invalid file name." => "\"%s\" - це некоректне ім'я файлу.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.",
+"The target folder has been moved or deleted." => "Теку призначення було переміщено або видалено.",
+"The name %s is already used in the folder %s. Please choose a different name." => "Файл з ім'ям %s вже є у теці %s. Оберіть інше ім'я.",
+"Server is not allowed to open URLs, please check the server configuration" => "Серверу заборонено відкривати посилання, перевірте конфігурацію",
+"Error while downloading %s to %s" => "Помилка завантаження %s до %s",
+"Error when creating the file" => "Помилка створення файлу",
"Folder name cannot be empty." => "Ім'я теки не може бути порожнім.",
+"Error when creating the folder" => "Помилка створення теки",
"Unable to set upload directory." => "Не вдалося встановити каталог завантаження.",
"No file was uploaded. Unknown error" => "Не завантажено жодного файлу. Невідома помилка",
"There is no error, the file uploaded with success" => "Файл успішно вивантажено без помилок.",
@@ -15,47 +22,66 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Відсутній тимчасовий каталог",
"Failed to write to disk" => "Невдалося записати на диск",
"Not enough storage available" => "Місця більше немає",
+"Upload failed. Could not find uploaded file" => "Завантаження не вдалося. Неможливо знайти завантажений файл.",
+"Upload failed. Could not get file info." => "Завантаження не вдалося. Неможливо отримати інформацію про файл.",
"Invalid directory." => "Невірний каталог.",
"Files" => "Файли",
+"All files" => "Усі файли",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Неможливо завантажити {filename}, оскільки це каталог або має нульовий розмір.",
+"Total file size {size1} exceeds upload limit {size2}" => "Розмір файлу {size1} перевищує обмеження {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Недостатньо вільного місця, ви завантажуєте {size1}, а залишилося лише {size2}",
"Upload cancelled." => "Завантаження перервано.",
+"Could not get result from server." => "Не вдалося отримати результат від сервера.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження.",
"URL cannot be empty" => "URL не може бути порожнім",
"{new_name} already exists" => "{new_name} вже існує",
"Could not create file" => "Не вдалося створити файл",
"Could not create folder" => "Не вдалося створити теку",
+"Error fetching URL" => "Помилка отримання URL",
"Share" => "Поділитися",
"Delete permanently" => "Видалити назавжди",
"Delete" => "Видалити",
"Rename" => "Перейменувати",
"Your download is being prepared. This might take some time if the files are big." => "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі.",
"Pending" => "Очікування",
+"Error moving file." => "Помилка переміщення файлу.",
"Error moving file" => "Помилка переміщення файлу",
"Error" => "Помилка",
"Could not rename file" => "Неможливо перейменувати файл",
+"Error deleting file." => "Помилка видалення файлу.",
"Name" => "Ім'я",
"Size" => "Розмір",
"Modified" => "Змінено",
"_%n folder_::_%n folders_" => array("%n тека","%n тека","%n теки"),
"_%n file_::_%n files_" => array("%n файл","%n файлів","%n файли"),
-"_Uploading %n file_::_Uploading %n files_" => array("","",""),
+"_Uploading %n file_::_Uploading %n files_" => array("Завантаження %n файлу","Завантаження %n файлів","Завантаження %n файлів"),
+"\"{name}\" is an invalid file name." => "\"{name}\" - некоректне ім'я файлу.",
"Your storage is full, files can not be updated or synced anymore!" => "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !",
"Your storage is almost full ({usedSpacePercent}%)" => "Ваше сховище майже повне ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Шифрування було вимкнено, але ваші файли все ще зашифровано. Для розшифрування перейдіть до персональних налаштувань.",
"%s could not be renamed" => "%s не може бути перейменований",
+"Upload (max. %s)" => "Завантаження (макс. %s)",
"File handling" => "Робота з файлами",
"Maximum upload size" => "Максимальний розмір відвантажень",
"max. possible: " => "макс.можливе:",
"Save" => "Зберегти",
"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Для доступу до файлів через WebDAV використовуйте <a href=\"%s\" target=\"_blank\">це посилання</a>",
"New" => "Створити",
+"New text file" => "Новий текстовий файл",
"Text file" => "Текстовий файл",
"New folder" => "Нова тека",
"Folder" => "Тека",
"From link" => "З посилання",
"Cancel upload" => "Перервати завантаження",
+"You don’t have permission to upload or create files here" => "У вас недостатньо прав для завантаження або створення файлів тут",
"Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
"Download" => "Завантажити",
"Upload too large" => "Файл занадто великий",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
-"Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка."
+"Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка.",
+"Currently scanning" => "Триває перевірка"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/tests/js/breadcrumbSpec.js b/apps/files/tests/js/breadcrumbSpec.js
index e3d9c757a7c..30784fd70ad 100644
--- a/apps/files/tests/js/breadcrumbSpec.js
+++ b/apps/files/tests/js/breadcrumbSpec.js
@@ -19,7 +19,6 @@
*
*/
-/* global BreadCrumb */
describe('OCA.Files.BreadCrumb tests', function() {
var BreadCrumb = OCA.Files.BreadCrumb;
@@ -131,48 +130,42 @@ describe('OCA.Files.BreadCrumb tests', function() {
});
});
describe('Resizing', function() {
- var bc, widthStub, dummyDir,
- oldUpdateTotalWidth;
+ var bc, dummyDir, widths, oldUpdateTotalWidth;
beforeEach(function() {
- dummyDir = '/short name/longer name/looooooooooooonger/even longer long long long longer long/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/last one';
+ dummyDir = '/short name/longer name/looooooooooooonger/' +
+ 'even longer long long long longer long/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/last one';
+
+ // using hard-coded widths (pre-measured) to avoid getting different
+ // results on different browsers due to font engine differences
+ widths = [41, 106, 112, 160, 257, 251, 91];
oldUpdateTotalWidth = BreadCrumb.prototype._updateTotalWidth;
BreadCrumb.prototype._updateTotalWidth = function() {
- // need to set display:block for correct offsetWidth (no CSS loaded here)
- $('div.crumb').css({
- 'display': 'block',
- 'float': 'left'
+ // pre-set a width to simulate consistent measurement
+ $('div.crumb').each(function(index){
+ $(this).css('width', widths[index]);
});
return oldUpdateTotalWidth.apply(this, arguments);
};
bc = new BreadCrumb();
- widthStub = sinon.stub($.fn, 'width');
// append dummy navigation and controls
// as they are currently used for measurements
$('#testArea').append(
- '<div id="navigation" style="width: 80px"></div>',
'<div id="controls"></div>'
);
-
- // make sure we know the test screen width
- $('#testArea').css('width', 1280);
-
- // use test area as we need it for measurements
$('#controls').append(bc.$el);
- $('#controls').append('<div class="actions"><div>Dummy action with a given width</div></div>');
});
afterEach(function() {
BreadCrumb.prototype._updateTotalWidth = oldUpdateTotalWidth;
- widthStub.restore();
bc = null;
});
- it('Hides breadcrumbs to fit window', function() {
+ it('Hides breadcrumbs to fit max allowed width', function() {
var $crumbs;
- widthStub.returns(500);
+ bc.setMaxWidth(500);
// triggers resize implicitly
bc.setDirectory(dummyDir);
$crumbs = bc.$el.find('.crumb');
@@ -190,19 +183,23 @@ describe('OCA.Files.BreadCrumb tests', function() {
expect($crumbs.eq(4).hasClass('hidden')).toEqual(true);
expect($crumbs.eq(5).hasClass('hidden')).toEqual(true);
expect($crumbs.eq(6).hasClass('hidden')).toEqual(false);
+ expect($crumbs.eq(7).hasClass('hidden')).toEqual(false);
});
- it('Updates ellipsis on window size increase', function() {
+ it('Updates the breadcrumbs when reducing max allowed width', function() {
var $crumbs;
- widthStub.returns(500);
+ // enough space
+ bc.setMaxWidth(1800);
+
+ expect(bc.$el.find('.ellipsis').length).toEqual(0);
+
// triggers resize implicitly
bc.setDirectory(dummyDir);
- $crumbs = bc.$el.find('.crumb');
// simulate increase
- $('#testArea').css('width', 1800);
- bc.resize(1800);
+ bc.setMaxWidth(950);
+ $crumbs = bc.$el.find('.crumb');
// first one is always visible
expect($crumbs.eq(0).hasClass('hidden')).toEqual(false);
// second one has ellipsis
@@ -213,37 +210,35 @@ describe('OCA.Files.BreadCrumb tests', function() {
// subsequent elements are hidden
expect($crumbs.eq(2).hasClass('hidden')).toEqual(true);
expect($crumbs.eq(3).hasClass('hidden')).toEqual(true);
- expect($crumbs.eq(4).hasClass('hidden')).toEqual(true);
// the rest is visible
+ expect($crumbs.eq(4).hasClass('hidden')).toEqual(false);
expect($crumbs.eq(5).hasClass('hidden')).toEqual(false);
expect($crumbs.eq(6).hasClass('hidden')).toEqual(false);
});
- it('Updates ellipsis on window size decrease', function() {
+ it('Removes the ellipsis when there is enough space', function() {
var $crumbs;
- $('#testArea').css('width', 2000);
- widthStub.returns(2000);
+ bc.setMaxWidth(500);
// triggers resize implicitly
bc.setDirectory(dummyDir);
$crumbs = bc.$el.find('.crumb');
- // simulate decrease
- bc.resize(500);
- $('#testArea').css('width', 500);
+ // ellipsis
+ expect(bc.$el.find('.ellipsis').length).toEqual(1);
- // first one is always visible
+ // simulate increase
+ bc.setMaxWidth(1800);
+
+ // no ellipsis
+ expect(bc.$el.find('.ellipsis').length).toEqual(0);
+
+ // all are visible
expect($crumbs.eq(0).hasClass('hidden')).toEqual(false);
- // second one has ellipsis
expect($crumbs.eq(1).hasClass('hidden')).toEqual(false);
- expect($crumbs.eq(1).find('.ellipsis').length).toEqual(1);
- // there is only one ellipsis in total
- expect($crumbs.find('.ellipsis').length).toEqual(1);
- // subsequent elements are hidden
- expect($crumbs.eq(2).hasClass('hidden')).toEqual(true);
- expect($crumbs.eq(3).hasClass('hidden')).toEqual(true);
- expect($crumbs.eq(4).hasClass('hidden')).toEqual(true);
- // the rest is visible
- expect($crumbs.eq(5).hasClass('hidden')).toEqual(true);
+ expect($crumbs.eq(2).hasClass('hidden')).toEqual(false);
+ expect($crumbs.eq(3).hasClass('hidden')).toEqual(false);
+ expect($crumbs.eq(4).hasClass('hidden')).toEqual(false);
+ expect($crumbs.eq(5).hasClass('hidden')).toEqual(false);
expect($crumbs.eq(6).hasClass('hidden')).toEqual(false);
});
});
diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js
index 490594a1773..f464800730a 100644
--- a/apps/files/tests/js/fileactionsSpec.js
+++ b/apps/files/tests/js/fileactionsSpec.js
@@ -21,7 +21,7 @@
describe('OCA.Files.FileActions tests', function() {
var $filesTable, fileList;
- var FileActions;
+ var FileActions;
beforeEach(function() {
// init horrible parameters
@@ -36,6 +36,7 @@ describe('OCA.Files.FileActions tests', function() {
});
afterEach(function() {
FileActions = null;
+ fileList.destroy();
fileList = undefined;
$('#dir, #permissions, #filestable').remove();
});
@@ -140,6 +141,7 @@ describe('OCA.Files.FileActions tests', function() {
id: 18,
type: 'file',
name: 'testName.txt',
+ path: '/somepath/dir',
mimetype: 'text/plain',
size: '1234',
etag: 'a01234c',
@@ -151,6 +153,8 @@ describe('OCA.Files.FileActions tests', function() {
$tr.find('.action.delete').click();
expect(deleteStub.calledOnce).toEqual(true);
+ expect(deleteStub.getCall(0).args[0]).toEqual('testName.txt');
+ expect(deleteStub.getCall(0).args[1]).toEqual('/somepath/dir');
deleteStub.restore();
});
it('passes context to action handler', function() {
@@ -189,4 +193,54 @@ describe('OCA.Files.FileActions tests', function() {
context = actionStub.getCall(0).args[1];
expect(context.dir).toEqual('/somepath');
});
+ describe('events', function() {
+ var clock;
+ beforeEach(function() {
+ clock = sinon.useFakeTimers();
+ });
+ afterEach(function() {
+ clock.restore();
+ });
+ it('notifies update event handlers once after multiple changes', function() {
+ var actionStub = sinon.stub();
+ var handler = sinon.stub();
+ FileActions.addUpdateListener(handler);
+ FileActions.register(
+ 'all',
+ 'Test',
+ OC.PERMISSION_READ,
+ OC.imagePath('core', 'actions/test'),
+ actionStub
+ );
+ FileActions.register(
+ 'all',
+ 'Test2',
+ OC.PERMISSION_READ,
+ OC.imagePath('core', 'actions/test'),
+ actionStub
+ );
+ expect(handler.calledTwice).toEqual(true);
+ });
+ it('does not notifies update event handlers after unregistering', function() {
+ var actionStub = sinon.stub();
+ var handler = sinon.stub();
+ FileActions.addUpdateListener(handler);
+ FileActions.removeUpdateListener(handler);
+ FileActions.register(
+ 'all',
+ 'Test',
+ OC.PERMISSION_READ,
+ OC.imagePath('core', 'actions/test'),
+ actionStub
+ );
+ FileActions.register(
+ 'all',
+ 'Test2',
+ OC.PERMISSION_READ,
+ OC.imagePath('core', 'actions/test'),
+ actionStub
+ );
+ expect(handler.notCalled).toEqual(true);
+ });
+ });
});
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 7d3bc946dd3..a699177767a 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -21,6 +21,7 @@
describe('OCA.Files.FileList tests', function() {
var testFiles, alertStub, notificationStub, fileList;
+ var bcResizeStub;
/**
* Generate test file data
@@ -52,6 +53,9 @@ describe('OCA.Files.FileList tests', function() {
beforeEach(function() {
alertStub = sinon.stub(OC.dialogs, 'alert');
notificationStub = sinon.stub(OC.Notification, 'show');
+ // prevent resize algo to mess up breadcrumb order while
+ // testing
+ bcResizeStub = sinon.stub(OCA.Files.BreadCrumb.prototype, '_resize');
// init parameters and test table elements
$('#testArea').append(
@@ -125,6 +129,7 @@ describe('OCA.Files.FileList tests', function() {
notificationStub.restore();
alertStub.restore();
+ bcResizeStub.restore();
});
describe('Getters', function() {
it('Returns the current directory', function() {
@@ -485,7 +490,9 @@ describe('OCA.Files.FileList tests', function() {
var $input, request;
for (var i = 0; i < testFiles.length; i++) {
- fileList.add(testFiles[i], {silent: true});
+ var file = testFiles[i];
+ file.path = '/some/subdir';
+ fileList.add(file, {silent: true});
}
// trigger rename prompt
@@ -498,7 +505,7 @@ describe('OCA.Files.FileList tests', function() {
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
expect(request.url.substr(0, request.url.indexOf('?'))).toEqual(OC.webroot + '/index.php/apps/files/ajax/rename.php');
- expect(OC.parseQueryString(request.url)).toEqual({'dir': '/subdir', newname: 'Tu_after_three.txt', file: 'One.txt'});
+ expect(OC.parseQueryString(request.url)).toEqual({'dir': '/some/subdir', newname: 'Tu_after_three.txt', file: 'One.txt'});
}
it('Inserts renamed file entry at correct position if rename ajax call suceeded', function() {
doRename();
@@ -595,6 +602,47 @@ describe('OCA.Files.FileList tests', function() {
expect(fileList.$fileList.find('input.filename').length).toEqual(0);
expect(fileList.$fileList.find('form').length).toEqual(0);
});
+ it('Validates the file name', function() {
+ var $input, $tr;
+
+ for (var i = 0; i < testFiles.length; i++) {
+ fileList.add(testFiles[i], {silent: true});
+ }
+
+ // trigger rename prompt
+ fileList.rename('One.txt');
+ $input = fileList.$fileList.find('input.filename');
+ $input.val('Two.jpg');
+
+ // simulate key to trigger validation
+ $input.trigger(new $.Event('keyup', {keyCode: 97}));
+
+ // input is still there with error
+ expect(fileList.$fileList.find('input.filename').length).toEqual(1);
+ expect(fileList.$fileList.find('input.filename').hasClass('error')).toEqual(true);
+
+ // trigger submit does not send server request
+ $input.closest('form').trigger('submit');
+ expect(fakeServer.requests.length).toEqual(0);
+
+ // simulate escape key
+ $input.trigger(new $.Event('keyup', {keyCode: 27}));
+
+ // element is added back with the correct name
+ $tr = fileList.findFileEl('One.txt');
+ expect($tr.length).toEqual(1);
+ expect($tr.find('a .nametext').text().trim()).toEqual('One.txt');
+ expect($tr.find('a.name').is(':visible')).toEqual(true);
+
+ $tr = fileList.findFileEl('Two.jpg');
+ expect($tr.length).toEqual(1);
+ expect($tr.find('a .nametext').text().trim()).toEqual('Two.jpg');
+ expect($tr.find('a.name').is(':visible')).toEqual(true);
+
+ // input and form are gone
+ expect(fileList.$fileList.find('input.filename').length).toEqual(0);
+ expect(fileList.$fileList.find('form').length).toEqual(0);
+ });
});
describe('Moving files', function() {
beforeEach(function() {
@@ -1368,7 +1416,8 @@ describe('OCA.Files.FileList tests', function() {
"Content-Type": "application/json"
},
JSON.stringify(data)
- ]);
+ ]
+ );
fileList.changeDirectory('/');
fakeServer.respond();
expect($('.select-all').prop('checked')).toEqual(false);
@@ -1386,6 +1435,37 @@ describe('OCA.Files.FileList tests', function() {
expect(selectedFiles.length).toEqual(41);
});
+ describe('clearing the selection', function() {
+ it('clears selected files selected individually calling setFiles()', function() {
+ var selectedFiles;
+
+ fileList.setFiles(generateFiles(0, 41));
+ fileList.$fileList.find('tr:eq(5) input:checkbox:first').click();
+ fileList.$fileList.find('tr:eq(7) input:checkbox:first').click();
+
+ selectedFiles = _.pluck(fileList.getSelectedFiles(), 'name');
+ expect(selectedFiles.length).toEqual(2);
+
+ fileList.setFiles(generateFiles(0, 2));
+
+ selectedFiles = _.pluck(fileList.getSelectedFiles(), 'name');
+ expect(selectedFiles.length).toEqual(0);
+ });
+ it('clears selected files selected with select all when calling setFiles()', function() {
+ var selectedFiles;
+
+ fileList.setFiles(generateFiles(0, 41));
+ $('.select-all').click();
+
+ selectedFiles = _.pluck(fileList.getSelectedFiles(), 'name');
+ expect(selectedFiles.length).toEqual(42);
+
+ fileList.setFiles(generateFiles(0, 2));
+
+ selectedFiles = _.pluck(fileList.getSelectedFiles(), 'name');
+ expect(selectedFiles.length).toEqual(0);
+ });
+ });
describe('Selection overlay', function() {
it('show delete action according to directory permissions', function() {
fileList.setFiles(testFiles);
@@ -1548,6 +1628,38 @@ describe('OCA.Files.FileList tests', function() {
expect(context.fileActions).toBeDefined();
expect(context.dir).toEqual('/subdir');
});
+ it('redisplays actions when new actions have been registered', function() {
+ var actionStub = sinon.stub();
+ var clock = sinon.useFakeTimers();
+ var debounceStub = sinon.stub(_, 'debounce', function(callback) {
+ return function() {
+ // defer instead of debounce, to make it work with clock
+ _.defer(callback);
+ };
+ });
+ // need to reinit the list to make the debounce call
+ fileList.destroy();
+ fileList = new OCA.Files.FileList($('#app-content-files'));
+
+ fileList.setFiles(testFiles);
+ fileList.fileActions.register(
+ 'text/plain',
+ 'Test',
+ OC.PERMISSION_ALL,
+ function() {
+ // Specify icon for hitory button
+ return OC.imagePath('core','actions/history');
+ },
+ actionStub
+ );
+ var $tr = fileList.findFileEl('One.txt');
+ expect($tr.find('.action-test').length).toEqual(0);
+ // update is delayed
+ clock.tick(100);
+ expect($tr.find('.action-test').length).toEqual(1);
+ clock.restore();
+ debounceStub.restore();
+ });
});
describe('Sorting files', function() {
it('Sorts by name by default', function() {
@@ -1730,20 +1842,6 @@ describe('OCA.Files.FileList tests', function() {
return ev;
}
- /**
- * Convert form data to a flat list
- *
- * @param formData form data array as used by jquery.upload
- * @return map based on the array's key values
- */
- function decodeFormData(data) {
- var map = {};
- _.each(data.formData(), function(entry) {
- map[entry.name] = entry.value;
- });
- return map;
- }
-
beforeEach(function() {
// simulate data structure from jquery.upload
uploadData = {
@@ -1803,11 +1901,7 @@ describe('OCA.Files.FileList tests', function() {
ev = dropOn(fileList.findFileEl('somedir').find('td:eq(2)'), uploadData);
expect(ev.result).not.toEqual(false);
- expect(uploadData.formData).toBeDefined();
- formData = decodeFormData(uploadData);
- expect(formData.dir).toEqual('/subdir/somedir');
- expect(formData.file_directory).toEqual('fileToUpload.txt');
- expect(formData.requesttoken).toBeDefined();
+ expect(uploadData.targetDir).toEqual('/subdir/somedir');
});
it('drop on a breadcrumb inside the table triggers upload to target folder', function() {
var ev, formData;
@@ -1815,11 +1909,7 @@ describe('OCA.Files.FileList tests', function() {
ev = dropOn(fileList.$el.find('.crumb:eq(2)'), uploadData);
expect(ev.result).not.toEqual(false);
- expect(uploadData.formData).toBeDefined();
- formData = decodeFormData(uploadData);
- expect(formData.dir).toEqual('/a/b');
- expect(formData.file_directory).toEqual('fileToUpload.txt');
- expect(formData.requesttoken).toBeDefined();
+ expect(uploadData.targetDir).toEqual('/a/b');
});
});
});
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 6f739947b0c..3625d5a09f3 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -406,7 +406,6 @@ class Hooks {
// otherwise we perform a stream copy, so we get a new set of keys
$mp1 = $view->getMountPoint('/' . $user . '/files/' . $params['oldpath']);
$mp2 = $view->getMountPoint('/' . $user . '/files/' . $params['newpath']);
- list($storage1, ) = Filesystem::resolvePath($params['oldpath']);
if ($mp1 === $mp2) {
self::$renamedFiles[$params['oldpath']] = array(
@@ -465,61 +464,44 @@ class Hooks {
$newShareKeyPath = $ownerNew . '/files_encryption/share-keys/' . $pathNew;
}
- // add key ext if this is not an folder
+ // create new key folders if it doesn't exists
+ if (!$view->file_exists(dirname($newShareKeyPath))) {
+ $view->mkdir(dirname($newShareKeyPath));
+ }
+ if (!$view->file_exists(dirname($newKeyfilePath))) {
+ $view->mkdir(dirname($newKeyfilePath));
+ }
+
+ // handle share keys
if (!$view->is_dir($oldKeyfilePath)) {
$oldKeyfilePath .= '.key';
$newKeyfilePath .= '.key';
// handle share-keys
- $localKeyPath = $view->getLocalFile($oldShareKeyPath);
- $escapedPath = Helper::escapeGlobPattern($localKeyPath);
- $matches = glob($escapedPath . '*.shareKey');
+ $matches = Helper::findShareKeys($oldShareKeyPath, $view);
foreach ($matches as $src) {
$dst = \OC\Files\Filesystem::normalizePath(str_replace($pathOld, $pathNew, $src));
-
- // create destination folder if not exists
- if (!file_exists(dirname($dst))) {
- mkdir(dirname($dst), 0750, true);
- }
-
- rename($src, $dst);
+ $view->rename($src, $dst);
}
} else {
// handle share-keys folders
-
- // create destination folder if not exists
- if (!$view->file_exists(dirname($newShareKeyPath))) {
- mkdir($view->getLocalFile($newShareKeyPath), 0750, true);
- }
-
$view->rename($oldShareKeyPath, $newShareKeyPath);
}
// Rename keyfile so it isn't orphaned
if ($view->file_exists($oldKeyfilePath)) {
-
- // create destination folder if not exists
- if (!$view->file_exists(dirname($newKeyfilePath))) {
- mkdir(dirname($view->getLocalFile($newKeyfilePath)), 0750, true);
- }
-
$view->rename($oldKeyfilePath, $newKeyfilePath);
}
- // build the path to the file
- $newPath = '/' . $ownerNew . '/files' . $pathNew;
+ // update share keys
+ $sharingEnabled = \OCP\Share::isEnabled();
- if ($util->fixFileSize($newPath)) {
- // get sharing app state
- $sharingEnabled = \OCP\Share::isEnabled();
-
- // get users
- $usersSharing = $util->getSharingUsersArray($sharingEnabled, $pathNew);
+ // get users
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $pathNew);
- // update sharing-keys
- $util->setSharedFileKeyfiles($session, $usersSharing, $pathNew);
- }
+ // update sharing-keys
+ $util->setSharedFileKeyfiles($session, $usersSharing, $pathNew);
\OC_FileProxy::$enabled = $proxyStatus;
}
diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js
index 785d02002fa..4c6b1bac2f7 100644
--- a/apps/files_encryption/js/settings-admin.js
+++ b/apps/files_encryption/js/settings-admin.js
@@ -8,8 +8,6 @@
*/
$(document).ready(function(){
- // Trigger ajax on recoveryAdmin status change
- var enabledStatus = $('#adminEnableRecovery').val();
$('input:password[name="encryptionRecoveryPassword"]').keyup(function(event) {
var recoveryPassword = $( '#encryptionRecoveryPassword' ).val();
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 8ecd56c7b94..43e060a50ad 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -11,11 +11,13 @@ $TRANSLATIONS = array(
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "L'aplicació d'encriptació no està inicialitzada! Potser l'aplicació d'encriptació ha estat reiniciada durant la sessió. Intenteu sortir i acreditar-vos de nou per reinicialitzar l'aplicació d'encriptació.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora de %s (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "No es pot desencriptar aquest fitxer, probablement és un fitxer compartit. Demaneu al propietari del fitxer que el comparteixi de nou amb vós.",
+"Unknown error. Please check your system settings or contact your administrator" => "Error desconegut. Comproveu l'arranjament del sistema o aviseu a l'administrador",
"Missing requirements." => "Manca de requisits.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat.",
"Following users are not set up for encryption:" => "Els usuaris següents no estan configurats per a l'encriptació:",
"Initial encryption started... This can take some time. Please wait." => "La encriptació inicial ha començat... Pot trigar una estona, espereu.",
"Initial encryption running... Please try again later." => "encriptació inicial en procés... Proveu-ho més tard.",
+"Go directly to your %spersonal settings%s." => "Vés directament a l'%sarranjament personal%s.",
"Encryption" => "Xifrat",
"Enable recovery key (allow to recover users files in case of password loss):" => "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):",
"Recovery key password" => "Clau de recuperació de la contrasenya",
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 0aa31113435..55006080062 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Οι κάτωθι χρήστες δεν έχουν ρυθμιστεί για κρυπογράφηση:",
"Initial encryption started... This can take some time. Please wait." => "Η αρχική κρυπτογράφηση άρχισε... Αυτό μπορεί να πάρει κάποια ώρα. Παρακαλώ περιμένετε.",
"Initial encryption running... Please try again later." => "Εκτέλεση αρχικής κρυπτογράφησης... Παρακαλώ προσπαθήστε αργότερα.",
+"Go directly to your %spersonal settings%s." => "Πηγαίνετε κατ'ευθείαν στις %sπροσωπικές ρυθμίσεις%s σας.",
"Encryption" => "Κρυπτογράφηση",
"Enable recovery key (allow to recover users files in case of password loss):" => "Ενεργοποίηση κλειδιού ανάκτησης (επιτρέψτε την ανάκτηση αρχείων χρηστών σε περίπτωση απώλειας κωδικού):",
"Recovery key password" => "Επαναφορά κωδικού κλειδιού",
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index a77ef9813a5..f66d6120964 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
"Your private key password no longer match your log-in password:" => "La pasvorto de via malpublika klavo ne plu kongruas kun via ensaluta pasvorto:",
"Old log-in password" => "Malnova ensaluta pasvorto",
"Current log-in password" => "Nuna ensaluta pasvorto",
-"Update Private Key Password" => "Ĝisdatigi la pasvorton de la malpublika klavo"
+"Update Private Key Password" => "Ĝisdatigi la pasvorton de la malpublika klavo",
+"Enable password recovery:" => "Kapabligi restaŭron de pasvorto:"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index f8bed2f720b..2c88589bf9d 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:",
"Initial encryption started... This can take some time. Please wait." => "Encriptación iniciada..... Esto puede tomar un tiempo. Por favor espere.",
"Initial encryption running... Please try again later." => "Cifrado inicial en curso... Inténtelo más tarde.",
+"Go directly to your %spersonal settings%s." => "Ir directamente a %sOpciones%s.",
"Encryption" => "Cifrado",
"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);",
"Recovery key password" => "Contraseña de clave de recuperación",
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index 67ca7458c80..ffd1c899c9e 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Järgmised kasutajad pole seadistatud krüpteeringuks:",
"Initial encryption started... This can take some time. Please wait." => "Algne krüpteerimine käivitati... See võib võtta natuke aega. Palun oota.",
"Initial encryption running... Please try again later." => "Toimub esmane krüpteerimine... Palun proovi hiljem uuesti.",
+"Go directly to your %spersonal settings%s." => "Liigi otse oma %s isiklike seadete %s juurde.",
"Encryption" => "Krüpteerimine",
"Enable recovery key (allow to recover users files in case of password loss):" => "Luba taastevõti (võimalda kasutaja failide taastamine parooli kaotuse puhul):",
"Recovery key password" => "Taastevõtme parool",
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 173e93c7afd..72f57c8665c 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
"Initial encryption started... This can take some time. Please wait." => "Chiffrement initial démarré... Cela peut prendre un certain temps. Veuillez patienter.",
"Initial encryption running... Please try again later." => "Chiffrement initial en cours... Veuillez re-essayer ultérieurement.",
+"Go directly to your %spersonal settings%s." => "Allerz directement à vos %spersonal settings%s.",
"Encryption" => "Chiffrement",
"Enable recovery key (allow to recover users files in case of password loss):" => "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
"Recovery key password" => "Mot de passe de la clef de récupération",
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 69bd3e96f3d..6f5a745c7b8 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "De volgende gebruikers hebben geen configuratie voor encryptie:",
"Initial encryption started... This can take some time. Please wait." => "initiële versleuteling gestart... Dit kan even duren, geduld a.u.b.",
"Initial encryption running... Please try again later." => "Initiële versleuteling bezig... Probeer het later opnieuw.",
+"Go directly to your %spersonal settings%s." => "Ga direct naar uw %spersoonlijke instellingen%s.",
"Encryption" => "Versleuteling",
"Enable recovery key (allow to recover users files in case of password loss):" => "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):",
"Recovery key password" => "Wachtwoord herstelsleulel",
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 7063161b20a..e134430d8d3 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:",
"Initial encryption started... This can take some time. Please wait." => "Rozpoczęto szyfrowanie... To może chwilę potrwać. Proszę czekać.",
"Initial encryption running... Please try again later." => "Trwa szyfrowanie początkowe...Spróbuj ponownie.",
+"Go directly to your %spersonal settings%s." => "Przejdź bezpośrednio do %spersonal settings%s.",
"Encryption" => "Szyfrowanie",
"Enable recovery key (allow to recover users files in case of password loss):" => "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):",
"Recovery key password" => "Hasło klucza odzyskiwania",
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 433c15e193a..8bb0b3cc4f1 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Os utilizadores seguintes não estão marcados para cifragem:",
"Initial encryption started... This can take some time. Please wait." => "A encriptação inicial começou... Pode demorar algum tempo. Aguarde, por favor.",
"Initial encryption running... Please try again later." => "Criptografia inicial em execução ... Por favor, tente novamente mais tarde. ",
+"Go directly to your %spersonal settings%s." => "Ir directo para %sdefinições pessoais%s.",
"Encryption" => "Encriptação",
"Enable recovery key (allow to recover users files in case of password loss):" => "Active a chave de recuperação (permite recuperar os ficheiros no caso de perda da password):",
"Recovery key password" => "Chave de recuperação da conta",
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 2684bf7be33..fed0788028f 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -430,12 +430,28 @@ class Helper {
}
/**
- * glob uses different pattern than regular expressions, escape glob pattern only
- * @param string $path unescaped path
- * @return string path
+ * find all share keys for a given file
+ * @param string $path to the file
+ * @param \OC\Files\View $view view, relative to data/
+ * @return array list of files, path relative to data/
*/
- public static function escapeGlobPattern($path) {
- return preg_replace('/(\*|\?|\[)/', '[$1]', $path);
+ public static function findShareKeys($path, $view) {
+ $result = array();
+ $pathinfo = pathinfo($path);
+ $dirContent = $view->opendir($pathinfo['dirname']);
+
+ if (is_resource($dirContent)) {
+ while (($file = readdir($dirContent)) !== false) {
+ if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+ if (preg_match("/" . $pathinfo['filename'] . ".(.*).shareKey/", $file)) {
+ $result[] = $pathinfo['dirname'] . '/' . $file;
+ }
+ }
+ }
+ closedir($dirContent);
+ }
+
+ return $result;
}
/**
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 3c51c5efba2..e71fec56854 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -133,20 +133,7 @@ class Keymanager {
$basePath = '/' . $owner . '/files_encryption/keyfiles';
}
- $targetPath = self::keySetPreparation($view, $filename, $basePath, $owner);
-
- if (!$view->is_dir($basePath . '/' . $targetPath)) {
-
- // create all parent folders
- $info = pathinfo($basePath . '/' . $targetPath);
- $keyfileFolderName = $view->getLocalFolder($info['dirname']);
-
- if (!file_exists($keyfileFolderName)) {
-
- mkdir($keyfileFolderName, 0750, true);
-
- }
- }
+ $targetPath = self::keySetPreparation($view, $filename, $basePath);
// try reusing key file if part file
if (Helper::isPartialFilePath($targetPath)) {
@@ -281,8 +268,9 @@ class Keymanager {
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
- if (!$view->file_exists(''))
+ if (!$view->file_exists('')) {
$view->mkdir('');
+ }
$result = $view->file_put_contents($user . '.private.key', $key);
@@ -340,7 +328,7 @@ class Keymanager {
$basePath = '/' . $owner . '/files_encryption/share-keys';
}
- $shareKeyPath = self::keySetPreparation($view, $filename, $basePath, $owner);
+ $shareKeyPath = self::keySetPreparation($view, $filename, $basePath);
$result = true;
@@ -466,8 +454,7 @@ class Keymanager {
if ($view->is_dir($shareKeyPath)) {
- $localPath = \OC\Files\Filesystem::normalizePath($view->getLocalFolder($shareKeyPath));
- self::recursiveDelShareKeys($localPath, $userIds);
+ self::recursiveDelShareKeys($shareKeyPath, $userIds, $view);
} else {
@@ -491,23 +478,25 @@ class Keymanager {
* @param string $dir directory
* @param array $userIds user ids for which the share keys should be deleted
*/
- private static function recursiveDelShareKeys($dir, $userIds) {
- foreach ($userIds as $userId) {
- $extension = '.' . $userId . '.shareKey';
- $escapedDir = Helper::escapeGlobPattern($dir);
- $escapedExtension = Helper::escapeGlobPattern($extension);
- $matches = glob($escapedDir . '/*' . $escapedExtension);
- }
- /** @var $matches array */
- foreach ($matches as $ma) {
- if (!unlink($ma)) {
- \OCP\Util::writeLog('Encryption library',
- 'Could not delete shareKey; does not exist: "' . $ma . '"', \OCP\Util::ERROR);
+ private static function recursiveDelShareKeys($dir, $userIds, $view) {
+
+ $dirContent = $view->opendir($dir);
+
+ if (is_resource($dirContent)) {
+ while (($file = readdir($dirContent)) !== false) {
+ if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+ if ($view->is_dir($dir . '/' . $file)) {
+ self::recursiveDelShareKeys($dir . '/' . $file, $userIds, $view);
+ } else {
+ foreach ($userIds as $userId) {
+ if (preg_match("/(.*)." . $userId . ".shareKey/", $file)) {
+ $view->unlink($dir . '/' . $file);
+ }
+ }
+ }
+ }
}
- }
- $subdirs = $directories = glob($escapedDir . '/*', GLOB_ONLYDIR);
- foreach ($subdirs as $subdir) {
- self::recursiveDelShareKeys($subdir, $userIds);
+ closedir($dirContent);
}
}
@@ -516,7 +505,7 @@ class Keymanager {
* @param string|boolean $path
* @param string $basePath
*/
- public static function keySetPreparation(\OC\Files\View $view, $path, $basePath, $userId) {
+ protected static function keySetPreparation(\OC\Files\View $view, $path, $basePath) {
$targetPath = ltrim($path, '/');
@@ -527,7 +516,7 @@ class Keymanager {
isset($path_parts['dirname'])
&& !$view->file_exists($basePath . '/' . $path_parts['dirname'])
) {
- $sub_dirs = explode(DIRECTORY_SEPARATOR, $basePath . '/' . $path_parts['dirname']);
+ $sub_dirs = explode('/', $basePath . '/' . $path_parts['dirname']);
$dir = '';
foreach ($sub_dirs as $sub_dir) {
$dir .= '/' . $sub_dir;
diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php
index 79699a3ef35..5eda8df01b9 100644
--- a/apps/files_encryption/tests/hooks.php
+++ b/apps/files_encryption/tests/hooks.php
@@ -307,7 +307,7 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
$this->assertTrue($this->rootView->is_dir('/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files/' . $this->folder . '/' . $this->folder));
- // move the file out of the shared folder
+ // move the file to the sub-subfolder
$root = $this->rootView->getRoot();
$this->rootView->chroot('/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files/');
$this->rootView->rename($this->filename, '/' . $this->folder . '/' . $this->folder . '/' . $this->filename);
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 2bd2ddc8e68..3339f8c73e6 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -206,43 +206,63 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
*/
function testRecursiveDelShareKeys() {
- // generate filename
- $filename = '/tmp-' . uniqid() . '.txt';
-
// create folder structure
- $this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1');
- $this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1/subfolder');
- $this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1/subfolder/subsubfolder');
+ $this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1');
+ $this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder');
+ $this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder');
+
+ // create some dummy share keys
+ $this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.user1.shareKey', 'data');
+ $this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file2.user2.shareKey', 'data');
+ $this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file2.user3.shareKey', 'data');
+ $this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/file2.user3.shareKey', 'data');
+ $this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder/file1.user1.shareKey', 'data');
+ $this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder/file2.user2.shareKey', 'data');
+ $this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder/file2.user3.shareKey', 'data');
+
+ // recursive delete share keys from user1 and user2
+ Encryption\Keymanager::delShareKey($this->view, array('user1', 'user2'), '/folder1/');
+
+ // check if share keys from user1 and user2 are deleted
+ $this->assertFalse($this->view->file_exists(
+ '/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.user1.shareKey'));
+ $this->assertFalse($this->view->file_exists(
+ '/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file2.user2.shareKey'));
+ $this->assertFalse($this->view->file_exists(
+ '/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder/file1.user1.shareKey'));
+ $this->assertFalse($this->view->file_exists(
+ '/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder/file2.user2.shareKey'));
- // enable encryption proxy
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = true;
+ // check if share keys from user3 still exists
+ $this->assertTrue($this->view->file_exists(
+ '/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file2.user3.shareKey'));
+ $this->assertTrue($this->view->file_exists(
+ '/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder/file2.user3.shareKey'));
+ $this->assertTrue($this->view->file_exists(
+ '/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/file2.user3.shareKey'));
- // save file with content
- $cryptedFile = file_put_contents('crypt:///'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1/subfolder/subsubfolder' . $filename, $this->dataShort);
+ // cleanup
+ $this->view->deleteAll('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys');
- // test that data was successfully written
- $this->assertTrue(is_int($cryptedFile));
+ }
- // change encryption proxy to previous state
- \OC_FileProxy::$enabled = $proxyStatus;
+ function testKeySetPreperation() {
+ $basePath = '/'.Test_Encryption_Keymanager::TEST_USER.'/files';
+ $path = '/folder1/subfolder/subsubfolder/file.txt';
- // recursive delete keys
- Encryption\Keymanager::delShareKey($this->view, array('admin'), '/folder1/');
+ $this->assertFalse($this->view->is_dir($basePath . '/testKeySetPreperation'));
- // check if share key not exists
- $this->assertFalse($this->view->file_exists(
- '/admin/files_encryption/share-keys/folder1/subfolder/subsubfolder/' . $filename . '.admin.shareKey'));
+ $result = TestProtectedKeymanagerMethods::testKeySetPreperation($this->view, $path, $basePath);
- // enable encryption proxy
- $proxyStatus = \OC_FileProxy::$enabled;
- \OC_FileProxy::$enabled = true;
+ // return path without leading slash
+ $this->assertSame('folder1/subfolder/subsubfolder/file.txt', $result);
+
+ // check if directory structure was created
+ $this->assertTrue($this->view->is_dir($basePath . '/folder1/subfolder/subsubfolder'));
// cleanup
- $this->view->unlink('/admin/files/folder1');
+ $this->view->deleteAll($basePath . '/folder1');
- // change encryption proxy to previous state
- \OC_FileProxy::$enabled = $proxyStatus;
}
}
@@ -257,4 +277,13 @@ class TestProtectedKeymanagerMethods extends \OCA\Encryption\Keymanager {
public static function testGetFilenameFromShareKey($sharekey) {
return self::getFilenameFromShareKey($sharekey);
}
+
+ /**
+ * @param \OC\Files\View $view relative to data/
+ * @param string $path
+ * @param string $basePath
+ */
+ public static function testKeySetPreperation($view, $path, $basePath) {
+ return self::keySetPreparation($view, $path, $basePath);
+ }
}
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index 5d54b7db24f..a5479de1b8d 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -282,7 +282,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
$timestamp = str_replace('d', '', $trashFileSuffix);
// delete file forever
- $this->assertGreaterThan(0, \OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp));
+ $this->assertGreaterThan(0, \OCA\Files_Trashbin\Trashbin::delete($filename, $this->userId, $timestamp));
// check if key for admin not exists
$this->assertFalse($this->view->file_exists(
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index cf2aa5f516f..079dafd09ff 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -164,8 +164,8 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
$this->assertTrue($util->isEncryptedPath($this->userId . '/files/' . $encryptedFile));
// cleanup
- $this->view->unlink($this->userId . '/files/' . $unencryptedFile, $this->dataShort);
- $this->view->unlink($this->userId . '/files/' . $encryptedFile, $this->dataShort);
+ $this->view->unlink($this->userId . '/files/' . $unencryptedFile);
+ $this->view->unlink($this->userId . '/files/' . $encryptedFile);
}
@@ -341,8 +341,6 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
$datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data/');
$userdir = $datadir . '/' . $this->userId . '/files/';
- $util = new Encryption\Util($this->view, $this->userId);
-
$this->view->file_put_contents($this->userId . '/files/' . $filename, $this->dataShort);
$fileInfoEncrypted = $this->view->getFileInfo($this->userId . '/files/' . $filename);
@@ -438,7 +436,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
$this->userId . '/files_encryption/keyfiles/' . $file1 . '.key.moved');
// decrypt all encrypted files
- $result = $util->decryptAll('/' . $this->userId . '/' . 'files');
+ $result = $util->decryptAll();
$this->assertFalse($result);
@@ -461,7 +459,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
$this->userId . '/files_encryption/keyfiles/' . $file1 . '.key');
// try again to decrypt all encrypted files
- $result = $util->decryptAll('/' . $this->userId . '/' . 'files');
+ $result = $util->decryptAll();
$this->assertTrue($result);
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index 73bc9ce08de..c46d3bf0899 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -82,7 +82,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
// init filesystem view
$this->view = new \OC\Files\View('/');
- list($this->storage, $intPath) = $this->view->resolvePath('/');
+ list($this->storage, ) = $this->view->resolvePath('/');
// init short data
$this->dataShort = 'hats';
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index e88880fe516..3b8793a075b 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -10,7 +10,6 @@ $l = \OC_L10N::get('files_external');
OC::$CLASSPATH['OC\Files\Storage\StreamWrapper'] = 'files_external/lib/streamwrapper.php';
OC::$CLASSPATH['OC\Files\Storage\FTP'] = 'files_external/lib/ftp.php';
-OC::$CLASSPATH['OC\Files\Storage\DAV'] = 'files_external/lib/webdav.php';
OC::$CLASSPATH['OC\Files\Storage\OwnCloud'] = 'files_external/lib/owncloud.php';
OC::$CLASSPATH['OC\Files\Storage\Google'] = 'files_external/lib/google.php';
OC::$CLASSPATH['OC\Files\Storage\Swift'] = 'files_external/lib/swift.php';
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index 06bd65c1e97..53cd923453a 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -6,16 +6,36 @@ $TRANSLATIONS = array(
"Amazon S3" => "Amazon S3",
"Key" => "Clau",
"Secret" => "Secret",
+"Bucket" => "Cub",
+"Amazon S3 and compliant" => "Amazon S3 i similars",
"Access Key" => "Clau d'accés",
"Secret Key" => "Clau secreta",
+"Hostname (optional)" => "Nom de l'equip (opcional)",
+"Port (optional)" => "Port (opcional)",
+"Region (optional)" => "Regió (opcional)",
"Enable SSL" => "Habilita SSL",
+"Enable Path Style" => "Permet l'estil del camí",
+"App key" => "Clau de l'aplicació",
+"App secret" => "Secret de l'aplicació",
"Host" => "Equip remot",
"Username" => "Nom d'usuari",
"Password" => "Contrasenya",
+"Root" => "Arrel",
"Secure ftps://" => "Protocol segur ftps://",
"Client ID" => "Client ID",
+"Client secret" => "Secret del client",
+"OpenStack Object Storage" => "OpenStack Object Storage",
"Username (required)" => "Nom d'usuari (necessari)",
+"Bucket (required)" => "Cub (requerit)",
+"Region (optional for OpenStack Object Storage)" => "Regió (opcional per OpenStack Object Storage)",
+"API Key (required for Rackspace Cloud Files)" => "Clau API (requerit per fitxers al núvol Rackspace)",
+"Tenantname (required for OpenStack Object Storage)" => "Tenantname (requerit per OpenStack Object Storage)",
+"Password (required for OpenStack Object Storage)" => "Contrasenya (requerit per OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Nom del servei (requerit per OpenStack Object Storage)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL del punt identificador final (requerit per OpenStack Object Storage)",
+"Timeout of HTTP requests in seconds (optional)" => "Temps d'espera dels requeriments HTTP en segons (opcional)",
"Share" => "Comparteix",
+"SMB / CIFS using OC login" => "SMB / CIFS usant acreditació OC",
"Username as share" => "Nom d'usuari per compartir",
"URL" => "URL",
"Secure https://" => "Protocol segur https://",
@@ -26,13 +46,17 @@ $TRANSLATIONS = array(
"Please provide a valid Dropbox app key and secret." => "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox",
"Error configuring Google Drive storage" => "Error en configurar l'emmagatzemament Google Drive",
"Personal" => "Personal",
+"System" => "Sistema",
"Saved" => "Desat",
"<b>Note:</b> " => "<b>Nota:</b> ",
" and " => "i",
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El suport cURL no està activat o instal·lat a PHP. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> %s no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
+"You don't have any external storages" => "No teniu emmagatzaments externs",
"Name" => "Nom",
+"Storage type" => "Tipus d'emmagatzemament",
+"Scope" => "Abast",
"External Storage" => "Emmagatzemament extern",
"Folder name" => "Nom de la carpeta",
"Configuration" => "Configuració",
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
index eccfd70a5d3..9a7818b92d7 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -35,7 +35,7 @@ $TRANSLATIONS = array(
"URL of identity endpoint (required for OpenStack Object Storage)" => "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
"Timeout of HTTP requests in seconds (optional)" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)",
"Share" => "Teilen",
-"SMB / CIFS using OC login" => "´",
+"SMB / CIFS using OC login" => "SMB / CIFS mit OC-Login",
"Username as share" => "Benutzername als Freigabe",
"URL" => "URL",
"Secure https://" => "Sicherer HTTPS://",
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index b752d635b10..bf67b5035ff 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -35,7 +35,7 @@ $TRANSLATIONS = array(
"URL of identity endpoint (required for OpenStack Object Storage)" => "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
"Timeout of HTTP requests in seconds (optional)" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)",
"Share" => "Teilen",
-"SMB / CIFS using OC login" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)",
+"SMB / CIFS using OC login" => "SMB / CIFS mit OC-Login",
"Username as share" => "Benutzername als Freigabe",
"URL" => "URL",
"Secure https://" => "Sicherer HTTPS://",
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index 38c6806cc50..487712c7bc0 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -7,23 +7,36 @@ $TRANSLATIONS = array(
"Key" => "Võti",
"Secret" => "Salasõna",
"Bucket" => "Korv",
+"Amazon S3 and compliant" => "Amazon S3 ja ühilduv",
"Access Key" => "Ligipääsu võti",
"Secret Key" => "Salavõti",
"Hostname (optional)" => "Hostinimi (valikuline)",
"Port (optional)" => "Post (valikuline)",
"Region (optional)" => "Regioon (valikuline)",
"Enable SSL" => "SSL-i kasutamine",
+"Enable Path Style" => "Luba otsingtee stiilis",
"App key" => "Rakenduse võti",
"App secret" => "Rakenduse salasõna",
"Host" => "Host",
"Username" => "Kasutajanimi",
"Password" => "Parool",
+"Root" => "Juur",
"Secure ftps://" => "Turvaline ftps://",
"Client ID" => "Kliendi ID",
"Client secret" => "Kliendi salasõna",
+"OpenStack Object Storage" => "OpenStack Object Storage",
"Username (required)" => "Kasutajanimi (kohustuslik)",
"Bucket (required)" => "Korv (kohustuslik)",
+"Region (optional for OpenStack Object Storage)" => "Regioon (valikuline OpenStack Object Storage puhul)",
+"API Key (required for Rackspace Cloud Files)" => "API võti (vajalik Rackspace Cloud Files puhul)",
+"Tenantname (required for OpenStack Object Storage)" => "Rendinimi (tenantname , vajalik OpenStack Object Storage puhul)",
+"Password (required for OpenStack Object Storage)" => "Parool (vajalik OpenStack Object Storage puhul)",
+"Service Name (required for OpenStack Object Storage)" => "Teenuse nimi (vajalik OpenStack Object Storage puhul)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "Tuvastuse URL lõpp-punkt (vajalik OpenStack Object Storage puhul)",
+"Timeout of HTTP requests in seconds (optional)" => "HTTP päringu aegumine sekundites (valikuline)",
"Share" => "Jaga",
+"SMB / CIFS using OC login" => "SMB / CIFS kasutades OC logimist",
+"Username as share" => "Kasutajanimi kui jagamine",
"URL" => "URL",
"Secure https://" => "Turvaline https://",
"Remote subfolder" => "Mujahl olev alamkaust",
@@ -33,13 +46,17 @@ $TRANSLATIONS = array(
"Please provide a valid Dropbox app key and secret." => "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna.",
"Error configuring Google Drive storage" => "Viga Google Drive'i salvestusruumi seadistamisel",
"Personal" => "Isiklik",
+"System" => "Süsteem",
"Saved" => "Salvestatud",
"<b>Note:</b> " => "<b>Märkus:</b>",
" and " => "ja",
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi.",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Märkus:</b> \"%s\" pole paigaldatud. Hoidla %s ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata vajalik tugi.",
+"You don't have any external storages" => "Sul pole ühtegi välist andmehoidlat",
"Name" => "Nimi",
+"Storage type" => "Andmehoidla tüüp",
+"Scope" => "Skoop",
"External Storage" => "Väline salvestuskoht",
"Folder name" => "Kausta nimi",
"Configuration" => "Seadistamine",
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index f028d09f1b3..5174cebb5a7 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -46,13 +46,17 @@ $TRANSLATIONS = array(
"Please provide a valid Dropbox app key and secret." => "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
"Error configuring Google Drive storage" => "Erreur lors de la configuration du support de stockage Google Drive",
"Personal" => "Personnel",
+"System" => "Système",
"Saved" => "Sauvegarder",
"<b>Note:</b> " => "<b>Attention :</b>",
" and " => "et",
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Attention :</b> Le support de cURL de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
+"You don't have any external storages" => "Vous n'avez pas de support de stockage externe",
"Name" => "Nom",
+"Storage type" => "Type de support de stockage",
+"Scope" => "Portée",
"External Storage" => "Stockage externe",
"Folder name" => "Nom du dossier",
"Configuration" => "Configuration",
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index 3bc71ad2709..837e48fcb90 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Location" => "Местоположение",
"Amazon S3" => "Amazon S3",
"Key" => "Ключ",
+"Secret" => "Секрет",
"Access Key" => "Ключ доступа",
"Secret Key" => "Секретный ключ",
"Hostname (optional)" => "Хост (опц.)",
@@ -31,7 +32,11 @@ $TRANSLATIONS = array(
"<b>Note:</b> " => "<b>Примечание:</b> ",
" and " => "и",
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлен модуль. Подключение %s невозможно. Обратитесь к вашему системному администратору.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Обратите внимание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Обратите внимание:</b> \"%s\" не установлен. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
+"You don't have any external storages" => "У вас нет внешних хранилищ",
"Name" => "Имя",
+"Storage type" => "Тип хранилища",
"External Storage" => "Внешний носитель",
"Folder name" => "Имя папки",
"Configuration" => "Конфигурация",
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
index 0701b47bcfa..70339801f0c 100644
--- a/apps/files_external/l10n/zh_TW.php
+++ b/apps/files_external/l10n/zh_TW.php
@@ -3,9 +3,18 @@ $TRANSLATIONS = array(
"External storage" => "外部儲存",
"Local" => "本地",
"Location" => "地點",
+"Amazon S3" => "Amazon S3",
+"Key" => "鑰",
+"Secret" => "密",
+"Secret Key" => "密鑰",
+"Hostname (optional)" => "主機名稱 (選填)",
+"Port (optional)" => "埠號 (選填)",
+"Region (optional)" => "區域 (選填)",
+"Enable SSL" => "啟用 SSL",
"Host" => "主機",
"Username" => "使用者名稱:",
"Password" => "密碼",
+"Username (required)" => "使用者名稱 (必填)",
"Share" => "分享",
"URL" => "URL",
"Access granted" => "允許存取",
@@ -14,18 +23,28 @@ $TRANSLATIONS = array(
"Please provide a valid Dropbox app key and secret." => "請提供有效的 Dropbox app key 和 app secret 。",
"Error configuring Google Drive storage" => "設定 Google Drive 儲存時發生錯誤",
"Personal" => "個人",
+"System" => "系統",
"Saved" => "已儲存",
+"<b>Note:</b> " => "<b>警告:</b> ",
+" and " => "與",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>警告:</b> PHP 並未啓用 Curl 的支援,因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>警告</b>:PHP 並未啓用 FTP 的支援,因此無法掛載 %s,請洽您的系統管理員將其安裝並啓用。",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>警告</b>並未安裝 \"%s\",因此無法掛載 %s。請洽您的系統管理員將其安裝並啓用。",
+"You don't have any external storages" => "您沒有任何外部儲存",
"Name" => "名稱",
"External Storage" => "外部儲存",
"Folder name" => "資料夾名稱",
"Configuration" => "設定",
"Options" => "選項",
+"Available for" => "可用的",
"Add storage" => "增加儲存區",
+"No user or group" => "沒有使用者或群組",
"All Users" => "所有使用者",
"Groups" => "群組",
"Users" => "使用者",
"Delete" => "刪除",
"Enable User External Storage" => "啓用使用者外部儲存",
+"Allow users to mount the following external storage" => "允許使用者自行掛載以下的外部儲存",
"SSL root certificates" => "SSL 根憑證",
"Import Root Certificate" => "匯入根憑證"
);
diff --git a/apps/files_external/tests/appSpec.js b/apps/files_external/tests/appSpec.js
new file mode 100644
index 00000000000..43902d1c1d0
--- /dev/null
+++ b/apps/files_external/tests/appSpec.js
@@ -0,0 +1,99 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2014 Vincent Petry <pvince81@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/>.
+*
+*/
+
+describe('OCA.External.App tests', function() {
+ var App = OCA.External.App;
+ var fileList;
+
+ beforeEach(function() {
+ $('#testArea').append(
+ '<div id="app-navigation">' +
+ '<ul><li data-id="files"><a>Files</a></li>' +
+ '<li data-id="sharingin"><a></a></li>' +
+ '<li data-id="sharingout"><a></a></li>' +
+ '</ul></div>' +
+ '<div id="app-content">' +
+ '<div id="app-content-files" class="hidden">' +
+ '</div>' +
+ '<div id="app-content-extstoragemounts" class="hidden">' +
+ '</div>' +
+ '</div>' +
+ '</div>'
+ );
+ fileList = App.initList($('#app-content-extstoragemounts'));
+ });
+ afterEach(function() {
+ App.fileList = null;
+ fileList.destroy();
+ fileList = null;
+ });
+
+ describe('initialization', function() {
+ it('inits external mounts list on show', function() {
+ expect(App.fileList).toBeDefined();
+ });
+ });
+ describe('file actions', function() {
+ it('provides default file actions', function() {
+ var fileActions = fileList.fileActions;
+
+ expect(fileActions.actions.all).toBeDefined();
+ expect(fileActions.actions.all.Delete).toBeDefined();
+ expect(fileActions.actions.all.Rename).toBeDefined();
+ expect(fileActions.actions.all.Download).toBeDefined();
+
+ expect(fileActions.defaults.dir).toEqual('Open');
+ });
+ it('redirects to files app when opening a directory', function() {
+ var oldList = OCA.Files.App.fileList;
+ // dummy new list to make sure it exists
+ OCA.Files.App.fileList = new OCA.Files.FileList($('<table><thead></thead><tbody></tbody></table>'));
+
+ var setActiveViewStub = sinon.stub(OCA.Files.App, 'setActiveView');
+ // create dummy table so we can click the dom
+ var $table = '<table><thead></thead><tbody id="fileList"></tbody></table>';
+ $('#app-content-extstoragemounts').append($table);
+
+ App._inFileList = null;
+ fileList = App.initList($('#app-content-extstoragemounts'));
+
+ fileList.setFiles([{
+ name: 'testdir',
+ type: 'dir',
+ path: '/somewhere/inside/subdir',
+ counterParts: ['user2'],
+ shareOwner: 'user2'
+ }]);
+
+ fileList.findFileEl('testdir').find('td a.name').click();
+
+ expect(OCA.Files.App.fileList.getCurrentDirectory()).toEqual('/somewhere/inside/subdir/testdir');
+
+ expect(setActiveViewStub.calledOnce).toEqual(true);
+ expect(setActiveViewStub.calledWith('files')).toEqual(true);
+
+ setActiveViewStub.restore();
+
+ // restore old list
+ OCA.Files.App.fileList = oldList;
+ });
+ });
+});
diff --git a/apps/files_external/tests/js/mountsfilelistSpec.js b/apps/files_external/tests/js/mountsfilelistSpec.js
new file mode 100644
index 00000000000..b599df77aac
--- /dev/null
+++ b/apps/files_external/tests/js/mountsfilelistSpec.js
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+describe('OCA.External.FileList tests', function() {
+ var testFiles, alertStub, notificationStub, fileList, fileActions;
+ var oldFileListPrototype;
+
+ beforeEach(function() {
+ alertStub = sinon.stub(OC.dialogs, 'alert');
+ notificationStub = sinon.stub(OC.Notification, 'show');
+
+ // init parameters and test table elements
+ $('#testArea').append(
+ '<div id="app-content-container">' +
+ // init horrible parameters
+ '<input type="hidden" id="dir" value="/"></input>' +
+ '<input type="hidden" id="permissions" value="31"></input>' +
+ // dummy controls
+ '<div id="controls">' +
+ ' <div class="actions creatable"></div>' +
+ ' <div class="notCreatable"></div>' +
+ '</div>' +
+ // dummy table
+ // TODO: at some point this will be rendered by the fileList class itself!
+ '<table id="filestable">' +
+ '<thead><tr>' +
+ '<th id="headerName" class="hidden column-name">' +
+ ' <div id="headerName-container">' +
+ ' <a class="name sort columntitle" data-sort="name"><span>Name</span><span class="sort-indicator"></span></a>' +
+ ' </div>' +
+ '</th>' +
+ '<th id="headerBackend" class="hidden column-backend">' +
+ ' <a class="backend sort columntitle" data-sort="backend"><span>Storage type</span><span class="sort-indicator"></span></a>' +
+ '</th>' +
+ '<th id="headerScope" class="hidden column-scope column-last">' +
+ ' <a class="scope sort columntitle" data-sort="scope"><span>Scope</span><span class="sort-indicator"></span></a>' +
+ '</th>' +
+ '</tr></thead>' +
+ '<tbody id="fileList"></tbody>' +
+ '<tfoot></tfoot>' +
+ '</table>' +
+ '<div id="emptycontent">Empty content message</div>' +
+ '</div>'
+ );
+ fileActions = new OCA.Files.FileActions();
+ });
+ afterEach(function() {
+ OCA.Files.FileList.prototype = oldFileListPrototype;
+ testFiles = undefined;
+ fileList.destroy();
+ fileList = undefined;
+ fileActions = undefined;
+
+ notificationStub.restore();
+ alertStub.restore();
+ });
+
+ describe('loading file list for external storages', function() {
+ var ocsResponse;
+
+ beforeEach(function() {
+ fileList = new OCA.External.FileList(
+ $('#app-content-container')
+ );
+
+ fileList.reload();
+
+ /* jshint camelcase: false */
+ ocsResponse = {
+ ocs: {
+ meta: {
+ status: 'ok',
+ statuscode: 100,
+ message: null
+ },
+ data: [{
+ name: 'smb mount',
+ path: '/mount points',
+ type: 'dir',
+ backend: 'SMB',
+ scope: 'personal',
+ permissions: OC.PERMISSION_READ | OC.PERMISSION_DELETE
+ }, {
+ name: 'sftp mount',
+ path: '/another mount points',
+ type: 'dir',
+ backend: 'SFTP',
+ scope: 'system',
+ permissions: OC.PERMISSION_READ
+ }]
+ }
+ };
+ });
+ it('render storage list', function() {
+ var request;
+ var $rows;
+ var $tr;
+
+ expect(fakeServer.requests.length).toEqual(1);
+ request = fakeServer.requests[0];
+ expect(request.url).toEqual(
+ OC.linkToOCS('apps/files_external/api/v1') +
+ 'mounts?format=json'
+ );
+
+ fakeServer.requests[0].respond(
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify(ocsResponse)
+ );
+
+ $rows = fileList.$el.find('tbody tr');
+ expect($rows.length).toEqual(2);
+
+ $tr = $rows.eq(0);
+ expect($tr.attr('data-id')).not.toBeDefined();
+ expect($tr.attr('data-type')).toEqual('dir');
+ expect($tr.attr('data-file')).toEqual('sftp mount');
+ expect($tr.attr('data-path')).toEqual('/another mount points');
+ expect($tr.attr('data-size')).not.toBeDefined();
+ expect($tr.attr('data-permissions')).toEqual('1'); // read only
+ expect($tr.find('a.name').attr('href')).toEqual(
+ OC.webroot +
+ '/index.php/apps/files' +
+ '?dir=/another%20mount%20points/sftp%20mount'
+ );
+ expect($tr.find('.nametext').text().trim()).toEqual('sftp mount');
+ expect($tr.find('.column-scope').text().trim()).toEqual('System');
+ expect($tr.find('.column-backend').text().trim()).toEqual('SFTP');
+
+ $tr = $rows.eq(1);
+ expect($tr.attr('data-id')).not.toBeDefined();
+ expect($tr.attr('data-type')).toEqual('dir');
+ expect($tr.attr('data-file')).toEqual('smb mount');
+ expect($tr.attr('data-path')).toEqual('/mount points');
+ expect($tr.attr('data-size')).not.toBeDefined();
+ expect($tr.attr('data-permissions')).toEqual('9'); // read and delete
+ expect($tr.find('a.name').attr('href')).toEqual(
+ OC.webroot +
+ '/index.php/apps/files' +
+ '?dir=/mount%20points/smb%20mount'
+ );
+ expect($tr.find('.nametext').text().trim()).toEqual('smb mount');
+ expect($tr.find('.column-scope').text().trim()).toEqual('Personal');
+ expect($tr.find('.column-backend').text().trim()).toEqual('SMB');
+
+ });
+ });
+});
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index a9f4ff5089b..b55a80ea640 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -14,27 +14,14 @@ OC::$CLASSPATH['OCA\Files\Share\Proxy'] = 'files_sharing/lib/proxy.php';
\OCP\App::registerAdmin('files_sharing', 'settings-admin');
-$externalManager = new \OCA\Files_Sharing\External\Manager(
- \OC::$server->getDatabaseConnection(),
- \OC\Files\Filesystem::getMountManager(),
- \OC\Files\Filesystem::getLoader(),
- \OC::$server->getUserSession()
-);
-$externalManager->setup();
+\OCA\Files_Sharing\Helper::registerHooks();
-OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
OCP\Util::addScript('files_sharing', 'share');
OCP\Util::addScript('files_sharing', 'external');
-\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Shared_Updater', 'writeHook');
-\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Shared_Updater', 'postDeleteHook');
-\OC_Hook::connect('OC_Filesystem', 'delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook');
-\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
-\OC_Hook::connect('OC_Appconfig', 'post_set_value', '\OCA\Files\Share\Maintainer', 'configChangeHook');
-
OC_FileProxy::register(new OCA\Files\Share\Proxy());
\OCA\Files\App::getNavigationManager()->add(
diff --git a/apps/files_sharing/js/external.js b/apps/files_sharing/js/external.js
index 5c476b2d43d..a142819b112 100644
--- a/apps/files_sharing/js/external.js
+++ b/apps/files_sharing/js/external.js
@@ -8,13 +8,6 @@
*
*/
(function () {
- var getParameterByName = function (query, name) {
- name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
- var regex = new RegExp("[\\#&]" + name + "=([^&#]*)"),
- results = regex.exec(query);
- return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
- };
-
var addExternalShare = function (remote, token, owner, name, password) {
return $.post(OC.generateUrl('apps/files_sharing/external'), {
remote: remote,
@@ -25,7 +18,16 @@
});
};
- var showAddExternalDialog = function (remote, token, owner, name, passwordProtected) {
+ /**
+ * Shows "add external share" dialog.
+ *
+ * @param {String} remote remote server URL
+ * @param {String} owner owner name
+ * @param {String} name name of the shared folder
+ * @param {String} token authentication token
+ * @param {bool} passwordProtected true if the share is password protected
+ */
+ OCA.Sharing.showAddExternalDialog = function (remote, token, owner, name, passwordProtected) {
var remoteClean = (remote.substr(0, 8) === 'https://') ? remote.substr(8) : remote.substr(7);
var callback = function (add, password) {
password = password || '';
@@ -47,25 +49,23 @@
, 'Add Share', callback, true, 'Password', true);
}
};
-
- OCA.Sharing.showAddExternalDialog = function (hash) {
- var remote = getParameterByName(hash, 'remote');
- var owner = getParameterByName(hash, 'owner');
- var name = getParameterByName(hash, 'name');
- var token = getParameterByName(hash, 'token');
- var passwordProtected = parseInt(getParameterByName(hash, 'protected'), 10);
-
- if (remote && token && owner && name) {
- showAddExternalDialog(remote, token, owner, name, passwordProtected);
- }
- };
})();
$(document).ready(function () {
// FIXME: HACK: do not init when running unit tests, need a better way
if (!window.TESTING && OCA.Files) {// only run in the files app
- var hash = location.hash;
- location.hash = '';
- OCA.Sharing.showAddExternalDialog(hash);
+ var params = OC.Util.History.parseUrlQuery();
+ if (params.remote && params.token && params.owner && params.name) {
+ // clear hash, it is unlikely that it contain any extra parameters
+ location.hash = '';
+ params.passwordProtected = parseInt(params.passwordProtected, 10) === 1;
+ OCA.Sharing.showAddExternalDialog(
+ params.remote,
+ params.token,
+ params.owner,
+ params.name,
+ params.passwordProtected
+ );
+ }
}
});
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 80631908d24..1d633a655d5 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -128,7 +128,7 @@ OCA.Sharing.PublicApp = {
data.formData = {
requesttoken: $('#publicUploadRequestToken').val(),
dirToken: $('#dirToken').val(),
- subdir: self.fileList.getCurrentDirectory(),
+ subdir: data.targetDir || self.fileList.getCurrentDirectory(),
file_directory: fileDirectory
};
});
diff --git a/apps/files_sharing/l10n/ar.php b/apps/files_sharing/l10n/ar.php
index efb51a22fc0..ec472a295ae 100644
--- a/apps/files_sharing/l10n/ar.php
+++ b/apps/files_sharing/l10n/ar.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"the link expired" => "انتهت صلاحية الرابط",
"sharing is disabled" => "المشاركة غير مفعلة",
"For more info, please ask the person who sent this link." => "لمزيد من المعلومات، يرجى سؤال الشخص الذي أرسل هذا الرابط",
+"Save" => "حفظ",
"Download" => "تحميل",
"Download %s" => "تحميل %s",
"Direct link" => "رابط مباشر"
diff --git a/apps/files_sharing/l10n/ast.php b/apps/files_sharing/l10n/ast.php
index 5672dd81b17..f1987ed5382 100644
--- a/apps/files_sharing/l10n/ast.php
+++ b/apps/files_sharing/l10n/ast.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "La compartición sirvidor a sirvidor nun ta habilitada nesti sirvidor",
+"Couldn't add remote share" => "Nun pudo amestase una compartición remota",
"Shared with you" => "Compartío contigo",
"Shared with others" => "Compartío con otros",
"Shared by link" => "Compartíu por enllaz",
"No files have been shared with you yet." => "Entá nun se compartieron ficheros contigo.",
"You haven't shared any files yet." => "Entá nun compartiesti dengún ficheru.",
"You haven't shared any files by link yet." => "Entá nun compartiesti nengún ficheru por enllaz.",
+"Add {name} from {owner}@{remote}" => "Amestar {name} de {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "Nun s'alcontró denguna instalación d'ownCloud en {remote}",
+"Invalid ownCloud url" => "Url ownCloud inválida",
"Shared by {owner}" => "Compartíu por {owner}",
"Shared by" => "Compartíu por",
"This share is password-protected" => "Esta compartición tien contraseña protexida",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "l'enllaz caducó",
"sharing is disabled" => "la compartición ta deshabilitada",
"For more info, please ask the person who sent this link." => "Pa más información, entrúga-y a la persona qu'unvió esti enllaz",
+"Save to ownCloud" => "Guardar en ownCloud",
+"example.com/owncloud" => "exemplu.com/owncloud",
+"Save" => "Guardar",
"Download" => "Baxar",
"Download %s" => "Descargar %s",
-"Direct link" => "Enllaz direutu"
+"Direct link" => "Enllaz direutu",
+"Allow other instances to mount public links shared from this server" => "Permitir a otres instancies montar enllaces compartíos públicos d'esti sirvidor",
+"Allow users to mount public link shares" => "Permitir a los usuarios montar enllaces compartíos públicos"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/bg_BG.php b/apps/files_sharing/l10n/bg_BG.php
index 0683c192977..3efba1e0f8b 100644
--- a/apps/files_sharing/l10n/bg_BG.php
+++ b/apps/files_sharing/l10n/bg_BG.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Shared by" => "Споделено от",
"Password" => "Парола",
"Name" => "Име",
+"Save" => "Запис",
"Download" => "Изтегляне"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php
index 9bfd1acba5c..31e349dbc56 100644
--- a/apps/files_sharing/l10n/bn_BD.php
+++ b/apps/files_sharing/l10n/bn_BD.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Password" => "কূটশব্দ",
"Name" => "রাম",
+"Save" => "সংরক্ষণ",
"Download" => "ডাউনলোড"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/bs.php b/apps/files_sharing/l10n/bs.php
index bf5b758a33d..440d8140d9d 100644
--- a/apps/files_sharing/l10n/bs.php
+++ b/apps/files_sharing/l10n/bs.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"Shared by" => "Dijeli",
-"Name" => "Ime"
+"Name" => "Ime",
+"Save" => "Spasi"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index 43b9549e407..8de7be9a0f3 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -1,19 +1,36 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "La compartició entre servidors no està activat en aquest servidor",
+"Couldn't add remote share" => "No s'ha pogut afegir una compartició remota",
+"Shared with you" => "Compartit per vós",
+"Shared with others" => "Compartit amb altres",
+"Shared by link" => "Compartit amb enllaç",
+"No files have been shared with you yet." => "Encara no hi ha fitxers compartits amb vós.",
+"You haven't shared any files yet." => "Encara no heu compartit cap fitxer.",
+"You haven't shared any files by link yet." => "Encara no heu compartit cap fitxer amb enllaç.",
+"Add {name} from {owner}@{remote}" => "Afegiu {name} de {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "No s'ha trobat cap instal·lació ownCloud a {remote}",
+"Invalid ownCloud url" => "La url d'ownCloud no és vàlida",
"Shared by {owner}" => "Compartits per {owner}",
"Shared by" => "Compartit per",
"This share is password-protected" => "Aquest compartit està protegit amb contrasenya",
"The password is wrong. Try again." => "la contrasenya és incorrecta. Intenteu-ho de nou.",
"Password" => "Contrasenya",
"Name" => "Nom",
+"Share time" => "Temps de compartició",
"Sorry, this link doesn’t seem to work anymore." => "Aquest enllaç sembla que no funciona.",
"Reasons might be:" => "Les raons podrien ser:",
"the item was removed" => "l'element ha estat eliminat",
"the link expired" => "l'enllaç ha vençut",
"sharing is disabled" => "s'ha desactivat la compartició",
"For more info, please ask the person who sent this link." => "Per més informació contacteu amb qui us ha enviat l'enllaç.",
+"Save to ownCloud" => "Desa a ownCloud",
+"example.com/owncloud" => "exemple.com/owncloud",
+"Save" => "Desa",
"Download" => "Baixa",
"Download %s" => "Baixa %s",
-"Direct link" => "Enllaç directe"
+"Direct link" => "Enllaç directe",
+"Allow other instances to mount public links shared from this server" => "Permet que altres instàncies muntin enllaços públics compartits des d'aqeust servidor",
+"Allow users to mount public link shares" => "Permet que usuaris muntin compartits amb enllaços públics"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index e35cf6702d6..914a002ac16 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Sdílení mezi servery není povoleno",
+"Couldn't add remote share" => "Nelze přidat vzdálené úložiště",
"Shared with you" => "Sdíleno s vámi",
"Shared with others" => "Sdíleno s ostatními",
"Shared by link" => "Sdíleno pomocí odkazu",
"No files have been shared with you yet." => "Zatím s vámi nikdo žádné soubory nesdílel.",
"You haven't shared any files yet." => "Zatím jste nesdíleli žádné soubory.",
"You haven't shared any files by link yet." => "Zatím jste nesdíleli pomocí odkazu žádný soubor.",
+"Add {name} from {owner}@{remote}" => "Přidat {name} od {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "Nebyla nalezen žádný funkční ownCloud na {remote}",
+"Invalid ownCloud url" => "Neplatná ownCloud url",
"Shared by {owner}" => "Sdílí {owner}",
"Shared by" => "Sdílí",
"This share is password-protected" => "Toto sdílení je chráněno heslem",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "platnost odkazu vypršela",
"sharing is disabled" => "sdílení je zakázané",
"For more info, please ask the person who sent this link." => "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz.",
+"Save to ownCloud" => "Uložit na ownCloud",
+"example.com/owncloud" => "example.com/owncloud",
+"Save" => "Uložit",
"Download" => "Stáhnout",
"Download %s" => "Stáhnout %s",
-"Direct link" => "Přímý odkaz"
+"Direct link" => "Přímý odkaz",
+"Allow other instances to mount public links shared from this server" => "Povolit připojování veřejně sdílených odkazů z tohoto serveru",
+"Allow users to mount public link shares" => "Povolit uživatelům připojovat veřejně sdílené odkazy"
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/cy_GB.php b/apps/files_sharing/l10n/cy_GB.php
index 67b8ed88fc9..ce04b867b4c 100644
--- a/apps/files_sharing/l10n/cy_GB.php
+++ b/apps/files_sharing/l10n/cy_GB.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Shared by" => "Rhannwyd gan",
"Password" => "Cyfrinair",
"Name" => "Enw",
+"Save" => "Cadw",
"Download" => "Llwytho i lawr"
);
$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php
index 9dcc386ae95..dedd7a8adf1 100644
--- a/apps/files_sharing/l10n/da.php
+++ b/apps/files_sharing/l10n/da.php
@@ -19,6 +19,7 @@ $TRANSLATIONS = array(
"the link expired" => "linket udløb",
"sharing is disabled" => "deling er deaktiveret",
"For more info, please ask the person who sent this link." => "For yderligere information, kontakt venligst personen der sendte linket. ",
+"Save" => "Gem",
"Download" => "Download",
"Download %s" => "Download %s",
"Direct link" => "Direkte link"
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index 87b9c25175b..ecf7f175800 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert",
+"Couldn't add remote share" => "Entfernte Freigabe kann nicht hinzu gefügt werden",
"Shared with you" => "Mit Dir geteilt",
"Shared with others" => "Von Dir geteilt",
"Shared by link" => "Geteilt über einen Link",
"No files have been shared with you yet." => "Es wurden bis jetzt keine Dateien mit Dir geteilt.",
"You haven't shared any files yet." => "Du hast bis jetzt keine Dateien mit anderen geteilt.",
"You haven't shared any files by link yet." => "Du hast bis jetzt keine Dateien über einen Link mit anderen geteilt.",
+"Add {name} from {owner}@{remote}" => "{name} wird von {owner}@{remote} hinzugefügt",
+"No ownCloud installation found at {remote}" => "Keine OwnCloud-Installation auf {remote} gefunden",
+"Invalid ownCloud url" => "Ungültige OwnCloud-URL",
"Shared by {owner}" => "Geteilt von {owner}",
"Shared by" => "Geteilt von ",
"This share is password-protected" => "Diese Freigabe ist durch ein Passwort geschützt",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "Der Link ist abgelaufen",
"sharing is disabled" => "Teilen ist deaktiviert",
"For more info, please ask the person who sent this link." => "Für mehr Informationen, frage bitte die Person, die Dir diesen Link geschickt hat.",
+"Save to ownCloud" => "In OwnCloud speichern",
+"example.com/owncloud" => "beispiel.com/owncloud",
+"Save" => "Speichern",
"Download" => "Herunterladen",
"Download %s" => "Download %s",
-"Direct link" => "Direkter Link"
+"Direct link" => "Direkter Link",
+"Allow other instances to mount public links shared from this server" => "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben",
+"Allow users to mount public link shares" => "Erlaube Nutzern das Hinzufügen von freigegebenen öffentlichen Links"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de_AT.php b/apps/files_sharing/l10n/de_AT.php
index 08ef4d9245e..45e6b9a3272 100644
--- a/apps/files_sharing/l10n/de_AT.php
+++ b/apps/files_sharing/l10n/de_AT.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"Password" => "Passwort",
+"Save" => "Speichern",
"Download" => "Herunterladen"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de_CH.php b/apps/files_sharing/l10n/de_CH.php
index 87ca31880d1..7d8fec560d0 100644
--- a/apps/files_sharing/l10n/de_CH.php
+++ b/apps/files_sharing/l10n/de_CH.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
"the link expired" => "Der Link ist abgelaufen",
"sharing is disabled" => "Teilen ist deaktiviert",
"For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
+"Save" => "Speichern",
"Download" => "Herunterladen"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
index 9d8390874cd..c0488b4988b 100644
--- a/apps/files_sharing/l10n/de_DE.php
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert",
+"Couldn't add remote share" => "Entfernte Freigabe kann nicht hinzu gefügt werden",
"Shared with you" => "Mit Ihnen geteilt",
"Shared with others" => "Von Ihnen geteilt",
"Shared by link" => "Geteilt über einen Link",
"No files have been shared with you yet." => "Es wurden bis jetzt keine Dateien mit Ihnen geteilt.",
"You haven't shared any files yet." => "Sie haben bis jetzt keine Dateien mit anderen geteilt.",
"You haven't shared any files by link yet." => "Sie haben bis jetzt keine Dateien über einen Link mit anderen geteilt.",
+"Add {name} from {owner}@{remote}" => "{name} wird von {owner}@{remote} hinzugefügt",
+"No ownCloud installation found at {remote}" => "Keine OwnCloud-Installation auf {remote} gefunden",
+"Invalid ownCloud url" => "Ungültige OwnCloud-URL",
"Shared by {owner}" => "Geteilt von {owner}",
"Shared by" => "Geteilt von",
"This share is password-protected" => "Diese Freigabe ist durch ein Passwort geschützt",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "Der Link ist abgelaufen",
"sharing is disabled" => "Teilen ist deaktiviert",
"For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
+"Save to ownCloud" => "In OwnCloud speichern",
+"example.com/owncloud" => "beispiel.com/owncloud",
+"Save" => "Speichern",
"Download" => "Herunterladen",
"Download %s" => "Download %s",
-"Direct link" => "Direkte Verlinkung"
+"Direct link" => "Direkte Verlinkung",
+"Allow other instances to mount public links shared from this server" => "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben",
+"Allow users to mount public link shares" => "Erlaube Nutzern das Hinzufügen von freigegebenen öffentlichen Links"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
index 3057312e477..b340b677231 100644
--- a/apps/files_sharing/l10n/el.php
+++ b/apps/files_sharing/l10n/el.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Ο διαμοιρασμός μεταξύ διακομιστών δεν έχει ενεργοποιηθεί σε αυτόν το διακομιστή",
+"Couldn't add remote share" => "Αδυναμία προσθήκης απομακρυσμένου κοινόχρηστου φακέλου",
"Shared with you" => "Διαμοιρασμένο με εσάς",
"Shared with others" => "Διαμοιρασμένο με άλλους",
"Shared by link" => "Διαμοιρασμένο μέσω συνδέσμου",
"No files have been shared with you yet." => "Κανένα αρχείο δνε έχει διαμοιραστεί ακόμα με εσάς.",
"You haven't shared any files yet." => "Δεν έχετε διαμοιραστεί κανένα αρχείο ακόμα.",
"You haven't shared any files by link yet." => "Δεν έχετε διαμοιραστεί κανένα αρχείο μέσω συνδέσμου ακόμα.",
+"Add {name} from {owner}@{remote}" => "Προσθήκη {name} από {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "Δεν βρέθηκε εγκατεστημένο ownCloud στο {remote}",
+"Invalid ownCloud url" => "Άκυρη url ownCloud ",
"Shared by {owner}" => "Διαμοιράστηκε από τον {owner}",
"Shared by" => "Διαμοιράστηκε από",
"This share is password-protected" => "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "ο σύνδεσμος έληξε",
"sharing is disabled" => "ο διαμοιρασμός απενεργοποιήθηκε",
"For more info, please ask the person who sent this link." => "Για περισσότερες πληροφορίες, παρακαλώ ρωτήστε το άτομο που σας έστειλε αυτόν τον σύνδεσμο.",
+"Save to ownCloud" => "Αποθήκευση στο ownCloud",
+"example.com/owncloud" => "example.com/owncloud",
+"Save" => "Αποθήκευση",
"Download" => "Λήψη",
"Download %s" => "Λήψη %s",
-"Direct link" => "Άμεσος σύνδεσμος"
+"Direct link" => "Άμεσος σύνδεσμος",
+"Allow other instances to mount public links shared from this server" => "Να επιτρέπεται σε άλλες εγκαταστάσεις να επιθέτουν δημόσιους συνδέσμους που έχουν διαμοιραστεί από αυτόν το διακομιστή",
+"Allow users to mount public link shares" => "Να επιτρέπεται στους χρήστες να επιθέτουν κοινόχρηστους φακέλους με δημόσιους συνδέσμους"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/en_GB.php b/apps/files_sharing/l10n/en_GB.php
index 492516863d4..04a5bb5e1b2 100644
--- a/apps/files_sharing/l10n/en_GB.php
+++ b/apps/files_sharing/l10n/en_GB.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Server to server sharing is not enabled on this server",
+"Couldn't add remote share" => "Couldn't add remote share",
"Shared with you" => "Shared with you",
"Shared with others" => "Shared with others",
"Shared by link" => "Shared by link",
"No files have been shared with you yet." => "No files have been shared with you yet.",
"You haven't shared any files yet." => "You haven't shared any files yet.",
"You haven't shared any files by link yet." => "You haven't shared any files by link yet.",
+"Add {name} from {owner}@{remote}" => "Add {name} from {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "No ownCloud installation found at {remote}",
+"Invalid ownCloud url" => "Invalid ownCloud URL",
"Shared by {owner}" => "Shared by {owner}",
"Shared by" => "Shared by",
"This share is password-protected" => "This share is password-protected",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "the link expired",
"sharing is disabled" => "sharing is disabled",
"For more info, please ask the person who sent this link." => "For more info, please ask the person who sent this link.",
+"Save to ownCloud" => "Save to ownCloud",
+"example.com/owncloud" => "example.com/owncloud",
+"Save" => "Save",
"Download" => "Download",
"Download %s" => "Download %s",
-"Direct link" => "Direct link"
+"Direct link" => "Direct link",
+"Allow other instances to mount public links shared from this server" => "Allow other instances to mount public links shared from this server",
+"Allow users to mount public link shares" => "Allow users to mount public link shares"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index 7cff8ca4a4a..7ae7e543271 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -1,8 +1,19 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Interservila kunhavo ne kapabliĝis en ĉi tiu servilo",
+"Shared with you" => "Kunhavata kun vi",
+"Shared with others" => "Kunhavata kun aliaj",
+"Shared by link" => "Kunhavata per ligilo",
+"No files have been shared with you yet." => "Neniu dosiero kunhaviĝis kun vi ankoraŭ.",
+"You haven't shared any files yet." => "Vi kunhavigis neniun dosieron ankoraŭ.",
+"You haven't shared any files by link yet." => "Vi kunhavigis neniun dosieron per ligilo ankoraŭ.",
+"Add {name} from {owner}@{remote}" => "Aldoni {name} el {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "Ne troviĝis instalo de ownCloud ĉe {remote}",
+"Invalid ownCloud url" => "Nevalidas URL de ownCloud",
"Shared by {owner}" => "Kunhavigita de {owner}",
"Shared by" => "Kunhavigita de",
"This share is password-protected" => "Ĉi tiu kunhavigo estas protektata per pasvorto",
+"The password is wrong. Try again." => "La pasvorto malĝustas. Provu denove.",
"Password" => "Pasvorto",
"Name" => "Nomo",
"Sorry, this link doesn’t seem to work anymore." => "Pardonu, ĉi tiu ligilo ŝajne ne plu funkcias.",
@@ -11,7 +22,11 @@ $TRANSLATIONS = array(
"the link expired" => "la ligilo eksvalidiĝis",
"sharing is disabled" => "kunhavigo malkapablas",
"For more info, please ask the person who sent this link." => "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilon.",
+"Save to ownCloud" => "Konservi en ownCloud",
+"example.com/owncloud" => "example.com/owncloud",
+"Save" => "Konservi",
"Download" => "Elŝuti",
+"Download %s" => "Elŝuti %s",
"Direct link" => "Direkta ligilo"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
index ab6d24c9f65..1b536db41c2 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Compartir entre servidores no está habilitado en este servidor",
+"Couldn't add remote share" => "No se puede añadir un compartido remoto",
"Shared with you" => "Compartido contigo",
"Shared with others" => "Compartido con otros",
"Shared by link" => "Compartido por medio de enlaces",
"No files have been shared with you yet." => "Aún no han compartido contigo ningún archivo.",
"You haven't shared any files yet." => "Aún no has compartido ningún archivo.",
"You haven't shared any files by link yet." => "Usted todavía no ha compartido ningún archivo por medio de enlaces.",
+"Add {name} from {owner}@{remote}" => "Añadir {name} desde {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "No se encontró una instalación de ownCloud en {remote}",
+"Invalid ownCloud url" => "URL de ownCloud inválido",
"Shared by {owner}" => "Compartido por {owner}",
"Shared by" => "Compartido por",
"This share is password-protected" => "Este elemento compartido esta protegido por contraseña",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "el enlace expiró",
"sharing is disabled" => "compartir está desactivado",
"For more info, please ask the person who sent this link." => "Para mayor información, contacte a la persona que le envió el enlace.",
+"Save to ownCloud" => "Guardar en ownCloud",
+"example.com/owncloud" => "ejemplo.com/owncloud",
+"Save" => "Guardar",
"Download" => "Descargar",
"Download %s" => "Descargar %s",
-"Direct link" => "Enlace directo"
+"Direct link" => "Enlace directo",
+"Allow other instances to mount public links shared from this server" => "Permitir a otros montar enlaces publicos compartidos de este servidor",
+"Allow users to mount public link shares" => "Permitir a los usuarios montar enlaces publicos compartidos"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php
index 5fc12ca2af5..1c48d25ff42 100644
--- a/apps/files_sharing/l10n/es_AR.php
+++ b/apps/files_sharing/l10n/es_AR.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"the link expired" => "el enlace expiró",
"sharing is disabled" => "compartir está desactivado",
"For more info, please ask the person who sent this link." => "Para mayor información, contactá a la persona que te mandó el enlace.",
+"Save" => "Guardar",
"Download" => "Descargar",
"Direct link" => "Vínculo directo"
);
diff --git a/apps/files_sharing/l10n/es_MX.php b/apps/files_sharing/l10n/es_MX.php
index a7a7302def3..82683c1a3a6 100644
--- a/apps/files_sharing/l10n/es_MX.php
+++ b/apps/files_sharing/l10n/es_MX.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"the link expired" => "el enlace expiró",
"sharing is disabled" => "compartir está desactivado",
"For more info, please ask the person who sent this link." => "Para mayor información, contacte a la persona que le envió el enlace.",
+"Save" => "Guardar",
"Download" => "Descargar",
"Direct link" => "Enlace directo"
);
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index 9122c6e2360..422adf39a58 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -1,19 +1,36 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Serverist serverisse jagamine pole antud serveris lubatud",
+"Couldn't add remote share" => "Ei suutnud lisada kaugjagamist",
+"Shared with you" => "Sinuga jagatud",
+"Shared with others" => "Teistega jagatud",
+"Shared by link" => "Jagatud lingiga",
+"No files have been shared with you yet." => "Sinuga pole veel ühtegi faili jagatud.",
+"You haven't shared any files yet." => "Sa pole jaganud veel ühtegi faili.",
+"You haven't shared any files by link yet." => "Sa pole lingiga jaganud veel ühtegi faili.",
+"Add {name} from {owner}@{remote}" => "Lisa {name} kohast {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "Ei leitud ownCloud paigaldust asukohas {remote}",
+"Invalid ownCloud url" => "Vigane ownCloud url",
"Shared by {owner}" => "Jagas {owner}",
"Shared by" => "Jagas",
"This share is password-protected" => "See jagamine on parooliga kaitstud",
"The password is wrong. Try again." => "Parool on vale. Proovi uuesti.",
"Password" => "Parool",
"Name" => "Nimi",
+"Share time" => "Jagamise aeg",
"Sorry, this link doesn’t seem to work anymore." => "Vabandust, see link ei tundu enam toimivat.",
"Reasons might be:" => "Põhjused võivad olla:",
"the item was removed" => "üksus on eemaldatud",
"the link expired" => "link on aegunud",
"sharing is disabled" => "jagamine on peatatud",
"For more info, please ask the person who sent this link." => "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole.",
+"Save to ownCloud" => "Salvesta ownCloudi",
+"example.com/owncloud" => "example.com/owncloud",
+"Save" => "Salvesta",
"Download" => "Lae alla",
"Download %s" => "Laadi alla %s",
-"Direct link" => "Otsene link"
+"Direct link" => "Otsene link",
+"Allow other instances to mount public links shared from this server" => "Luba teistel instantsidel ühendada sellest serverist jagatud avalikke linke",
+"Allow users to mount public link shares" => "Luba kasutajatel ühendada jagatud avalikke linke"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index 1e18ab76593..781485285fa 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"the link expired" => "lotura iraungi da",
"sharing is disabled" => "elkarbanatzea ez dago gaituta",
"For more info, please ask the person who sent this link." => "Informazio gehiagorako, mesedez eskatu lotura hau bidali zuen pertsonari",
+"Save" => "Gorde",
"Download" => "Deskargatu",
"Download %s" => "Deskargatu %s",
"Direct link" => "Lotura zuzena"
diff --git a/apps/files_sharing/l10n/eu_ES.php b/apps/files_sharing/l10n/eu_ES.php
index e6e5bc7cbf9..a20ce90525d 100644
--- a/apps/files_sharing/l10n/eu_ES.php
+++ b/apps/files_sharing/l10n/eu_ES.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Save" => "Gorde",
"Download" => "Deskargatu"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php
index ce036184d38..e2cfd6695e7 100644
--- a/apps/files_sharing/l10n/fa.php
+++ b/apps/files_sharing/l10n/fa.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"the link expired" => "این پیوند منقضی شده است",
"sharing is disabled" => "قابلیت اشتراک گذاری غیرفعال است",
"For more info, please ask the person who sent this link." => "برای اطلاعات بیشتر، لطفا از شخصی که این پیوند را ارسال کرده سوال بفرمایید.",
+"Save" => "ذخیره",
"Download" => "دانلود",
"Download %s" => "دانلود %s",
"Direct link" => "پیوند مستقیم"
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index bec00b6ec13..16694632ec2 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Palvelimelta-palvelimelle-jakaminen ei ole käytössä tällä palvelimella",
+"Couldn't add remote share" => "Etäjaon liittäminen epäonnistui",
"Shared with you" => "Jaettu kanssasi",
"Shared with others" => "Jaettu muiden kanssa",
"Shared by link" => "Jaettu linkin kautta",
"No files have been shared with you yet." => "Kukaan ei ole jakanut tiedostoja kanssasi vielä.",
"You haven't shared any files yet." => "Et ole jakanut yhtäkään tiedostoa vielä.",
"You haven't shared any files by link yet." => "Et ole vielä jakanut yhtäkään tiedostoa linkin kautta.",
+"Add {name} from {owner}@{remote}" => "Lisää {name} käyttäjältä {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "ownCloud-asennusta ei löytynyt kohteesta {remote}",
+"Invalid ownCloud url" => "Virheellinen ownCloud-osoite",
"Shared by {owner}" => "Jakanut {owner}",
"Shared by" => "Jakanut",
"This share is password-protected" => "Tämä jako on suojattu salasanalla",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "linkki vanheni",
"sharing is disabled" => "jakaminen on poistettu käytöstä",
"For more info, please ask the person who sent this link." => "Kysy lisätietoja henkilöltä, jolta sait linkin.",
+"Save to ownCloud" => "Tallenna ownCloudiin",
+"example.com/owncloud" => "verkkotunnus.fi/owncloud",
+"Save" => "Tallenna",
"Download" => "Lataa",
"Download %s" => "Lataa %s",
-"Direct link" => "Suora linkki"
+"Direct link" => "Suora linkki",
+"Allow other instances to mount public links shared from this server" => "Salli muiden instanssien liittää tältä palvelimelta jaettuja julkisia linkkejä",
+"Allow users to mount public link shares" => "Salli käyttäjien liittää julkisia linkkijakoja"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index e00664fe09e..0d0d0567886 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Le partage de serveur à serveur n'est pas activé sur ce serveur",
+"Couldn't add remote share" => "Impossible d'ajouter un partage distant",
"Shared with you" => "Partagé avec vous",
"Shared with others" => "Partagé avec d'autres",
"Shared by link" => "Partagé par lien",
"No files have been shared with you yet." => "Aucun fichier n'est partagé avec vous pour l'instant",
"You haven't shared any files yet." => "Vous ne partagez pas de fichier pour l'instant",
"You haven't shared any files by link yet." => "Vous ne partagez aucun de fichier par lien pour l'instant.",
+"Add {name} from {owner}@{remote}" => "Ajouter {name} de {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "Aucune installation ownCloud n'a été trouvée sur {remote}",
+"Invalid ownCloud url" => "URL ownCloud invalide",
"Shared by {owner}" => "Partagé par {owner}",
"Shared by" => "Partagé par",
"This share is password-protected" => "Ce partage est protégé par un mot de passe",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "le lien a expiré",
"sharing is disabled" => "le partage est désactivé",
"For more info, please ask the person who sent this link." => "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.",
+"Save to ownCloud" => "Enregistrer dans ownCloud",
+"example.com/owncloud" => "example.com/owncloud",
+"Save" => "Sauvegarder",
"Download" => "Télécharger",
"Download %s" => "Télécharger %s",
-"Direct link" => "Lien direct"
+"Direct link" => "Lien direct",
+"Allow other instances to mount public links shared from this server" => "Autorise d'autres instances à monter des liens publiques partagés depuis ce serveur",
+"Allow users to mount public link shares" => "Autorise les utilisateurs à monter des liens de partages publiques"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php
index 7a1acb5a788..d2f690e7729 100644
--- a/apps/files_sharing/l10n/gl.php
+++ b/apps/files_sharing/l10n/gl.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Neste servidor non está activada a compartición de servidor a servidor",
+"Couldn't add remote share" => "Non foi posíbel engadir a compartición remota",
"Shared with you" => "Compartido con vostede",
"Shared with others" => "Compartido con outros",
"Shared by link" => "Compartido por ligazón",
"No files have been shared with you yet." => "Aínda non hai ficheiros compartidos con vostede.",
"You haven't shared any files yet." => "Aínda non compartiu ningún ficheiro.",
"You haven't shared any files by link yet." => "Aínda non compartiu ningún ficheiro por ligazón.",
+"Add {name} from {owner}@{remote}" => "Engadir {name} desde {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "Non se atopou unha instalación do ownCloud en {remote}",
+"Invalid ownCloud url" => "URL incorrecta do ownCloud",
"Shared by {owner}" => "Compartido por {owner}",
"Shared by" => "Compartido por",
"This share is password-protected" => "Esta compartición está protexida con contrasinal",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "a ligazón caducou",
"sharing is disabled" => "foi desactivada a compartición",
"For more info, please ask the person who sent this link." => "Para obter máis información, pregúntelle á persoa que lle enviou a ligazón.",
+"Save to ownCloud" => "Gardar no ownCloud",
+"example.com/owncloud" => "exemplo.com/owncloud",
+"Save" => "Gardar",
"Download" => "Descargar",
"Download %s" => "Descargar %s",
-"Direct link" => "Ligazón directa"
+"Direct link" => "Ligazón directa",
+"Allow other instances to mount public links shared from this server" => "Permitir que outras instancias monten ligazóns públicas compartidas desde este servidor",
+"Allow users to mount public link shares" => "Permitirlle aos usuarios montar ligazóns públicas compartidas"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php
index 923234c7cb2..9ec26a6de1a 100644
--- a/apps/files_sharing/l10n/he.php
+++ b/apps/files_sharing/l10n/he.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
"Shared by" => "שותף על־ידי",
"Password" => "סיסמא",
"Name" => "שם",
+"Save" => "שמירה",
"Download" => "הורדה"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hi.php b/apps/files_sharing/l10n/hi.php
index 47625e00207..9e3c15af39e 100644
--- a/apps/files_sharing/l10n/hi.php
+++ b/apps/files_sharing/l10n/hi.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"Shared by" => "द्वारा साझा",
-"Password" => "पासवर्ड"
+"Password" => "पासवर्ड",
+"Save" => "सहेजें"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hr.php b/apps/files_sharing/l10n/hr.php
index 45a29df4448..31d5b3eb95b 100644
--- a/apps/files_sharing/l10n/hr.php
+++ b/apps/files_sharing/l10n/hr.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Password" => "Lozinka",
"Name" => "Ime",
+"Save" => "Snimi",
"Download" => "Preuzimanje"
);
$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php
index 82683852d25..00b365fe2c9 100644
--- a/apps/files_sharing/l10n/hu_HU.php
+++ b/apps/files_sharing/l10n/hu_HU.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"the link expired" => "lejárt a link érvényességi ideje",
"sharing is disabled" => "letiltásra került a megosztás",
"For more info, please ask the person who sent this link." => "További információért forduljon ahhoz, aki ezt a linket küldte Önnek!",
+"Save" => "Mentés",
"Download" => "Letöltés",
"Direct link" => "Közvetlen link"
);
diff --git a/apps/files_sharing/l10n/hy.php b/apps/files_sharing/l10n/hy.php
index da200623e03..4de2b98e476 100644
--- a/apps/files_sharing/l10n/hy.php
+++ b/apps/files_sharing/l10n/hy.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Save" => "Պահպանել",
"Download" => "Բեռնել"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ia.php b/apps/files_sharing/l10n/ia.php
index a872a83797c..23b21e91046 100644
--- a/apps/files_sharing/l10n/ia.php
+++ b/apps/files_sharing/l10n/ia.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Password" => "Contrasigno",
"Name" => "Nomine",
+"Save" => "Salveguardar",
"Download" => "Discargar"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/id.php b/apps/files_sharing/l10n/id.php
index 6411d18462f..841169a3980 100644
--- a/apps/files_sharing/l10n/id.php
+++ b/apps/files_sharing/l10n/id.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"the link expired" => "tautan telah kadaluarsa",
"sharing is disabled" => "berbagi dinonaktifkan",
"For more info, please ask the person who sent this link." => "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini.",
+"Save" => "Simpan",
"Download" => "Unduh",
"Direct link" => "Tautan langsung"
);
diff --git a/apps/files_sharing/l10n/is.php b/apps/files_sharing/l10n/is.php
index c8e1e146c50..23bc5084208 100644
--- a/apps/files_sharing/l10n/is.php
+++ b/apps/files_sharing/l10n/is.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Shared by" => "Deilt af",
"Password" => "Lykilorð",
"Name" => "Nafn",
+"Save" => "Vista",
"Download" => "Niðurhal"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index 4c1736b2b9f..4aa95730aa1 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "La condivisione tra server non è abilitata su questo server",
+"Couldn't add remote share" => "Impossibile aggiungere la condivisione remota",
"Shared with you" => "Condiviso con te",
"Shared with others" => "Condiviso con altri",
"Shared by link" => "Condiviso tramite collegamento",
"No files have been shared with you yet." => "Non è stato ancora condiviso alcun file con te.",
"You haven't shared any files yet." => "Non hai ancora condiviso alcun file.",
"You haven't shared any files by link yet." => "Non hai ancora condiviso alcun file tramite collegamento.",
+"Add {name} from {owner}@{remote}" => "Aggiungi {name} da {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "Nessuna installazione di ownCloud trovata su {remote}",
+"Invalid ownCloud url" => "URL di ownCloud non valido",
"Shared by {owner}" => "Condiviso da {owner}",
"Shared by" => "Condiviso da",
"This share is password-protected" => "Questa condivione è protetta da password",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "il collegamento è scaduto",
"sharing is disabled" => "la condivisione è disabilitata",
"For more info, please ask the person who sent this link." => "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento.",
+"Save to ownCloud" => "Salva su ownCloud",
+"example.com/owncloud" => "esempio.com/owncloud",
+"Save" => "Salva",
"Download" => "Scarica",
"Download %s" => "Scarica %s",
-"Direct link" => "Collegamento diretto"
+"Direct link" => "Collegamento diretto",
+"Allow other instances to mount public links shared from this server" => "Permetti ad altre istanze di montare collegamenti pubblici condivisi da questo server",
+"Allow users to mount public link shares" => "Permetti agli utenti di montare condivisioni con collegamento pubblico"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ja.php b/apps/files_sharing/l10n/ja.php
index 7281be87df5..6a0b5cb3ed3 100644
--- a/apps/files_sharing/l10n/ja.php
+++ b/apps/files_sharing/l10n/ja.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
-"Shared with you" => "あなたと共有",
-"Shared with others" => "他人と共有",
-"Shared by link" => "URLリンクで共有済",
-"No files have been shared with you yet." => "まだ共有を行なっているファイルはありません。",
-"You haven't shared any files yet." => "まだ共有を行なっているファイルはありません。",
-"You haven't shared any files by link yet." => "まだURLリンクで共有を行なっているファイルはありません。",
+"Server to server sharing is not enabled on this server" => "このサーバーでは、サーバー間の共有が有効ではありません",
+"Couldn't add remote share" => "リモート共有を追加できませんでした",
+"Shared with you" => "他ユーザーがあなたと共有中",
+"Shared with others" => "他ユーザーと共有中",
+"Shared by link" => "URLリンクで共有中",
+"No files have been shared with you yet." => "他のユーザーがあなたと共有しているファイルはありません。",
+"You haven't shared any files yet." => "他のユーザーと共有しているファイルはありません。",
+"You haven't shared any files by link yet." => "URLリンクで共有しているファイルはありません。",
+"Add {name} from {owner}@{remote}" => "{owner}@{remote} から {name} を追加",
+"No ownCloud installation found at {remote}" => "{remote} には ownCloud がインストールされていません",
+"Invalid ownCloud url" => "無効な ownCloud URL です",
"Shared by {owner}" => "{owner} と共有中",
"Shared by" => "共有者:",
"This share is password-protected" => "この共有はパスワードで保護されています",
@@ -17,10 +22,15 @@ $TRANSLATIONS = array(
"Reasons might be:" => "理由は以下の通りと考えられます:",
"the item was removed" => "アイテムが削除されました",
"the link expired" => "リンクの期限が切れています",
-"sharing is disabled" => "共有が無効になっています",
+"sharing is disabled" => "共有は無効になっています",
"For more info, please ask the person who sent this link." => "不明な点は、こちらのリンクの提供者に確認をお願いします。",
+"Save to ownCloud" => "ownCloud に保存",
+"example.com/owncloud" => "example.com/owncloud",
+"Save" => "保存",
"Download" => "ダウンロード",
"Download %s" => "%s をダウンロード",
-"Direct link" => "リンク"
+"Direct link" => "リンク",
+"Allow other instances to mount public links shared from this server" => "このサーバにおけるURLでの共有を他のインスタンスからマウントできるようにする",
+"Allow users to mount public link shares" => "ユーザーがURLでの共有をマウントできるようにする"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ka_GE.php b/apps/files_sharing/l10n/ka_GE.php
index 57927466c2c..aa5c6e62693 100644
--- a/apps/files_sharing/l10n/ka_GE.php
+++ b/apps/files_sharing/l10n/ka_GE.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
"Shared by" => "აზიარებს",
"Password" => "პაროლი",
"Name" => "სახელი",
+"Save" => "შენახვა",
"Download" => "ჩამოტვირთვა"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/km.php b/apps/files_sharing/l10n/km.php
index d609345f454..a47796c8735 100644
--- a/apps/files_sharing/l10n/km.php
+++ b/apps/files_sharing/l10n/km.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"the link expired" => "តំណ​ផុត​ពេល​កំណត់",
"sharing is disabled" => "មិន​អនុញ្ញាត​ការ​ចែករំលែក",
"For more info, please ask the person who sent this link." => "សម្រាប់​ព័ត៌មាន​បន្ថែម សូម​សួរ​អ្នក​ដែល​ផ្ញើ​តំណ​នេះ។",
+"Save" => "រក្សាទុក",
"Download" => "ទាញយក",
"Download %s" => "ទាញយក %s",
"Direct link" => "តំណ​ផ្ទាល់"
diff --git a/apps/files_sharing/l10n/ko.php b/apps/files_sharing/l10n/ko.php
index 22b76509a6b..8bc272dcf9d 100644
--- a/apps/files_sharing/l10n/ko.php
+++ b/apps/files_sharing/l10n/ko.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"the link expired" => "링크가 만료됨",
"sharing is disabled" => "공유가 비활성화됨",
"For more info, please ask the person who sent this link." => "자세한 정보는 링크를 보낸 사람에게 문의하십시오.",
+"Save" => "저장",
"Download" => "다운로드",
"Direct link" => "직접 링크"
);
diff --git a/apps/files_sharing/l10n/ku_IQ.php b/apps/files_sharing/l10n/ku_IQ.php
index f7765a95398..9bb6fea1c75 100644
--- a/apps/files_sharing/l10n/ku_IQ.php
+++ b/apps/files_sharing/l10n/ku_IQ.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Password" => "وشەی تێپەربو",
"Name" => "ناو",
+"Save" => "پاشکه‌وتکردن",
"Download" => "داگرتن"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php
index f0e5b762440..7cb11d0c578 100644
--- a/apps/files_sharing/l10n/lb.php
+++ b/apps/files_sharing/l10n/lb.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
"The password is wrong. Try again." => "Den Passwuert ass incorrect. Probeier ed nach eng keier.",
"Password" => "Passwuert",
"Name" => "Numm",
+"Save" => "Späicheren",
"Download" => "Download"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
index 770a56d465b..c15319a5e09 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"the link expired" => "baigėsi nuorodos galiojimo laikas",
"sharing is disabled" => "dalinimasis yra išjungtas",
"For more info, please ask the person who sent this link." => "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą.",
+"Save" => "Išsaugoti",
"Download" => "Atsisiųsti",
"Direct link" => "Tiesioginė nuoroda"
);
diff --git a/apps/files_sharing/l10n/lv.php b/apps/files_sharing/l10n/lv.php
index 286dd431bae..29565ad8998 100644
--- a/apps/files_sharing/l10n/lv.php
+++ b/apps/files_sharing/l10n/lv.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
"Shared by" => "Dalījās",
"Password" => "Parole",
"Name" => "Nosaukums",
+"Save" => "Saglabāt",
"Download" => "Lejupielādēt"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/mk.php b/apps/files_sharing/l10n/mk.php
index 6f5a4418e7b..3db5cbd6a78 100644
--- a/apps/files_sharing/l10n/mk.php
+++ b/apps/files_sharing/l10n/mk.php
@@ -19,6 +19,7 @@ $TRANSLATIONS = array(
"the link expired" => "времетраењето на линкот е изминато",
"sharing is disabled" => "споделувањето не е дозволено",
"For more info, please ask the person who sent this link." => "За повеќе информации, прашајте го лицето кое ви ја испратила врската.",
+"Save" => "Сними",
"Download" => "Преземи",
"Download %s" => "Преземи %s",
"Direct link" => "Директна врска"
diff --git a/apps/files_sharing/l10n/ms_MY.php b/apps/files_sharing/l10n/ms_MY.php
index 63e48b38729..55cabfb9ed7 100644
--- a/apps/files_sharing/l10n/ms_MY.php
+++ b/apps/files_sharing/l10n/ms_MY.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Shared by" => "Dikongsi dengan",
"Password" => "Kata laluan",
"Name" => "Nama",
+"Save" => "Simpan",
"Download" => "Muat turun"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php
index f7b71683929..b9cc7ec90ab 100644
--- a/apps/files_sharing/l10n/nb_NO.php
+++ b/apps/files_sharing/l10n/nb_NO.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Server til server-deling er ikke aktivert på denne serveren",
+"Couldn't add remote share" => "Klarte ikke å legge til ekstern deling",
"Shared with you" => "Delt med deg",
"Shared with others" => "Delt med andre",
"Shared by link" => "Delt med lenke",
"No files have been shared with you yet." => "Ingen filer er delt med deg ennå.",
"You haven't shared any files yet." => "Du har ikke delt noen filer ennå.",
"You haven't shared any files by link yet." => "Du har ikke delt noen filer med lenke ennå.",
+"Add {name} from {owner}@{remote}" => "Legg til {name} fra {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "Ingen ownCloud-installasjon funnet på {remote}",
+"Invalid ownCloud url" => "Ugyldig ownCloud-url",
"Shared by {owner}" => "Delt av {owner}",
"Shared by" => "Delt av",
"This share is password-protected" => "Denne delingen er passordbeskyttet",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "lenken er utløpt",
"sharing is disabled" => "deling er deaktivert",
"For more info, please ask the person who sent this link." => "For mer informasjon, spør personen som sendte lenken.",
+"Save to ownCloud" => "Lagre til ownCloud",
+"example.com/owncloud" => "example.com/owncloud",
+"Save" => "Lagre",
"Download" => "Last ned",
"Download %s" => "Last ned %s",
-"Direct link" => "Direkte lenke"
+"Direct link" => "Direkte lenke",
+"Allow other instances to mount public links shared from this server" => "Tillat at andre instanser monterer offentlige lenker som er delt fra denne serveren",
+"Allow users to mount public link shares" => "Tillat at brukere monterer offentlige lenke-delinger"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php
index e027b990a20..4f01b2e79d8 100644
--- a/apps/files_sharing/l10n/nl.php
+++ b/apps/files_sharing/l10n/nl.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Server met server delen is niet geactiveerd op deze server",
+"Couldn't add remote share" => "Kon geen externe share toevoegen",
"Shared with you" => "Deelde met u",
"Shared with others" => "Deelde met anderen",
"Shared by link" => "Gedeeld via een link",
"No files have been shared with you yet." => "Er zijn nog geen bestanden met u gedeeld.",
"You haven't shared any files yet." => "U hebt nog geen bestanden gedeeld.",
"You haven't shared any files by link yet." => "U hebt nog geen bestanden via een link gedeeld.",
+"Add {name} from {owner}@{remote}" => "Toevoegen {name} van {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "Geen ownCloud installatie gevonden op {remote}",
+"Invalid ownCloud url" => "Ongeldige ownCloud url",
"Shared by {owner}" => "Gedeeld door {owner}",
"Shared by" => "Gedeeld door",
"This share is password-protected" => "Deze share is met een wachtwoord beveiligd",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "de link is verlopen",
"sharing is disabled" => "delen is uitgeschakeld",
"For more info, please ask the person who sent this link." => "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd.",
+"Save to ownCloud" => "Bewaren in ownCloud",
+"example.com/owncloud" => "example.com/owncloud",
+"Save" => "Bewaren",
"Download" => "Downloaden",
"Download %s" => "Download %s",
-"Direct link" => "Directe link"
+"Direct link" => "Directe link",
+"Allow other instances to mount public links shared from this server" => "Toestaan dat andere oanClouds openbaar gedeelde links mounten vanaf deze server",
+"Allow users to mount public link shares" => "Toestaan dat gebruikers openbaar gedeelde links mounten"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
index 34c70a554d3..543dedc925b 100644
--- a/apps/files_sharing/l10n/nn_NO.php
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
"the link expired" => "lenkja har gått ut på dato",
"sharing is disabled" => "deling er slått av",
"For more info, please ask the person who sent this link." => "Spør den som sende deg lenkje om du vil ha meir informasjon.",
+"Save" => "Lagra",
"Download" => "Last ned"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/oc.php b/apps/files_sharing/l10n/oc.php
index 2127e9dcfac..f48c39b7020 100644
--- a/apps/files_sharing/l10n/oc.php
+++ b/apps/files_sharing/l10n/oc.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Password" => "Senhal",
"Name" => "Nom",
+"Save" => "Enregistra",
"Download" => "Avalcarga"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
index 18740679e6a..7b0da90ac3d 100644
--- a/apps/files_sharing/l10n/pl.php
+++ b/apps/files_sharing/l10n/pl.php
@@ -1,11 +1,15 @@
<?php
$TRANSLATIONS = array(
+"Couldn't add remote share" => "Nie można dodać zdalnego folderu",
"Shared with you" => "Współdzielony z Tobą",
"Shared with others" => "Współdzielony z innymi",
"Shared by link" => "Współdzielony linkiem",
"No files have been shared with you yet." => "Nie ma jeszcze żadnych plików współdzielonych z Tobą",
"You haven't shared any files yet." => "Nie współdzielisz jeszcze żadnych plików.",
"You haven't shared any files by link yet." => "Nie współdzielisz jeszcze żadnych plików linkiem",
+"Add {name} from {owner}@{remote}" => "Dodaj {name} z {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "Nie znaleziono instalacji ownCloud na {remote}",
+"Invalid ownCloud url" => "Błędny adres URL",
"Shared by {owner}" => "Udostępnione przez {owner}",
"Shared by" => "Udostępniane przez",
"This share is password-protected" => "Udział ten jest chroniony hasłem",
@@ -19,8 +23,12 @@ $TRANSLATIONS = array(
"the link expired" => "link wygasł",
"sharing is disabled" => "Udostępnianie jest wyłączone",
"For more info, please ask the person who sent this link." => "Aby uzyskać więcej informacji proszę poprosić osobę, która wysłał ten link.",
+"Save to ownCloud" => "Zapis do ownCloud",
+"example.com/owncloud" => "mojastrona.pl/owncloud",
+"Save" => "Zapisz",
"Download" => "Pobierz",
"Download %s" => "Pobierz %s",
-"Direct link" => "Bezpośredni link"
+"Direct link" => "Bezpośredni link",
+"Allow users to mount public link shares" => "Zezwalaj użytkownikom na montowanie publicznych linków"
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
index 15a0b87f032..7d6f036d2a0 100644
--- a/apps/files_sharing/l10n/pt_BR.php
+++ b/apps/files_sharing/l10n/pt_BR.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Compartilhamento de servidor para servidor não está habilitado no servidor",
+"Couldn't add remote share" => "Não foi possível adicionar compartilhamento remoto",
"Shared with you" => "Compartilhado com você",
"Shared with others" => "Compartilhados com outros",
"Shared by link" => "Compartilhado por link",
"No files have been shared with you yet." => "Nenhum arquivo ainda foi compartilhado com você.",
"You haven't shared any files yet." => "Você ainda não compartilhou nenhum arquivo.",
"You haven't shared any files by link yet." => "Você ainda não compartilhou nenhum arquivo por link.",
+"Add {name} from {owner}@{remote}" => "Adicionar {name} de {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "Nenhuma instalação ownCloud encontrada em {remote}",
+"Invalid ownCloud url" => "Url invalida para ownCloud",
"Shared by {owner}" => "Compartilhado por {owner}",
"Shared by" => "Compartilhada por",
"This share is password-protected" => "Este compartilhamento esta protegido por senha",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "o link expirou",
"sharing is disabled" => "compartilhamento está desativada",
"For more info, please ask the person who sent this link." => "Para mais informações, por favor, pergunte a pessoa que enviou este link.",
+"Save to ownCloud" => "Salvar em ownCloud",
+"example.com/owncloud" => "example.com/owncloud",
+"Save" => "Salvar",
"Download" => "Baixar",
"Download %s" => "Baixar %s",
-"Direct link" => "Link direto"
+"Direct link" => "Link direto",
+"Allow other instances to mount public links shared from this server" => "Permitir que outras instâncias montem links de compartilhamentos públicos a partir desde servidor",
+"Allow users to mount public link shares" => "Permitir aos usuários montar links públicos de compartilhamentos"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index 1af1f023fd7..858d27aafa1 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "A partilha entre servidores não se encontra disponível",
+"Couldn't add remote share" => "Ocorreu um erro ao adicionar a partilha remota",
"Shared with you" => "Partilhado consigo ",
"Shared with others" => "Partilhado com outros",
"Shared by link" => "Partilhado pela hiperligação",
"No files have been shared with you yet." => "Ainda não partilhados quaisquer ficheuiros consigo.",
"You haven't shared any files yet." => "Ainda não partilhou quaisquer ficheiros.",
"You haven't shared any files by link yet." => "Ainda não partilhou quaisquer ficheiros por hiperligação.",
+"Add {name} from {owner}@{remote}" => "Adicionar {name} de {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "Não foi encontrada uma instalação em {remote}",
+"Invalid ownCloud url" => "Endereço errado",
"Shared by {owner}" => "Partilhado por {dono}",
"Shared by" => "Partilhado por",
"This share is password-protected" => "Esta partilha está protegida por senha",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "A hiperligação expirou",
"sharing is disabled" => "a partilha está desativada",
"For more info, please ask the person who sent this link." => "Para mais informação, por favor, pergunte à pessoa que lhe enviou esta hiperligação.",
+"Save to ownCloud" => "Guardar na ownCloud",
+"example.com/owncloud" => "exemplo.pt/owncloud",
+"Save" => "Guardar",
"Download" => "Transferir",
"Download %s" => "Transferir %s",
-"Direct link" => "Hiperligação direta"
+"Direct link" => "Hiperligação direta",
+"Allow other instances to mount public links shared from this server" => "Permitir que outras instâncias mapeiem endereços partilhados deste servidor",
+"Allow users to mount public link shares" => "Permitir mapeamentos de endereços partilhados aos utilizadores"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ro.php b/apps/files_sharing/l10n/ro.php
index 49ef06b5fd7..eb695c0dfba 100644
--- a/apps/files_sharing/l10n/ro.php
+++ b/apps/files_sharing/l10n/ro.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
"The password is wrong. Try again." => "Parola este incorectă. Încercaţi din nou.",
"Password" => "Parolă",
"Name" => "Nume",
+"Save" => "Salvează",
"Download" => "Descarcă"
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
index 635508ac75e..a165d634e1e 100644
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@@ -1,17 +1,22 @@
<?php
$TRANSLATIONS = array(
+"Shared with you" => "Опубликованы вами",
+"Shared with others" => "Опубликованы другими",
+"No files have been shared with you yet." => "Вы ещё не опубликовали файлы",
"Shared by {owner}" => "Доступ открыл {owner}",
"Shared by" => "Опубликовано",
"This share is password-protected" => "Для доступа к информации необходимо ввести пароль",
"The password is wrong. Try again." => "Неверный пароль. Попробуйте еще раз.",
"Password" => "Пароль",
"Name" => "Имя",
+"Share time" => "Дата публикации",
"Sorry, this link doesn’t seem to work anymore." => "Эта ссылка устарела и более не действительна.",
"Reasons might be:" => "Причиной может быть:",
"the item was removed" => "объект был удалён",
"the link expired" => "срок действия ссылки истёк",
"sharing is disabled" => "доступ к информации заблокирован",
"For more info, please ask the person who sent this link." => "Для получения дополнительной информации, пожалуйста, свяжитесь с тем, кто отправил Вам эту ссылку.",
+"Save" => "Сохранить",
"Download" => "Скачать",
"Download %s" => "Скачать %s",
"Direct link" => "Прямая ссылка"
diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php
index bd71de99b34..68e208a2045 100644
--- a/apps/files_sharing/l10n/si_LK.php
+++ b/apps/files_sharing/l10n/si_LK.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Password" => "මුර පදය",
"Name" => "නම",
+"Save" => "සුරකින්න",
"Download" => "බාන්න"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/sk.php b/apps/files_sharing/l10n/sk.php
index 72c9039571e..2b2c7995f8d 100644
--- a/apps/files_sharing/l10n/sk.php
+++ b/apps/files_sharing/l10n/sk.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Save" => "Uložiť",
"Download" => "Stiahnuť"
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php
index 379fb03c491..b8471370e83 100644
--- a/apps/files_sharing/l10n/sk_SK.php
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Zdieľanie server-server nie je na tomto serveri povolené",
+"Couldn't add remote share" => "Nemožno pridať vzdialené zdieľanie",
"Shared with you" => "Zdieľané s vami",
"Shared with others" => "Zdieľané s ostanými",
"Shared by link" => "Zdieľané pomocou odkazu",
"No files have been shared with you yet." => "Zatiaľ s vami nikto žiadne súbory nezdieľal.",
"You haven't shared any files yet." => "Zatiaľ ste nezdieľali žiadne súbory.",
"You haven't shared any files by link yet." => "Zatiaľ ste pomocou odkazu nezdieľali žiaden súbor.",
+"Add {name} from {owner}@{remote}" => "Pridať {name} z {owner}@{remote}",
+"No ownCloud installation found at {remote}" => "Žiadna ownCloud inštancia na {remote}",
+"Invalid ownCloud url" => "Chybná ownCloud url",
"Shared by {owner}" => "Zdieľa {owner}",
"Shared by" => "Zdieľa",
"This share is password-protected" => "Toto zdieľanie je chránené heslom",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "linke vypršala platnosť",
"sharing is disabled" => "zdieľanie je zakázané",
"For more info, please ask the person who sent this link." => "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz.",
+"Save to ownCloud" => "Uložiť do ownCloud",
+"example.com/owncloud" => "example.com/owncloud",
+"Save" => "Uložiť",
"Download" => "Sťahovanie",
"Download %s" => "Stiahnuť %s",
-"Direct link" => "Priama linka"
+"Direct link" => "Priama linka",
+"Allow other instances to mount public links shared from this server" => "Povoliť ďalším inštanciám pripojiť verejné odkazy zdieľané z tohto servera",
+"Allow users to mount public link shares" => "Povoliť používateľom pripojiť sa na zdieľané verejné odkazy"
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index 972432abec6..1638f0aeca8 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -19,6 +19,7 @@ $TRANSLATIONS = array(
"the link expired" => "povezava je pretekla,",
"sharing is disabled" => "souporaba je onemogočena.",
"For more info, please ask the person who sent this link." => "Za več podrobnosti stopite v stik s pošiljateljem te povezave.",
+"Save" => "Shrani",
"Download" => "Prejmi",
"Download %s" => "Prejmi %s",
"Direct link" => "Neposredna povezava"
diff --git a/apps/files_sharing/l10n/sq.php b/apps/files_sharing/l10n/sq.php
index ee8207e6d91..1ede243589a 100644
--- a/apps/files_sharing/l10n/sq.php
+++ b/apps/files_sharing/l10n/sq.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
"the link expired" => "lidhja ka skaduar",
"sharing is disabled" => "ndarja është çaktivizuar",
"For more info, please ask the person who sent this link." => "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje.",
+"Save" => "Ruaj",
"Download" => "Shkarko",
"Direct link" => "Lidhje direkte"
);
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index e5b72d3a501..9f5a1c28b32 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Shared by" => "Делио",
"Password" => "Лозинка",
"Name" => "Име",
+"Save" => "Сачувај",
"Download" => "Преузми"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/sr@latin.php b/apps/files_sharing/l10n/sr@latin.php
index a0cf64c0f1d..cd57f190261 100644
--- a/apps/files_sharing/l10n/sr@latin.php
+++ b/apps/files_sharing/l10n/sr@latin.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Password" => "Lozinka",
"Name" => "Ime",
+"Save" => "Snimi",
"Download" => "Preuzmi"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index 19430c1ff95..a233eb7bbb9 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -19,6 +19,7 @@ $TRANSLATIONS = array(
"the link expired" => "giltighet för länken har gått ut",
"sharing is disabled" => "delning är inaktiverat",
"For more info, please ask the person who sent this link." => "För mer information, kontakta den person som skickade den här länken.",
+"Save" => "Spara",
"Download" => "Ladda ner",
"Download %s" => "Ladda ner %s",
"Direct link" => "Direkt länk"
diff --git a/apps/files_sharing/l10n/ta_LK.php b/apps/files_sharing/l10n/ta_LK.php
index c1b451ae7f8..05cb577f123 100644
--- a/apps/files_sharing/l10n/ta_LK.php
+++ b/apps/files_sharing/l10n/ta_LK.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Shared by {owner}" => "பகிரப்பட்டது {சொந்தகாரர்}",
"Password" => "கடவுச்சொல்",
"Name" => "பெயர்",
+"Save" => "சேமிக்க ",
"Download" => "பதிவிறக்குக"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/te.php b/apps/files_sharing/l10n/te.php
index e9da4e6963d..c2e3956d753 100644
--- a/apps/files_sharing/l10n/te.php
+++ b/apps/files_sharing/l10n/te.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"Password" => "సంకేతపదం",
-"Name" => "పేరు"
+"Name" => "పేరు",
+"Save" => "భద్రపరచు"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
index fdb9555babe..a0aa6c130ec 100644
--- a/apps/files_sharing/l10n/th_TH.php
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
"Shared by" => "ถูกแชร์โดย",
"Password" => "รหัสผ่าน",
"Name" => "ชื่อ",
+"Save" => "บันทึก",
"Download" => "ดาวน์โหลด"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php
index 90970dc762e..acf1620a6a1 100644
--- a/apps/files_sharing/l10n/tr.php
+++ b/apps/files_sharing/l10n/tr.php
@@ -1,11 +1,16 @@
<?php
$TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "Sunucudan sunucuya paylaşım bu sunucuda etkin değil",
+"Couldn't add remote share" => "Uzak paylaşım eklenemedi",
"Shared with you" => "Sizinle paylaşılmış",
"Shared with others" => "Diğerleri ile paylaşılmış",
"Shared by link" => "Bağlantı ile paylaşılmış",
"No files have been shared with you yet." => "Henüz sizinle paylaşılan bir dosya yok.",
"You haven't shared any files yet." => "Henüz hiçbir dosya paylaşmadınız.",
"You haven't shared any files by link yet." => "Bağlantı ile henüz hiçbir dosya paylaşmadınız.",
+"Add {name} from {owner}@{remote}" => "{name} paylaşımını {owner}@{remote} konumundan ekle",
+"No ownCloud installation found at {remote}" => "{remote} üzerinde ownCloud kurulumu bulunamadı",
+"Invalid ownCloud url" => "Geçersiz ownCloud adresi",
"Shared by {owner}" => "{owner} tarafından paylaşılmış",
"Shared by" => "Paylaşan",
"This share is password-protected" => "Bu paylaşım parola korumalı",
@@ -19,8 +24,13 @@ $TRANSLATIONS = array(
"the link expired" => "bağlantı süresi dolmuş",
"sharing is disabled" => "paylaşım devre dışı",
"For more info, please ask the person who sent this link." => "Daha fazla bilgi için bu bağlantıyı aldığınız kişi ile iletişime geçin.",
+"Save to ownCloud" => "ownCloud'a kaydet",
+"example.com/owncloud" => "örnek.com/owncloud",
+"Save" => "Kaydet",
"Download" => "İndir",
"Download %s" => "İndir: %s",
-"Direct link" => "Doğrudan bağlantı"
+"Direct link" => "Doğrudan bağlantı",
+"Allow other instances to mount public links shared from this server" => "Diğer örneklerin, bu sunucudan paylaşılmış herkese açık bağlantıları bağlamasına izin ver",
+"Allow users to mount public link shares" => "Kullanıcıların herkese açık bağlantı paylaşımlarını bağlamasına izin ver"
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/ug.php b/apps/files_sharing/l10n/ug.php
index 544f2f3f76c..98e0f9db40a 100644
--- a/apps/files_sharing/l10n/ug.php
+++ b/apps/files_sharing/l10n/ug.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Shared by" => "ھەمبەھىرلىگۈچى",
"Password" => "ئىم",
"Name" => "ئاتى",
+"Save" => "ساقلا",
"Download" => "چۈشۈر"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
index 0033c5036e3..dc5cc41c7f0 100644
--- a/apps/files_sharing/l10n/uk.php
+++ b/apps/files_sharing/l10n/uk.php
@@ -12,7 +12,9 @@ $TRANSLATIONS = array(
"the link expired" => "посилання застаріло",
"sharing is disabled" => "обмін заборонений",
"For more info, please ask the person who sent this link." => "Для отримання додаткової інформації, будь ласка, зверніться до особи, яка надіслала це посилання.",
+"Save" => "Зберегти",
"Download" => "Завантажити",
+"Download %s" => "Завантажити %s",
"Direct link" => "Пряме посилання"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/ur_PK.php b/apps/files_sharing/l10n/ur_PK.php
index f96b0c0cba0..5f2b23b6e47 100644
--- a/apps/files_sharing/l10n/ur_PK.php
+++ b/apps/files_sharing/l10n/ur_PK.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Shared by" => "سے اشتراک شدہ",
"Password" => "پاسورڈ",
"Name" => "اسم",
+"Save" => "حفظ",
"Download" => "ڈاؤن لوڈ،"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/vi.php b/apps/files_sharing/l10n/vi.php
index 33c0d2188d8..7427e33ff6b 100644
--- a/apps/files_sharing/l10n/vi.php
+++ b/apps/files_sharing/l10n/vi.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
"Shared by" => "Chia sẻ bởi",
"Password" => "Mật khẩu",
"Name" => "Tên",
+"Save" => "Lưu",
"Download" => "Tải về"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php
index 0a8c0950497..32341d75f36 100644
--- a/apps/files_sharing/l10n/zh_CN.php
+++ b/apps/files_sharing/l10n/zh_CN.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"the link expired" => "链接过期",
"sharing is disabled" => "共享已禁用",
"For more info, please ask the person who sent this link." => "欲知详情,请联系发给你链接的人。",
+"Save" => "保存",
"Download" => "下载",
"Download %s" => "下载 %s",
"Direct link" => "直接链接"
diff --git a/apps/files_sharing/l10n/zh_HK.php b/apps/files_sharing/l10n/zh_HK.php
index 9856b504cfa..a68e19dae44 100644
--- a/apps/files_sharing/l10n/zh_HK.php
+++ b/apps/files_sharing/l10n/zh_HK.php
@@ -2,6 +2,7 @@
$TRANSLATIONS = array(
"Password" => "密碼",
"Name" => "名稱",
+"Save" => "儲存",
"Download" => "下載"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index d603059ec9e..60c8faee782 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"the link expired" => "連結過期",
"sharing is disabled" => "分享功能已停用",
"For more info, please ask the person who sent this link." => "請詢問告訴您此連結的人以瞭解更多",
+"Save" => "儲存",
"Download" => "下載"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 7a6b70d82b5..6bc9e131949 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -95,9 +95,9 @@ class Shared_Cache extends Cache {
}
$data['uid_owner'] = $this->storage->getOwner($file);
if (isset($data['permissions'])) {
- $data['permissions'] &= $this->storage->getPermissions('');
+ $data['permissions'] &= $this->storage->getPermissions($file);
} else {
- $data['permissions'] = $this->storage->getPermissions('');
+ $data['permissions'] = $this->storage->getPermissions($file);
}
return $data;
}
@@ -163,7 +163,7 @@ class Shared_Cache extends Cache {
$sourceFolderContent[$key]['path'] = $dir . $c['name'];
$sourceFolderContent[$key]['uid_owner'] = $parent['uid_owner'];
$sourceFolderContent[$key]['displayname_owner'] = $parent['uid_owner'];
- $sourceFolderContent[$key]['permissions'] = $sourceFolderContent[$key]['permissions'] & $this->storage->getPermissions('');
+ $sourceFolderContent[$key]['permissions'] = $sourceFolderContent[$key]['permissions'] & $this->storage->getPermissions($dir . $c['name']);
}
return $sourceFolderContent;
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 70a0e98ebd5..4441a72fb16 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -67,7 +67,7 @@ class Manager {
}
}
- public function setup() {
+ private function setupMounts() {
// don't setup server-to-server shares if the file_external app is disabled
// FIXME no longer needed if we use the webdav implementation from core
if (\OC_App::isEnabled('files_external') === false) {
@@ -88,6 +88,16 @@ class Manager {
}
}
+ public static function setup() {
+ $externalManager = new \OCA\Files_Sharing\External\Manager(
+ \OC::$server->getDatabaseConnection(),
+ \OC\Files\Filesystem::getMountManager(),
+ \OC\Files\Filesystem::getLoader(),
+ \OC::$server->getUserSession()
+ );
+ $externalManager->setupMounts();
+ }
+
protected function stripPath($path) {
$prefix = '/' . $this->userSession->getUser()->getUID() . '/files';
return rtrim(substr($path, strlen($prefix)), '/');
diff --git a/apps/files_sharing/lib/external/storage.php b/apps/files_sharing/lib/external/storage.php
index cd04841bb09..2771f974614 100644
--- a/apps/files_sharing/lib/external/storage.php
+++ b/apps/files_sharing/lib/external/storage.php
@@ -37,9 +37,9 @@ class Storage extends DAV implements ISharedStorage {
$this->remote = $options['remote'];
$this->remoteUser = $options['owner'];
list($protocol, $remote) = explode('://', $this->remote);
- list($host, $root) = explode('/', $remote);
+ list($host, $root) = explode('/', $remote, 2);
$secure = $protocol === 'https';
- $root .= '/public.php/webdav';
+ $root = rtrim($root, '/') . '/public.php/webdav';
$this->mountPoint = $options['mountpoint'];
$this->token = $options['token'];
parent::__construct(array(
diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php
index 34de3a915ab..0b3433576f6 100644
--- a/apps/files_sharing/lib/helper.php
+++ b/apps/files_sharing/lib/helper.php
@@ -7,6 +7,20 @@ use PasswordHash;
class Helper {
+ public static function registerHooks() {
+ \OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+ \OCP\Util::connectHook('OC_Filesystem', 'setup', '\OCA\Files_Sharing\External\Manager', 'setup');
+ \OCP\Util::connectHook('OC_Filesystem', 'post_write', '\OC\Files\Cache\Shared_Updater', 'writeHook');
+ \OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Shared_Updater', 'postDeleteHook');
+ \OCP\Util::connectHook('OC_Filesystem', 'delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook');
+ \OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
+ \OCP\Util::connectHook('OC_Appconfig', 'post_set_value', '\OCA\Files\Share\Maintainer', 'configChangeHook');
+
+ \OCP\Util::connectHook('OCP\Share', 'post_shared', '\OC\Files\Cache\Shared_Updater', 'postShareHook');
+ \OCP\Util::connectHook('OCP\Share', 'post_unshare', '\OC\Files\Cache\Shared_Updater', 'postUnshareHook');
+ \OCP\Util::connectHook('OCP\Share', 'post_unshareFromSelf', '\OC\Files\Cache\Shared_Updater', 'postUnshareFromSelfHook');
+ }
+
/**
* Sets up the filesystem and user for public sharing
* @param string $token string share token
diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php
index 5cb2b638e5a..e114c3ba0ac 100644
--- a/apps/files_sharing/lib/updater.php
+++ b/apps/files_sharing/lib/updater.php
@@ -133,6 +133,68 @@ class Shared_Updater {
}
/**
+ * update etags if a file was shared
+ * @param array $params
+ */
+ static public function postShareHook($params) {
+
+ if ($params['itemType'] === 'folder' || $params['itemType'] === 'file') {
+
+ $shareWith = $params['shareWith'];
+ $shareType = $params['shareType'];
+
+ if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
+ self::correctUsersFolder($shareWith, '/');
+ } elseif ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
+ foreach (\OC_Group::usersInGroup($shareWith) as $user) {
+ self::correctUsersFolder($user, '/');
+ }
+ }
+ }
+ }
+
+ /**
+ * update etags if a file was unshared
+ *
+ * @param array $params
+ */
+ static public function postUnshareHook($params) {
+
+ if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+
+ $deletedShares = isset($params['deletedShares']) ? $params['deletedShares'] : array();
+
+ foreach ($deletedShares as $share) {
+ if ($share['shareType'] === \OCP\Share::SHARE_TYPE_GROUP) {
+ foreach (\OC_Group::usersInGroup($share['shareWith']) as $user) {
+ self::correctUsersFolder($user, dirname($share['fileTarget']));
+ }
+ } else {
+ self::correctUsersFolder($share['shareWith'], dirname($share['fileTarget']));
+ }
+ }
+ }
+ }
+
+ /**
+ * update etags if file was unshared from self
+ * @param array $params
+ */
+ static public function postUnshareFromSelfHook($params) {
+ if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+ foreach ($params['unsharedItems'] as $item) {
+ if ($item['shareType'] === \OCP\Share::SHARE_TYPE_GROUP) {
+ foreach (\OC_Group::usersInGroup($item['shareWith']) as $user) {
+ self::correctUsersFolder($user, dirname($item['fileTarget']));
+ }
+ } else {
+ self::correctUsersFolder($item['shareWith'], dirname($item['fileTarget']));
+ }
+ }
+ }
+ }
+
+ /**
* clean up oc_share table from files which are no longer exists
*
* This fixes issues from updates from files_sharing < 0.3.5.6 (ownCloud 4.5)
diff --git a/apps/files_sharing/templates/settings-admin.php b/apps/files_sharing/templates/settings-admin.php
index 18cf2276701..7c84f770fa6 100644
--- a/apps/files_sharing/templates/settings-admin.php
+++ b/apps/files_sharing/templates/settings-admin.php
@@ -1,6 +1,6 @@
<div class="section" id="fileSharingSettings" >
- <h2><?php p($l->t('File Sharing'));?></h2>
+ <h2><?php p($l->t('Remote Shares'));?></h2>
<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled"
value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
diff --git a/apps/files_sharing/tests/externalstorage.php b/apps/files_sharing/tests/externalstorage.php
new file mode 100644
index 00000000000..60c5787f295
--- /dev/null
+++ b/apps/files_sharing/tests/externalstorage.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Vincent Petry
+ * @copyright 2014 Vincent Petry <pvince81@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/>.
+ *
+ */
+
+require_once __DIR__ . '/base.php';
+
+/**
+ * Tests for the external Storage class for remote shares.
+ */
+class Test_Files_Sharing_External_Storage extends \PHPUnit_Framework_TestCase {
+
+ function optionsProvider() {
+ return array(
+ array(
+ 'http://remoteserver:8080/owncloud',
+ 'http://remoteserver:8080/owncloud/public.php/webdav/',
+ ),
+ // extra slash
+ array(
+ 'http://remoteserver:8080/owncloud/',
+ 'http://remoteserver:8080/owncloud/public.php/webdav/',
+ ),
+ // extra path
+ array(
+ 'http://remoteserver:8080/myservices/owncloud/',
+ 'http://remoteserver:8080/myservices/owncloud/public.php/webdav/',
+ ),
+ // root path
+ array(
+ 'http://remoteserver:8080/',
+ 'http://remoteserver:8080/public.php/webdav/',
+ ),
+ // without port
+ array(
+ 'http://remoteserver/oc.test',
+ 'http://remoteserver/oc.test/public.php/webdav/',
+ ),
+ // https
+ array(
+ 'https://remoteserver/',
+ 'https://remoteserver/public.php/webdav/',
+ ),
+ );
+ }
+
+ /**
+ * @dataProvider optionsProvider
+ */
+ public function testStorageMountOptions($inputUri, $baseUri) {
+ $storage = new TestSharingExternalStorage(
+ array(
+ 'remote' => $inputUri,
+ 'owner' => 'testOwner',
+ 'mountpoint' => 'remoteshare',
+ 'token' => 'abcdef',
+ 'password' => '',
+ )
+ );
+ $this->assertEquals($baseUri, $storage->getBaseUri());
+ }
+}
+
+/**
+ * Dummy subclass to make it possible to access private members
+ */
+class TestSharingExternalStorage extends \OCA\Files_Sharing\External\Storage {
+
+ public function getBaseUri() {
+ return $this->createBaseUri();
+ }
+}
diff --git a/apps/files_sharing/tests/js/appSpec.js b/apps/files_sharing/tests/js/appSpec.js
index 9c46b7caf1b..d0480ad1aa4 100644
--- a/apps/files_sharing/tests/js/appSpec.js
+++ b/apps/files_sharing/tests/js/appSpec.js
@@ -47,6 +47,8 @@ describe('OCA.Sharing.App tests', function() {
afterEach(function() {
App._inFileList = null;
App._outFileList = null;
+ fileListIn.destroy();
+ fileListOut.destroy();
fileListIn = null;
fileListOut = null;
});
diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js
index 455addaccc0..3d4fc754821 100644
--- a/apps/files_sharing/tests/js/shareSpec.js
+++ b/apps/files_sharing/tests/js/shareSpec.js
@@ -70,6 +70,8 @@ describe('OCA.Sharing.Util tests', function() {
OCA.Files.FileList.prototype = oldFileListPrototype;
delete OCA.Sharing.sharesLoaded;
delete OC.Share.droppedDown;
+ fileList.destroy();
+ fileList = null;
OC.Share.statuses = {};
OC.Share.currentShares = {};
});
diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js
index 0f6d0a0ba49..4e130885500 100644
--- a/apps/files_sharing/tests/js/sharedfilelistSpec.js
+++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js
@@ -55,6 +55,7 @@ describe('OCA.Sharing.FileList tests', function() {
afterEach(function() {
OCA.Files.FileList.prototype = oldFileListPrototype;
testFiles = undefined;
+ fileList.destroy();
fileList = undefined;
fileActions = undefined;
diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php
index 2cbc412d261..299e471a3fd 100644
--- a/apps/files_sharing/tests/permissions.php
+++ b/apps/files_sharing/tests/permissions.php
@@ -145,10 +145,9 @@ class Test_Files_Sharing_Permissions extends Test_Files_Sharing_Base {
$this->assertEquals(27, $contents[1]['permissions']);
$contents = $this->secondView->getDirectoryContent('files/shareddirrestricted');
$this->assertEquals('subdir', $contents[0]['name']);
- $this->assertEquals(7 | \OCP\PERMISSION_DELETE, $contents[0]['permissions']);
+ $this->assertEquals(7, $contents[0]['permissions']);
$this->assertEquals('textfile1.txt', $contents[1]['name']);
// 3 is correct because create is reserved to folders only
- // delete permissions are added since mount points can always be deleted
- $this->assertEquals(3 | \OCP\PERMISSION_DELETE, $contents[1]['permissions']);
+ $this->assertEquals(3, $contents[1]['permissions']);
}
}
diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php
index b80ab6b4f14..27f3b5150d5 100644
--- a/apps/files_sharing/tests/sharedstorage.php
+++ b/apps/files_sharing/tests/sharedstorage.php
@@ -166,4 +166,35 @@ class Test_Files_Sharing_Storage extends Test_Files_Sharing_Base {
$this->assertTrue($result);
}
+ function testGetPermissions() {
+ $fileinfoFolder = $this->view->getFileInfo($this->folder);
+
+ $result = \OCP\Share::shareItem('folder', $fileinfoFolder['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ self::TEST_FILES_SHARING_API_USER2, 1);
+ $this->assertTrue($result);
+
+ self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+ $this->assertTrue(\OC\Files\Filesystem::is_dir($this->folder));
+
+ // for the share root we expect:
+ // the shared permissions (1)
+ // the delete permission (8), to enable unshare
+ // the update permission (2), to allow renaming of the mount point
+ $rootInfo = \OC\Files\Filesystem::getFileInfo($this->folder);
+ $this->assertSame(11, $rootInfo->getPermissions());
+
+ // for the file within the shared folder we expect:
+ // the shared permissions (1)
+ $subfileInfo = \OC\Files\Filesystem::getFileInfo($this->folder . $this->filename);
+ $this->assertSame(1, $subfileInfo->getPermissions());
+
+
+ //cleanup
+ self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+ $result = \OCP\Share::unshare('folder', $fileinfoFolder['fileid'], \OCP\Share::SHARE_TYPE_USER,
+ self::TEST_FILES_SHARING_API_USER2);
+ $this->assertTrue($result);
+ }
+
}
diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php
index 8183e7067a4..cdb44068254 100644
--- a/apps/files_sharing/tests/updater.php
+++ b/apps/files_sharing/tests/updater.php
@@ -28,14 +28,19 @@ require_once __DIR__ . '/base.php';
*/
class Test_Files_Sharing_Updater extends Test_Files_Sharing_Base {
- const TEST_FOLDER_NAME = '/folder_share_api_test';
+ const TEST_FOLDER_NAME = '/folder_share_updater_test';
+
+ public static function setUpBeforeClass() {
+ parent::setUpBeforeClass();
+ \OCA\Files_Sharing\Helper::registerHooks();
+ }
function setUp() {
parent::setUp();
$this->folder = self::TEST_FOLDER_NAME;
- $this->filename = '/share-api-test.txt';
+ $this->filename = '/share-updater-test.txt';
// save file with content
$this->view->file_put_contents($this->filename, $this->data);
@@ -104,6 +109,112 @@ class Test_Files_Sharing_Updater extends Test_Files_Sharing_Base {
if ($status === false) {
\OC_App::disable('files_trashbin');
}
+ // cleanup
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER1);
+ $result = \OCP\Share::unshare('folder', $fileinfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2);
+ $this->assertTrue($result);
+ }
+
+ /**
+ * if a file gets shared the etag for the recipients root should change
+ */
+ function testShareFile() {
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+ $beforeShare = \OC\Files\Filesystem::getFileInfo('');
+ $etagBeforeShare = $beforeShare->getEtag();
+
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER1);
+ $fileinfo = \OC\Files\Filesystem::getFileInfo($this->folder);
+ $result = \OCP\Share::shareItem('folder', $fileinfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
+ $this->assertTrue($result);
+
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+ $afterShare = \OC\Files\Filesystem::getFileInfo('');
+ $etagAfterShare = $afterShare->getEtag();
+
+ $this->assertTrue(is_string($etagBeforeShare));
+ $this->assertTrue(is_string($etagAfterShare));
+ $this->assertTrue($etagBeforeShare !== $etagAfterShare);
+
+ // cleanup
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER1);
+ $result = \OCP\Share::unshare('folder', $fileinfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2);
+ $this->assertTrue($result);
+ }
+
+ /**
+ * if a file gets unshared by the owner the etag for the recipients root should change
+ */
+ function testUnshareFile() {
+
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER1);
+ $fileinfo = \OC\Files\Filesystem::getFileInfo($this->folder);
+ $result = \OCP\Share::shareItem('folder', $fileinfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
+ $this->assertTrue($result);
+
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+ $beforeUnshare = \OC\Files\Filesystem::getFileInfo('');
+ $etagBeforeUnshare = $beforeUnshare->getEtag();
+
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER1);
+ $result = \OCP\Share::unshare('folder', $fileinfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2);
+ $this->assertTrue($result);
+
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+ $afterUnshare = \OC\Files\Filesystem::getFileInfo('');
+ $etagAfterUnshare = $afterUnshare->getEtag();
+
+ $this->assertTrue(is_string($etagBeforeUnshare));
+ $this->assertTrue(is_string($etagAfterUnshare));
+ $this->assertTrue($etagBeforeUnshare !== $etagAfterUnshare);
+
+ }
+
+ /**
+ * if a file gets unshared from self the etag for the recipients root should change
+ */
+ function testUnshareFromSelfFile() {
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER1);
+ $fileinfo = \OC\Files\Filesystem::getFileInfo($this->folder);
+ $result = \OCP\Share::shareItem('folder', $fileinfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
+ $this->assertTrue($result);
+
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+ $result = \OCP\Share::shareItem('folder', $fileinfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER3, 31);
+
+ $beforeUnshareUser2 = \OC\Files\Filesystem::getFileInfo('');
+ $etagBeforeUnshareUser2 = $beforeUnshareUser2->getEtag();
+
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER3);
+
+ $beforeUnshareUser3 = \OC\Files\Filesystem::getFileInfo('');
+ $etagBeforeUnshareUser3 = $beforeUnshareUser3->getEtag();
+
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+ $result = \OC\Files\Filesystem::unlink($this->folder);
+ $this->assertTrue($result);
+
+ $afterUnshareUser2 = \OC\Files\Filesystem::getFileInfo('');
+ $etagAfterUnshareUser2 = $afterUnshareUser2->getEtag();
+
+ $this->loginHelper(self::TEST_FILES_SHARING_API_USER3);
+
+ $afterUnshareUser3 = \OC\Files\Filesystem::getFileInfo('');
+ $etagAfterUnshareUser3 = $afterUnshareUser3->getEtag();
+
+ $this->assertTrue(is_string($etagBeforeUnshareUser2));
+ $this->assertTrue(is_string($etagBeforeUnshareUser3));
+ $this->assertTrue(is_string($etagAfterUnshareUser2));
+ $this->assertTrue(is_string($etagAfterUnshareUser3));
+ $this->assertTrue($etagBeforeUnshareUser2 !== $etagAfterUnshareUser2);
+ $this->assertTrue($etagBeforeUnshareUser3 !== $etagAfterUnshareUser3);
+
}
}
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index ebabc5bc7a2..9d9c1dd100f 100644
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -37,7 +37,7 @@ foreach ($list as $file) {
$timestamp = null;
}
- OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp);
+ OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp);
if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) {
$error[] = $filename;
OC_Log::write('trashbin','can\'t delete ' . $filename . ' permanently.', OC_Log::ERROR);
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
index e1f52e814bb..6cad101d34a 100644
--- a/apps/files_trashbin/ajax/list.php
+++ b/apps/files_trashbin/ajax/list.php
@@ -10,7 +10,7 @@ $data = array();
// make filelist
try {
- $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, $sortAttribute, $sortDirection);
+ $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
} catch (Exception $e) {
header("HTTP/1.0 404 Not Found");
exit();
diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index 2b00078669e..afab79fcac6 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -16,7 +16,7 @@ if (isset($_POST['allfiles']) and $_POST['allfiles'] === 'true') {
if ($dir === '' || $dir === '/') {
$dirListing = false;
}
- foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir) as $file) {
+ foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) {
$fileName = $file['name'];
if (!$dirListing) {
$fileName .= '.d' . $file['mtime'];
diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css
index 04b4a175c83..64e462e2e8a 100644
--- a/apps/files_trashbin/css/trash.css
+++ b/apps/files_trashbin/css/trash.css
@@ -11,3 +11,7 @@
#app-content-trashbin tbody tr[data-type="file"] td a.name span {
cursor: default;
}
+
+#app-content-trashbin .summary :last-child {
+ padding: 0;
+}
diff --git a/apps/files_trashbin/l10n/uk.php b/apps/files_trashbin/l10n/uk.php
index 328e8da5e02..406bd520c29 100644
--- a/apps/files_trashbin/l10n/uk.php
+++ b/apps/files_trashbin/l10n/uk.php
@@ -2,7 +2,7 @@
$TRANSLATIONS = array(
"Couldn't delete %s permanently" => "Неможливо видалити %s назавжди",
"Couldn't restore %s" => "Неможливо відновити %s",
-"Deleted files" => "Видалено файлів",
+"Deleted files" => "Видалені файли",
"Restore" => "Відновити",
"Error" => "Помилка",
"restored" => "відновлено",
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index ebedce31abe..d0ca5fb1530 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -11,14 +11,14 @@ class Helper
*
* @param string $dir path to the directory inside the trashbin
* or empty to retrieve the root of the trashbin
+ * @param string $user
* @param string $sortAttribute attribute to sort on or empty to disable sorting
* @param bool $sortDescending true for descending sort, false otherwise
* @return \OCP\Files\FileInfo[]
*/
- public static function getTrashFiles($dir, $sortAttribute = '', $sortDescending = false){
+ public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDescending = false){
$result = array();
$timestamp = null;
- $user = \OCP\User::getUser();
$view = new \OC\Files\View('/' . $user . '/files_trashbin/files');
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 1838c48d95d..522f7d4b7e3 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -510,7 +510,7 @@ class Trashbin {
$sharingEnabled = \OCP\Share::isEnabled();
// get users sharing this file
- $usersSharing = $util->getSharingUsersArray($sharingEnabled, $target, $user);
+ $usersSharing = $util->getSharingUsersArray($sharingEnabled, $target);
// Attempt to set shareKey
$util->setSharedFileKeyfiles($session, $usersSharing, $target);
@@ -540,12 +540,12 @@ class Trashbin {
* delete file from trash bin permanently
*
* @param string $filename path to the file
+ * @param string $user
* @param int $timestamp of deletion time
*
* @return int size of deleted files
*/
- public static function delete($filename, $timestamp = null) {
- $user = \OCP\User::getUser();
+ public static function delete($filename, $user, $timestamp = null) {
$view = new \OC\Files\View('/' . $user);
$size = 0;
@@ -667,11 +667,11 @@ class Trashbin {
* calculate remaining free space for trash bin
*
* @param integer $trashbinSize current size of the trash bin
+ * @param string $user
* @return int available free space for trash bin
*/
- private static function calculateFreeSpace($trashbinSize) {
+ private static function calculateFreeSpace($trashbinSize, $user) {
$softQuota = true;
- $user = \OCP\User::getUser();
$quota = \OC_Preferences::getValue($user, 'files', 'quota');
$view = new \OC\Files\View('/' . $user);
if ($quota === null || $quota === 'default') {
@@ -709,7 +709,7 @@ class Trashbin {
$size = self::getTrashbinSize($user);
- $freeSpace = self::calculateFreeSpace($size);
+ $freeSpace = self::calculateFreeSpace($size, $user);
if ($freeSpace < 0) {
self::expire($size, $user);
@@ -725,50 +725,84 @@ class Trashbin {
*/
private static function expire($trashbinSize, $user) {
- $view = new \OC\Files\View('/' . $user . '/files_trashbin');
-
// let the admin disable auto expire
$autoExpire = \OC_Config::getValue('trashbin_auto_expire', true);
if ($autoExpire === false) {
return 0;
}
- $user = \OCP\User::getUser();
- $availableSpace = self::calculateFreeSpace($trashbinSize);
+ $availableSpace = self::calculateFreeSpace($trashbinSize, $user);
$size = 0;
$retention_obligation = \OC_Config::getValue('trashbin_retention_obligation', self::DEFAULT_RETENTION_OBLIGATION);
$limit = time() - ($retention_obligation * 86400);
- $dirContent = $view->getDirectoryContent('/files');
+ $dirContent = Helper::getTrashFiles('/', $user, 'mtime');
+
+ // delete all files older then $retention_obligation
+ list($delSize, $count) = self::deleteExpiredFiles($dirContent, $user, $limit, $retention_obligation);
+
+ $size += $delSize;
+ $availableSpace += $size;
+
+ // delete files from trash until we meet the trash bin size limit again
+ $size += self::deleteFiles(array_slice($dirContent, $count), $user, $availableSpace);
+
+ return $size;
+ }
+
+ /**
+ * if the size limit for the trash bin is reached, we delete the oldest
+ * files in the trash bin until we meet the limit again
+ * @param array $files
+ * @param string $user
+ * @param int $availableSpace available disc space
+ * @return int size of deleted files
+ */
+ protected static function deleteFiles($files, $user, $availableSpace) {
+ $size = 0;
+
+ if ($availableSpace < 0) {
+ foreach ($files as $file) {
+ if ($availableSpace < 0) {
+ $tmp = self::delete($file['name'], $user, $file['mtime']);
+ \OC_Log::write('files_trashbin', 'remove "' . $file['name'] . '" (' . $tmp . 'B) to meet the limit of trash bin size (50% of available quota)', \OC_log::INFO);
+ $availableSpace += $tmp;
+ $size += $tmp;
+ } else {
+ break;
+ }
+ }
+ }
+ return $size;
+ }
- foreach ($dirContent as $file) {
+ /**
+ * delete files older then max storage time
+ *
+ * @param array $files list of files sorted by mtime
+ * @param string $user
+ * @param int $limit files older then limit should be deleted
+ * @param int $retention_obligation max age of file in days
+ * @return array size of deleted files and number of deleted files
+ */
+ protected static function deleteExpiredFiles($files, $user, $limit, $retention_obligation) {
+ $size = 0;
+ $count = 0;
+ foreach ($files as $file) {
$timestamp = $file['mtime'];
- $filename = pathinfo($file['name'], PATHINFO_FILENAME);
+ $filename = $file['name'];
if ($timestamp < $limit) {
- $size += self::delete($filename, $timestamp);
+ $count++;
+ $size += self::delete($filename, $user, $timestamp);
\OC_Log::write('files_trashbin', 'remove "' . $filename . '" from trash bin because it is older than ' . $retention_obligation, \OC_log::INFO);
- }
- }
- $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');
- $result = $query->execute(array($user))->fetchAll();
- $length = count($result);
- $i = 0;
- while ($i < $length && $availableSpace < 0) {
- $tmp = self::delete($result[$i]['id'], $result[$i]['timestamp']);
- \OC_Log::write('files_trashbin', 'remove "' . $result[$i]['id'] . '" (' . $tmp . 'B) to meet the limit of trash bin size (50% of available quota)', \OC_log::INFO);
- $availableSpace += $tmp;
- $size += $tmp;
- $i++;
+ } else {
+ break;
}
}
- return $size;
+ return array($size, $count);
}
/**
diff --git a/apps/files_trashbin/tests/js/filelistSpec.js b/apps/files_trashbin/tests/js/filelistSpec.js
index 11eeff68df8..fd479234b30 100644
--- a/apps/files_trashbin/tests/js/filelistSpec.js
+++ b/apps/files_trashbin/tests/js/filelistSpec.js
@@ -96,6 +96,7 @@ describe('OCA.Trashbin.FileList tests', function() {
});
afterEach(function() {
testFiles = undefined;
+ fileList.destroy();
fileList = undefined;
$('#dir').remove();
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
new file mode 100644
index 00000000000..6a8955f5d1d
--- /dev/null
+++ b/apps/files_trashbin/tests/trashbin.php
@@ -0,0 +1,321 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2014 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/>.
+ *
+ */
+
+require_once __DIR__ . '/../../../lib/base.php';
+
+use OCA\Files_Trashbin;
+
+/**
+ * Class Test_Encryption_Crypt
+ */
+class Test_Trashbin extends \PHPUnit_Framework_TestCase {
+
+ const TEST_TRASHBIN_USER1 = "test-trashbin-user1";
+ const TEST_TRASHBIN_USER2 = "test-trashbin-user2";
+
+ private $trashRoot1;
+ private $trashRoot2;
+
+ private static $encryptionStatus;
+ private static $rememberRetentionObligation;
+ private static $rememberAutoExpire;
+
+ /**
+ * @var \OC\Files\View
+ */
+ private $rootView;
+
+ public static function setUpBeforeClass() {
+ // reset backend
+ \OC_User::clearBackends();
+ \OC_User::useBackend('database');
+
+ // clear share hooks
+ \OC_Hook::clear('OCP\\Share');
+ \OC::registerShareHooks();
+ \OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+
+ //disable encryption
+ self::$encryptionStatus = \OC_App::isEnabled('files_encryption');
+ \OC_App::disable('files_encryption');
+
+ //configure trashbin
+ self::$rememberRetentionObligation = \OC_Config::getValue('trashbin_retention_obligation', Files_Trashbin\Trashbin::DEFAULT_RETENTION_OBLIGATION);
+ \OC_Config::setValue('trashbin_retention_obligation', 2);
+ self::$rememberAutoExpire = \OC_Config::getValue('trashbin_auto_expire', true);
+ \OC_Config::setValue('trashbin_auto_expire', true);
+
+
+ // register hooks
+ Files_Trashbin\Trashbin::registerHooks();
+
+ // create test user
+ self::loginHelper(self::TEST_TRASHBIN_USER2, true);
+ self::loginHelper(self::TEST_TRASHBIN_USER1, true);
+ }
+
+
+
+ public static function tearDownAfterClass() {
+ // cleanup test user
+ \OC_User::deleteUser(self::TEST_TRASHBIN_USER1);
+
+ if (self::$encryptionStatus === true) {
+ \OC_App::enable('files_encryption');
+ }
+
+ \OC_Config::setValue('trashbin_retention_obligation', self::$rememberRetentionObligation);
+ \OC_Config::setValue('trashbin_auto_expire', self::$rememberAutoExpire);
+
+ \OC_Hook::clear();
+ }
+
+ public function setUp() {
+ $this->trashRoot1 = '/' . self::TEST_TRASHBIN_USER1 . '/files_trashbin';
+ $this->trashRoot2 = '/' . self::TEST_TRASHBIN_USER2 . '/files_trashbin';
+ $this->rootView = new \OC\Files\View();
+ self::loginHelper(self::TEST_TRASHBIN_USER1);
+ }
+
+ public function tearDown() {
+ $this->rootView->deleteAll($this->trashRoot1);
+ $this->rootView->deleteAll($this->trashRoot2);
+ }
+
+ /**
+ * test expiration of files older then the max storage time defined for the trash
+ */
+ public function testExpireOldFiles() {
+
+ $currentTime = time();
+ $expireAt = $currentTime - 2*24*60*60;
+ $expiredDate = $currentTime - 3*24*60*60;
+
+ // create some files
+ \OC\Files\Filesystem::file_put_contents('file1.txt', 'file1');
+ \OC\Files\Filesystem::file_put_contents('file2.txt', 'file2');
+ \OC\Files\Filesystem::file_put_contents('file3.txt', 'file3');
+
+ // delete them so that they end up in the trash bin
+ \OC\Files\Filesystem::unlink('file1.txt');
+ \OC\Files\Filesystem::unlink('file2.txt');
+ \OC\Files\Filesystem::unlink('file3.txt');
+
+ //make sure that files are in the trash bin
+ $filesInTrash = OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_TRASHBIN_USER1, 'name');
+ $this->assertSame(3, count($filesInTrash));
+
+ // every second file will get a date in the past so that it will get expired
+ $manipulatedList = $this->manipulateDeleteTime($filesInTrash, $this->trashRoot1, $expiredDate);
+
+ $testClass = new TrashbinForTesting();
+ list($sizeOfDeletedFiles, $count) = $testClass->dummyDeleteExpiredFiles($manipulatedList, $expireAt);
+
+ $this->assertSame(10, $sizeOfDeletedFiles);
+ $this->assertSame(2, $count);
+
+ // only file2.txt should be left
+ $remainingFiles = array_slice($manipulatedList, $count);
+ $this->assertSame(1, count($remainingFiles));
+ $remainingFile = reset($remainingFiles);
+ $this->assertSame('file2.txt', $remainingFile['name']);
+
+ // check that file1.txt and file3.txt was really deleted
+ $newTrashContent = OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_TRASHBIN_USER1);
+ $this->assertSame(1, count($newTrashContent));
+ $element = reset($newTrashContent);
+ $this->assertSame('file2.txt', $element['name']);
+ }
+
+ /**
+ * test expiration of files older then the max storage time defined for the trash
+ * in this test we delete a shared file and check if both trash bins, the one from
+ * the owner of the file and the one from the user who deleted the file get expired
+ * correctly
+ */
+ public function testExpireOldFilesShared() {
+
+ $currentTime = time();
+ $folder = "trashTest-" . $currentTime . '/';
+ $expiredDate = $currentTime - 3*24*60*60;
+
+ // create some files
+ \OC\Files\Filesystem::mkdir($folder);
+ \OC\Files\Filesystem::file_put_contents($folder . 'user1-1.txt', 'file1');
+ \OC\Files\Filesystem::file_put_contents($folder . 'user1-2.txt', 'file2');
+ \OC\Files\Filesystem::file_put_contents($folder . 'user1-3.txt', 'file3');
+ \OC\Files\Filesystem::file_put_contents($folder . 'user1-4.txt', 'file4');
+
+ //share user1-4.txt with user2
+ $fileInfo = \OC\Files\Filesystem::getFileInfo($folder);
+ $result = \OCP\Share::shareItem('folder', $fileInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_TRASHBIN_USER2, 31);
+ $this->assertTrue($result);
+
+ // delete them so that they end up in the trash bin
+ \OC\Files\Filesystem::unlink($folder . 'user1-1.txt');
+ \OC\Files\Filesystem::unlink($folder . 'user1-2.txt');
+ \OC\Files\Filesystem::unlink($folder . 'user1-3.txt');
+
+ $filesInTrash = OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_TRASHBIN_USER1, 'name');
+ $this->assertSame(3, count($filesInTrash));
+
+ // every second file will get a date in the past so that it will get expired
+ $this->manipulateDeleteTime($filesInTrash, $this->trashRoot1, $expiredDate);
+
+ // login as user2
+ self::loginHelper(self::TEST_TRASHBIN_USER2);
+
+ $this->assertTrue(\OC\Files\Filesystem::file_exists($folder . "user1-4.txt"));
+
+ // create some files
+ \OC\Files\Filesystem::file_put_contents('user2-1.txt', 'file1');
+ \OC\Files\Filesystem::file_put_contents('user2-2.txt', 'file2');
+
+ // delete them so that they end up in the trash bin
+ \OC\Files\Filesystem::unlink('user2-1.txt');
+ \OC\Files\Filesystem::unlink('user2-2.txt');
+
+ $filesInTrashUser2 = OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_TRASHBIN_USER2, 'name');
+ $this->assertSame(2, count($filesInTrashUser2));
+
+ // every second file will get a date in the past so that it will get expired
+ $this->manipulateDeleteTime($filesInTrashUser2, $this->trashRoot2, $expiredDate);
+
+ \OC\Files\Filesystem::unlink($folder . 'user1-4.txt');
+
+ $filesInTrashUser2AfterDelete = OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_TRASHBIN_USER2);
+
+ // user2-1.txt should have been expired
+ $this->verifyArray($filesInTrashUser2AfterDelete, array('user2-2.txt', 'user1-4.txt'));
+
+ // user1-1.txt and user1-3.txt should have been expired
+ $filesInTrashUser1AfterDelete = OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_TRASHBIN_USER1);
+
+ $this->verifyArray($filesInTrashUser1AfterDelete, array('user1-2.txt', 'user1-4.txt'));
+ }
+
+ /**
+ * verify that the array contains the expected results
+ * @param array $result
+ * @param array $expected
+ */
+ private function verifyArray($result, $expected) {
+ $this->assertSame(count($expected), count($result));
+ foreach ($expected as $expectedFile) {
+ $found = false;
+ foreach ($result as $fileInTrash) {
+ if ($expectedFile === $fileInTrash['name']) {
+ $found = true;
+ break;
+ }
+ }
+ if (!$found) {
+ // if we didn't found the expected file, something went wrong
+ $this->assertTrue(false, "can't find expected file '" . $expectedFile . "' in trash bin");
+ }
+ }
+ }
+
+ private function manipulateDeleteTime($files, $trashRoot, $expireDate) {
+ $counter = 0;
+ foreach ($files as &$file) {
+ // modify every second file
+ $counter = ($counter + 1) % 2;
+ if ($counter === 1) {
+ $source = $trashRoot . '/files/' . $file['name'].'.d'.$file['mtime'];
+ $target = \OC\Files\Filesystem::normalizePath($trashRoot . '/files/' . $file['name'] . '.d' . $expireDate);
+ $this->rootView->rename($source, $target);
+ $file['mtime'] = $expireDate;
+ }
+ }
+ return \OCA\Files\Helper::sortFiles($files, 'mtime');
+ }
+
+
+ /**
+ * test expiration of old files in the trash bin until the max size
+ * of the trash bin is met again
+ */
+ public function testExpireOldFilesUtilLimitsAreMet() {
+
+ // create some files
+ \OC\Files\Filesystem::file_put_contents('file1.txt', 'file1');
+ \OC\Files\Filesystem::file_put_contents('file2.txt', 'file2');
+ \OC\Files\Filesystem::file_put_contents('file3.txt', 'file3');
+
+ // delete them so that they end up in the trash bin
+ \OC\Files\Filesystem::unlink('file3.txt');
+ sleep(1); // make sure that every file has a unique mtime
+ \OC\Files\Filesystem::unlink('file2.txt');
+ sleep(1); // make sure that every file has a unique mtime
+ \OC\Files\Filesystem::unlink('file1.txt');
+
+ //make sure that files are in the trash bin
+ $filesInTrash = OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_TRASHBIN_USER1, 'mtime');
+ $this->assertSame(3, count($filesInTrash));
+
+ $testClass = new TrashbinForTesting();
+ $sizeOfDeletedFiles = $testClass->dummyDeleteFiles($filesInTrash, -8);
+
+ // the two oldest files (file3.txt and file2.txt) should be deleted
+ $this->assertSame(10, $sizeOfDeletedFiles);
+
+ $newTrashContent = OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_TRASHBIN_USER1);
+ $this->assertSame(1, count($newTrashContent));
+ $element = reset($newTrashContent);
+ $this->assertSame('file1.txt', $element['name']);
+ }
+
+ /**
+ * @param string $user
+ * @param bool $create
+ * @param bool $password
+ */
+ public static function loginHelper($user, $create = false) {
+ if ($create) {
+ try {
+ \OC_User::createUser($user, $user);
+ } catch(\Exception $e) { // catch username is already being used from previous aborted runs
+
+ }
+ }
+
+ \OC_Util::tearDownFS();
+ \OC_User::setUserId('');
+ \OC\Files\Filesystem::tearDown();
+ \OC_User::setUserId($user);
+ \OC_Util::setupFS($user);
+ }
+}
+
+
+// just a dummy class to make protected methods available for testing
+class TrashbinForTesting extends Files_Trashbin\Trashbin {
+ public function dummyDeleteExpiredFiles($files, $limit) {
+ // dummy value for $retention_obligation because it is not needed here
+ return parent::deleteExpiredFiles($files, \Test_Trashbin::TEST_TRASHBIN_USER1, $limit, 0);
+ }
+
+ public function dummyDeleteFiles($files, $availableSpace) {
+ return parent::deleteFiles($files, \Test_Trashbin::TEST_TRASHBIN_USER1, $availableSpace);
+ }
+}
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index 942a1a929f7..64e0df76490 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -70,9 +70,9 @@ function revertFile(file, revision) {
OC.Notification.show( t('files_version', 'Failed to revert {file} to revision {timestamp}.', {file:file, timestamp:formatDate(revision * 1000)}) );
} else {
$('#dropdown').hide('blind', function() {
+ $('#dropdown').closest('tr').find('.modified:first').html(relative_modified_date(revision));
$('#dropdown').remove();
$('tr').removeClass('mouseOver');
- // TODO also update the modified time in the web ui
});
}
}
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index b912fc8ba76..4e6004808d2 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -309,6 +309,7 @@ class Storage {
private static function getAllVersions($uid) {
$view = new \OC\Files\View('/' . $uid . '/');
$dirs = array(self::VERSIONS_ROOT);
+ $versions = array();
while (!empty($dirs)) {
$dir = array_pop($dirs);
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index fe9268cb9fb..90367751a93 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
"Deletion failed" => "Eliminació fallida",
"Take over settings from recent server configuration?" => "Voleu prendre l'arranjament de la configuració actual del servidor?",
"Keep settings?" => "Voleu mantenir la configuració?",
+"{nthServer}. Server" => "{nthServer}. Servidor",
"Cannot add server configuration" => "No es pot afegir la configuració del servidor",
"mappings cleared" => "s'han eliminat els mapatges",
"Success" => "Èxit",
"Error" => "Error",
+"Please specify a Base DN" => "Especifiqueu una base DN",
+"Could not determine Base DN" => "No s'ha pogut determinar la base DN",
+"Please specify the port" => "Especifiqueu el port",
"Configuration OK" => "Configuració correcte",
"Configuration incorrect" => "Configuració incorrecte",
"Configuration incomplete" => "Configuració incompleta",
@@ -30,6 +34,9 @@ $TRANSLATIONS = array(
"_%s user found_::_%s users found_" => array("S'ha trobat %s usuari","S'han trobat %s usuaris"),
"Invalid Host" => "Ordinador central no vàlid",
"Could not find the desired feature" => "La característica desitjada no s'ha trobat",
+"Server" => "Servidor",
+"User Filter" => "Filtre d'usuari",
+"Login Filter" => "Filtre d'acreditació",
"Group Filter" => "Filtre de grup",
"Save" => "Desa",
"Test Configuration" => "Comprovació de la configuració",
@@ -46,7 +53,10 @@ $TRANSLATIONS = array(
"LDAP Email Address:" => "Adreça de correu electrònic LDAP:",
"Other Attributes:" => "Altres atributs:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió. Per exemple: \"uid=%%uid\"",
+"1. Server" => "1. Servidor",
+"%s. Server:" => "%s. Servidor:",
"Add Server Configuration" => "Afegeix la configuració del servidor",
+"Delete Configuration" => "Esborra la configuració",
"Host" => "Equip remot",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
"Port" => "Port",
@@ -61,6 +71,7 @@ $TRANSLATIONS = array(
"users found" => "usuaris trobats",
"Back" => "Enrera",
"Continue" => "Continua",
+"Expert" => "Expert",
"Advanced" => "Avançat",
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments inesperats. Demaneu a l'administrador del sistema que en desactivi una.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avís:</b> El mòdul PHP LDAP no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li.",
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 254386aea7f..3a8ee2980da 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -30,11 +30,11 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "Potvrdit smazání",
"_%s group found_::_%s groups found_" => array("nalezena %s skupina","nalezeny %s skupiny","nalezeno %s skupin"),
"_%s user found_::_%s users found_" => array("nalezen %s uživatel","nalezeni %s uživatelé","nalezeno %s uživatelů"),
-"Invalid Host" => "Neplatný hostitel",
"Could not find the desired feature" => "Nelze nalézt požadovanou vlastnost",
+"Invalid Host" => "Neplatný hostitel",
"Server" => "Server",
-"User Filter" => "Uživatelský Filtr",
-"Login Filter" => "Přihlašovací Filtr",
+"User Filter" => "Uživatelský filtr",
+"Login Filter" => "Přihlašovací filtr",
"Group Filter" => "Filtr skupin",
"Save" => "Uložit",
"Test Configuration" => "Vyzkoušet nastavení",
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index 3dccb192daf..1cab0f66b91 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -3,9 +3,13 @@ $TRANSLATIONS = array(
"Failed to delete the server configuration" => "Malsukcesis forigo de la agordo de servilo",
"Deletion failed" => "Forigo malsukcesis",
"Keep settings?" => "Ĉu daŭrigi la agordon?",
+"{nthServer}. Server" => "{nthServer}. Servilo",
"Cannot add server configuration" => "Ne eblas aldoni agordon de servilo",
"Success" => "Sukceso",
"Error" => "Eraro",
+"Configuration OK" => "La agordaro ĝustas",
+"Configuration incorrect" => "La agordaro malĝustas",
+"Configuration incomplete" => "La agordaro neplenas",
"Select groups" => "Elekti grupojn",
"Select object classes" => "Elekti objektoklasojn",
"Select attributes" => "Elekti atribuojn",
@@ -15,6 +19,9 @@ $TRANSLATIONS = array(
"_%s group found_::_%s groups found_" => array("%s grupo troviĝis","%s grupoj troviĝis"),
"_%s user found_::_%s users found_" => array("%s uzanto troviĝis","%s uzanto troviĝis"),
"Invalid Host" => "Nevalida gastigo",
+"Server" => "Servilo",
+"User Filter" => "Filtrilo de uzanto",
+"Login Filter" => "Ensaluta filtrilo",
"Group Filter" => "Filtrilo de grupo",
"Save" => "Konservi",
"Test Configuration" => "Provi agordon",
@@ -22,10 +29,14 @@ $TRANSLATIONS = array(
"only those object classes:" => "nur tiuj objektoklasoj:",
"only from those groups:" => "nur el tiuj grupoj:",
"groups found" => "grupoj trovitaj",
+"Users login with this attribute:" => "Uzantoj ensalutas kun ĉi tiu atributo:",
"LDAP Username:" => "LDAP-uzantonomo:",
"LDAP Email Address:" => "LDAP-retpoŝtadreso:",
"Other Attributes:" => "Aliaj atribuoj:",
+"1. Server" => "1. Servilo",
+"%s. Server:" => "%s. Servilo:",
"Add Server Configuration" => "Aldoni agordon de servilo",
+"Delete Configuration" => "Forigi agordaron",
"Host" => "Gastigo",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
"Port" => "Pordo",
@@ -34,14 +45,17 @@ $TRANSLATIONS = array(
"For anonymous access, leave DN and Password empty." => "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
"users found" => "uzantoj trovitaj",
"Back" => "Antaŭen",
+"Expert" => "Sperta",
"Advanced" => "Progresinta",
"Connection Settings" => "Agordo de konekto",
"Disable Main Server" => "Malkapabligi la ĉefan servilon",
"Turn off SSL certificate validation." => "Malkapabligi validkontrolon de SSL-atestiloj.",
"Cache Time-To-Live" => "Vivotempo de la kaŝmemoro",
"in seconds. A change empties the cache." => "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron.",
+"Directory Settings" => "Agordo de dosierujo",
"User Display Name Field" => "Kampo de vidignomo de uzanto",
"Base User Tree" => "Baza uzantarbo",
+"User Search Attributes" => "Atributoj de serĉo de uzanto",
"Group Display Name Field" => "Kampo de vidignomo de grupo",
"Base Group Tree" => "Baza gruparbo",
"Group Search Attributes" => "Atribuoj de gruposerĉo",
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 604e5e890ed..d4ba60ee66d 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"Deletion failed" => "Kustutamine ebaõnnestus",
"Take over settings from recent server configuration?" => "Võta sätted viimasest serveri seadistusest?",
"Keep settings?" => "Säilitada seadistused?",
+"{nthServer}. Server" => "{nthServer}. Server",
"Cannot add server configuration" => "Ei suuda lisada serveri seadistust",
"mappings cleared" => "vastendused puhastatud",
"Success" => "Korras",
@@ -102,6 +103,8 @@ $TRANSLATIONS = array(
"Group-Member association" => "Grupiliikme seotus",
"Nested Groups" => "Sisegrupp",
"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Sisse lülitamisel on toetatakse gruppe sisaldavad gruppe. (Toimib, kui grupi liikme atribuut sisaldab DN-e.)",
+"Paging chunksize" => "Kutsungi pataka suurus",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Pataka suurust kasutatakse LDAPi kutsungite kaupa otsingute puhul, mis võivad väljastada pikki kasutajate või gruppide loetelusid. (Määrates suuruseks 0, keelatakse LDAP patakate kaupa otsing taolistes situatsioonides)",
"Special Attributes" => "Spetsiifilised atribuudid",
"Quota Field" => "Mahupiirangu atribuut",
"Quota Default" => "Vaikimisi mahupiirang",
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index ab2cb67c596..6e5a1663e2d 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
" Could not set configuration %s" => "Não foi possível definir a configuração %s",
"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?",
+"Keep settings?" => "Manter configurações?",
"{nthServer}. Server" => "Servidor {nthServer}.",
"Cannot add server configuration" => "Impossível adicionar a configuração do servidor",
"mappings cleared" => "mapeamentos limpos",
@@ -32,18 +32,18 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "Confirmar Exclusão",
"_%s group found_::_%s groups found_" => array("grupo% s encontrado","grupos% s encontrado"),
"_%s user found_::_%s users found_" => array("usuário %s encontrado","usuários %s encontrados"),
-"Invalid Host" => "Host inválido",
"Could not find the desired feature" => "Não foi possível encontrar a função desejada",
+"Invalid Host" => "Host Inválido",
"Server" => "Servidor",
"User Filter" => "Filtro de Usuário",
"Login Filter" => "Filtro de Login",
"Group Filter" => "Filtro de Grupo",
-"Save" => "Guardar",
+"Save" => "Salvar",
"Test Configuration" => "Teste de Configuração",
"Help" => "Ajuda",
"Groups meeting these criteria are available in %s:" => "Grupos que satisfazem estes critérios estão disponíveis em %s:",
"only those object classes:" => "apenas essas classes de objetos:",
-"only from those groups:" => "apenas a partir dos grupos:",
+"only from those groups:" => "apenas desses grupos:",
"Edit raw filter instead" => "Editar filtro raw ao invéz",
"Raw LDAP filter" => "Filtro LDAP Raw",
"The filter specifies which LDAP groups shall have access to the %s instance." => "O filtro especifica quais grupos LDAP devem ter acesso à instância do %s.",
@@ -51,13 +51,13 @@ $TRANSLATIONS = array(
"Users login with this attribute:" => "Usuários entrar com este atributo:",
"LDAP Username:" => "Usuário LDAP:",
"LDAP Email Address:" => "LDAP Endereço de E-mail:",
-"Other Attributes:" => "Outros atributos:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define o filtro a ser aplicado, o login é feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\"",
+"Other Attributes:" => "Outros Atributos:",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define o filtro a ser aplicado, quando o login for feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\"",
"1. Server" => "1. Servidor",
"%s. Server:" => "%s. Servidor:",
"Add Server Configuration" => "Adicionar Configuração de Servidor",
"Delete Configuration" => "Excluir Configuração",
-"Host" => "Servidor",
+"Host" => "Host",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://",
"Port" => "Porta",
"User DN" => "DN Usuário",
@@ -76,9 +76,9 @@ $TRANSLATIONS = array(
"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis. Você pode experimentar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP não está instalado, o backend não funcionará. Por favor, peça ao seu administrador do sistema para instalá-lo.",
"Connection Settings" => "Configurações de Conexão",
-"Configuration Active" => "Configuração ativa",
+"Configuration Active" => "Configuração Ativa",
"When unchecked, this configuration will be skipped." => "Quando não marcada, esta configuração será ignorada.",
-"Backup (Replica) Host" => "Servidor de Backup (Réplica)",
+"Backup (Replica) Host" => "Host de Backup (Réplica)",
"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Defina um servidor de backup opcional. Ele deverá ser uma réplica do servidor LDAP/AD principal.",
"Backup (Replica) Port" => "Porta do Backup (Réplica)",
"Disable Main Server" => "Desativar Servidor Principal",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 5f4b3d5c15a..20a136384fb 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -26,14 +26,14 @@ $TRANSLATIONS = array(
"Select groups" => "Seleccionar grupos",
"Select object classes" => "Selecionar classes de objetos",
"Select attributes" => "Selecionar atributos",
-"Connection test succeeded" => "Teste de conecção passado com sucesso.",
-"Connection test failed" => "Erro no teste de conecção.",
+"Connection test succeeded" => "Teste de ligação com sucesso.",
+"Connection test failed" => "Erro no teste de ligação.",
"Do you really want to delete the current Server Configuration?" => "Deseja realmente apagar as configurações de servidor actuais?",
"Confirm Deletion" => "Confirmar a operação de apagar",
"_%s group found_::_%s groups found_" => array("%s grupo encontrado","%s grupos encontrados"),
"_%s user found_::_%s users found_" => array("%s utilizador encontrado","%s utilizadores encontrados"),
-"Invalid Host" => "Hospedeiro Inválido",
"Could not find the desired feature" => "Não se encontrou a função desejada",
+"Invalid Host" => "Hospedeiro Inválido",
"Server" => "Servidor",
"User Filter" => "Filtro de utilizadores",
"Login Filter" => "Filtro de Login",
@@ -41,12 +41,14 @@ $TRANSLATIONS = array(
"Save" => "Guardar",
"Test Configuration" => "Testar a configuração",
"Help" => "Ajuda",
+"Groups meeting these criteria are available in %s:" => "Grupos que satisfazerem estes critérios estão disponíveis em %s:",
"only those object classes:" => "apenas essas classes de objetos:",
"only from those groups:" => "apenas desses grupos:",
"Edit raw filter instead" => "Editar filtro raw em vez disso",
"Raw LDAP filter" => "Filtro LDAP Raw",
"The filter specifies which LDAP groups shall have access to the %s instance." => "O filtro especifica quais grupos LDAP devem ter acesso à instância %s.",
"groups found" => "grupos encontrados",
+"Users login with this attribute:" => "Utilizadores entrar com este atributo:",
"LDAP Username:" => "Nome de utilizador LDAP:",
"LDAP Email Address:" => "Endereço de correio eletrónico LDAP:",
"Other Attributes:" => "Outros Atributos:",
@@ -83,6 +85,7 @@ $TRANSLATIONS = array(
"Only connect to the replica server." => "Ligar apenas ao servidor de réplicas.",
"Case insensitive LDAP server (Windows)" => "Servidor LDAP (Windows) não é sensível a maiúsculas.",
"Turn off SSL certificate validation." => "Desligar a validação de certificado SSL.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Não recomendado, use-o somente para teste! ligação só funciona com esta opção, importar o certificado SSL do servidor LDAP para o seu servidor %s.",
"Cache Time-To-Live" => "Cache do tempo de vida dos objetos no servidor",
"in seconds. A change empties the cache." => "em segundos. Uma alteração esvazia a cache.",
"Directory Settings" => "Definições de directorias",
@@ -98,6 +101,10 @@ $TRANSLATIONS = array(
"One Group Base DN per line" => "Uma base de grupo DN por linha",
"Group Search Attributes" => "Atributos de pesquisa de grupo",
"Group-Member association" => "Associar utilizador ao grupo.",
+"Nested Groups" => "Grupos agrupados",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Quando habilitado os grupos, os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)",
+"Paging chunksize" => "Bloco de paginação",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Tamanho do bloco usado para pesquisas LDAP paginados que podem retornar resultados volumosos como utilizador ou grupo de enumeração. (Defini-lo 0 desactiva paginada das pesquisas LDAP nessas situações.)",
"Special Attributes" => "Atributos especiais",
"Quota Field" => "Quota",
"Quota Default" => "Quota padrão",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index d0b6ab8fb0d..60aebba7dcc 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -28,8 +28,11 @@ $TRANSLATIONS = array(
"Confirm Deletion" => "Potrdi brisanje",
"_%s group found_::_%s groups found_" => array("%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"),
"_%s user found_::_%s users found_" => array("%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"),
-"Invalid Host" => "Neveljaven gostitelj",
"Could not find the desired feature" => "Želene zmožnosti ni mogoče najti",
+"Invalid Host" => "Neveljaven gostitelj",
+"Server" => "Strežnik",
+"User Filter" => "Uporabniški filter",
+"Login Filter" => "Filter prijave",
"Group Filter" => "Filter skupin",
"Save" => "Shrani",
"Test Configuration" => "Preizkusne nastavitve",
@@ -45,6 +48,7 @@ $TRANSLATIONS = array(
"Other Attributes:" => "Drugi atributi:",
"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"",
"Add Server Configuration" => "Dodaj nastavitve strežnika",
+"Delete Configuration" => "Izbriši nastavitve",
"Host" => "Gostitelj",
"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://",
"Port" => "Vrata",
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index dc7e4f1239b..ca5d1386995 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -607,7 +607,7 @@ class Access extends LDAPUtility implements user\IUserTools {
$sqlAdjustment = '';
$dbType = \OCP\Config::getSystemValue('dbtype');
- if($dbType === 'mysql') {
+ if($dbType === 'mysql' || $dbType == 'oci') {
$sqlAdjustment = 'FROM DUAL';
}
@@ -724,10 +724,18 @@ class Access extends LDAPUtility implements user\IUserTools {
}
/**
- * prepares and executes an LDAP search operation
- * @param string $filter the LDAP filter for the search
- * @param array $base an array containing the LDAP subtree(s) that shall be searched
- * @param string|string[] $attr optional, array, one or more attributes that shall be
+ * returns the number of available groups
+ * @param string $filter the LDAP search filter
+ * @param string[] $attr optional
+ * @param int|null $limit
+ * @param int|null $offset
+ * @return int|bool
+ */
+ public function countGroups($filter, $attr = array('dn'), $limit = null, $offset = null) {
+ return $this->count($filter, $this->connection->ldapBaseGroups, $attr, $limit, $offset);
+ }
+
+ /**
* retrieved. Results will according to the order in the array.
* @param int $limit optional, maximum results to be counted
* @param int $offset optional, a starting point
@@ -827,7 +835,7 @@ class Access extends LDAPUtility implements user\IUserTools {
\OCP\Util::writeLog('user_ldap', 'Count filter: '.print_r($filter, true), \OCP\Util::DEBUG);
if(is_null($limit)) {
- $limit = $this->connection->ldapPagingSize;
+ $limit = intval($this->connection->ldapPagingSize);
}
$counter = 0;
@@ -1026,9 +1034,10 @@ class Access extends LDAPUtility implements user\IUserTools {
}
/**
- * combines the input filters with AND
+ * combines the input filters with OR
* @param string[] $filters the filters to connect
* @return string the combined filter
+ * Combines Filter arguments with OR
*/
public function combineFilterWithOr($filters) {
return $this->combineFilter($filters, '|');
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 52f6c5ceb10..bafb0e0b895 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -41,11 +41,13 @@ class Connection extends LDAPUtility {
protected $doNotValidate = false;
+ protected $ignoreValidation = false;
+
/**
* Constructor
* @param ILDAPWrapper $ldap
* @param string $configPrefix a string with the prefix for the configkey column (appconfig table)
- * @param string $configID a string with the value for the appid column (appconfig table) or null for on-the-fly connections
+ * @param string|null $configID a string with the value for the appid column (appconfig table) or null for on-the-fly connections
*/
public function __construct(ILDAPWrapper $ldap, $configPrefix = '', $configID = 'user_ldap') {
parent::__construct($ldap);
@@ -117,6 +119,16 @@ class Connection extends LDAPUtility {
}
/**
+ * sets whether the result of the configuration validation shall
+ * be ignored when establishing the connection. Used by the Wizard
+ * in early configuration state.
+ * @param bool $state
+ */
+ public function setIgnoreValidation($state) {
+ $this->ignoreValidation = (bool)$state;
+ }
+
+ /**
* initializes the LDAP backend
* @param bool $force read the config settings no matter what
*/
@@ -466,7 +478,7 @@ class Connection extends LDAPUtility {
if(!$phpLDAPinstalled) {
return false;
}
- if(!$this->configured) {
+ if(!$this->ignoreValidation && !$this->configured) {
\OCP\Util::writeLog('user_ldap',
'Configuration is invalid, cannot connect',
\OCP\Util::WARN);
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index 37caedc6251..b6d7bad8727 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -159,7 +159,8 @@ class Helper {
return false;
}
- if(strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false) {
+ $dbtype = \OCP\Config::getSystemValue('dbtype');
+ if(strpos($dbtype, 'sqlite') !== false || $dbtype === 'oci') {
$query = \OCP\DB::prepare('DELETE FROM '.$table);
} else {
$query = \OCP\DB::prepare('TRUNCATE '.$table);
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index b8a0e5ad799..42d612fa736 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -64,39 +64,53 @@ class Wizard extends LDAPUtility {
}
/**
- * @return WizardResult
- * @throws \Exception
+ * counts entries in the LDAP directory
+ * @param string $filter the LDAP search filter
+ * @param string $type a string being either 'users' or 'groups';
+ * @return int|bool
*/
- public function countGroups() {
- if(!$this->checkRequirements(array('ldapHost',
- 'ldapPort',
- 'ldapBase',
- ))) {
- return false;
+ public function countEntries($filter, $type) {
+ $reqs = array('ldapHost', 'ldapPort', 'ldapBase');
+ if($type === 'users') {
+ $reqs[] = 'ldapUserFilter';
+ }
+ if(!$this->checkRequirements($reqs)) {
+ throw new \Exception('Requirements not met', 400);
}
- $base = $this->configuration->ldapBase[0];
+ $ldapAccess = $this->getAccess();
+ if($type === 'groups') {
+ $result = $ldapAccess->countGroups($filter);
+ } else if($type === 'users') {
+ $result = $ldapAccess->countUsers($filter);
+ } else {
+ throw new \Exception('internal error: invald object type', 500);
+ }
+
+ return $result;
+ }
+
+ public function countGroups() {
$filter = $this->configuration->ldapGroupFilter;
- \OCP\Util::writeLog('user_ldap', 'Wiz: g filter '. print_r($filter, true), \OCP\Util::DEBUG);
- $l = \OC_L10N::get('user_ldap');
+
if(empty($filter)) {
- $output = $l->n('%s group found', '%s groups found', 0, array(0));
+ $output = self::$l->n('%s group found', '%s groups found', 0, array(0));
$this->result->addChange('ldap_group_count', $output);
return $this->result;
}
- $cr = $this->getConnection();
- if(!$cr) {
- throw new \Exception('Could not connect to LDAP');
- }
- $rr = $this->ldap->search($cr, $base, $filter, array('dn'));
- if(!$this->ldap->isResource($rr)) {
+
+ try {
+ $groupsTotal = $this->countEntries($filter, 'groups');
+ } catch (\Exception $e) {
+ //400 can be ignored, 500 is forwarded
+ if($e->getCode() === 500) {
+ throw $e;
+ }
return false;
}
- $entries = $this->ldap->countEntries($cr, $rr);
- $entries = ($entries !== false) ? $entries : 0;
- $output = $l->n('%s group found', '%s groups found', $entries, $entries);
+ $groupsTotal = ($groupsTotal !== false) ? $groupsTotal : 0;
+ $output = self::$l->n('%s group found', '%s groups found', $groupsTotal, $groupsTotal);
$this->result->addChange('ldap_group_count', $output);
-
return $this->result;
}
@@ -105,31 +119,12 @@ class Wizard extends LDAPUtility {
* @throws \Exception
*/
public function countUsers() {
- if(!$this->checkRequirements(array('ldapHost',
- 'ldapPort',
- 'ldapBase',
- 'ldapUserFilter',
- ))) {
- return false;
- }
-
- $cr = $this->getConnection();
- if(!$cr) {
- throw new \Exception('Could not connect to LDAP');
- }
-
- $base = $this->configuration->ldapBase[0];
$filter = $this->configuration->ldapUserFilter;
- $rr = $this->ldap->search($cr, $base, $filter, array('dn'));
- if(!$this->ldap->isResource($rr)) {
- return false;
- }
- $entries = $this->ldap->countEntries($cr, $rr);
- $entries = ($entries !== false) ? $entries : 0;
- $l = \OC_L10N::get('user_ldap');
- $output = $l->n('%s user found', '%s users found', $entries, $entries);
- $this->result->addChange('ldap_user_count', $output);
+ $usersTotal = $this->countEntries($filter, 'users');
+ $usersTotal = ($usersTotal !== false) ? $usersTotal : 0;
+ $output = self::$l->n('%s user found', '%s users found', $usersTotal, $usersTotal);
+ $this->result->addChange('ldap_user_count', $output);
return $this->result;
}
@@ -273,8 +268,7 @@ class Wizard extends LDAPUtility {
throw new \Exception('Could not connect to LDAP');
}
- $obClasses = array('posixGroup', 'group', 'zimbraDistributionList', '*');
- $this->determineFeature($obClasses, 'cn', $dbKey, $confKey);
+ $this->fetchGroups($dbKey, $confKey);
if($testMemberOf) {
$this->configuration->hasMemberOfFilterSupport = $this->testMemberOf();
@@ -288,9 +282,48 @@ class Wizard extends LDAPUtility {
}
/**
- * @return bool|WizardResult
- * @throws \Exception
+ * fetches all groups from LDAP
+ * @param string $dbKey
+ * @param string $confKey
*/
+ public function fetchGroups($dbKey, $confKey) {
+ $obclasses = array('posixGroup', 'group', 'zimbraDistributionList', 'groupOfNames');
+ $ldapAccess = $this->getAccess();
+
+ $filterParts = array();
+ foreach($obclasses as $obclass) {
+ $filterParts[] = 'objectclass='.$obclass;
+ }
+ //we filter for everything
+ //- that looks like a group and
+ //- has the group display name set
+ $filter = $ldapAccess->combineFilterWithOr($filterParts);
+ $filter = $ldapAccess->combineFilterWithAnd(array($filter, 'cn=*'));
+
+ $limit = 400;
+ $offset = 0;
+ do {
+ $result = $ldapAccess->searchGroups($filter, array('cn'), $limit, $offset);
+ foreach($result as $item) {
+ $groups[] = $item[0];
+ }
+ $offset += $limit;
+ } while (count($groups) > 0 && count($groups) % $limit === 0);
+
+ if(count($groups) > 0) {
+ natsort($groups);
+ $this->result->addOptions($dbKey, array_values($groups));
+ } else {
+ throw new \Exception(self::$l->t('Could not find the desired feature'));
+ }
+
+ $setFeatures = $this->configuration->$confKey;
+ if(is_array($setFeatures) && !empty($setFeatures)) {
+ //something is already configured? pre-select it.
+ $this->result->addChange($dbKey, $setFeatures);
+ }
+ }
+
public function determineGroupMemberAssoc() {
if(!$this->checkRequirements(array('ldapHost',
'ldapPort',
@@ -909,15 +942,13 @@ class Wizard extends LDAPUtility {
* specified attribute
* @param string[] $filters array, the filters that shall be used in the search
* @param string $attr the attribute of which a list of values shall be returned
- * @param bool $lfw whether the last filter is a wildcard which shall not
- * be processed if there were already findings, defaults to true
* @param int $dnReadLimit the amount of how many DNs should be analyzed.
* The lower, the faster
* @param string $maxF string. if not null, this variable will have the filter that
* yields most result entries
* @return array|false an array with the values on success, false otherwise
*/
- public function cumulativeSearchOnAttribute($filters, $attr, $lfw = true, $dnReadLimit = 3, &$maxF = null) {
+ public function cumulativeSearchOnAttribute($filters, $attr, $dnReadLimit = 3, &$maxF = null) {
$dnRead = array();
$foundItems = array();
$maxEntries = 0;
@@ -935,7 +966,7 @@ class Wizard extends LDAPUtility {
$lastFilter = $filters[count($filters)-1];
}
foreach($filters as $filter) {
- if($lfw && $lastFilter === $filter && count($foundItems) > 0) {
+ if($lastFilter === $filter && count($foundItems) > 0) {
//skip when the filter is a wildcard and results were found
continue;
}
@@ -1005,16 +1036,11 @@ class Wizard extends LDAPUtility {
//how deep to dig?
//When looking for objectclasses, testing few entries is sufficient,
- //when looking for group we need to get all names, though.
- if(strtolower($attr) === 'objectclass') {
- $dig = 3;
- } else {
- $dig = 0;
- }
+ $dig = 3;
$availableFeatures =
$this->cumulativeSearchOnAttribute($objectclasses, $attr,
- true, $dig, $maxEntryObjC);
+ $dig, $maxEntryObjC);
if(is_array($availableFeatures)
&& count($availableFeatures) > 0) {
natcasesort($availableFeatures);
@@ -1073,6 +1099,27 @@ class Wizard extends LDAPUtility {
}
/**
+ * creates and returns an Access instance
+ * @return \OCA\user_ldap\lib\Access
+ */
+ private function getAccess() {
+ $con = new Connection($this->ldap, '', null);
+ $con->setConfiguration($this->configuration->getConfiguration());
+ $con->ldapConfigurationActive = true;
+ $con->setIgnoreValidation(true);
+
+ $userManager = new user\Manager(
+ \OC::$server->getConfig(),
+ new FilesystemHelper(),
+ new LogWrapper(),
+ \OC::$server->getAvatarManager(),
+ new \OCP\Image());
+
+ $ldapAccess = new Access($con, $this->ldap, $userManager);
+ return $ldapAccess;
+ }
+
+ /**
* @return bool|mixed
*/
private function getConnection() {
diff --git a/apps/user_ldap/tests/wizard.php b/apps/user_ldap/tests/wizard.php
index 2b5cabc705d..ff5ee010b71 100644
--- a/apps/user_ldap/tests/wizard.php
+++ b/apps/user_ldap/tests/wizard.php
@@ -127,7 +127,7 @@ class Test_Wizard extends \PHPUnit_Framework_TestCase {
# The following expectations are the real test #
$filters = array('f1', 'f2', '*');
- $wizard->cumulativeSearchOnAttribute($filters, 'cn', true, 5);
+ $wizard->cumulativeSearchOnAttribute($filters, 'cn', 5);
unset($uidnumber);
}
@@ -203,8 +203,8 @@ class Test_Wizard extends \PHPUnit_Framework_TestCase {
# The following expectations are the real test #
$filters = array('f1', 'f2', '*');
- $wizard->cumulativeSearchOnAttribute($filters, 'cn', true, 0);
+ $wizard->cumulativeSearchOnAttribute($filters, 'cn', 0);
unset($uidnumber);
}
-} \ No newline at end of file
+}
diff --git a/apps/user_webdavauth/l10n/et_EE.php b/apps/user_webdavauth/l10n/et_EE.php
index 961375692d9..76b5cd4a864 100644
--- a/apps/user_webdavauth/l10n/et_EE.php
+++ b/apps/user_webdavauth/l10n/et_EE.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"WebDAV Authentication" => "WebDAV autentimine",
+"Address:" => "Aadress:",
"Save" => "Salvesta",
"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab ning tõlgendab HTTP olekukoodid 401 ja 403 valedeks andmeteks ning kõik teised vastused korrektseteks andmeteks."
);
diff --git a/core/css/mobile.css b/core/css/mobile.css
index d840cdafa26..2003e0a7f45 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -110,7 +110,6 @@
min-width: initial !important;
left: 0 !important;
padding-left: 0;
- padding-right: 0 !important;
}
/* position controls for apps with app-navigation */
#app-navigation+#app-content #controls {
diff --git a/core/css/share.css b/core/css/share.css
index 0859c195858..314c6140d78 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -35,6 +35,8 @@
#shareWithList label input[type=checkbox]{
margin-left: 0;
+ top: 3px;
+ position: relative;
}
#shareWithList .username{
padding-right: 8px;
diff --git a/core/css/styles.css b/core/css/styles.css
index d407fd7629b..66af01ae3c5 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -261,7 +261,9 @@ input[type="submit"].enabled {
/* position controls for apps with app-navigation */
#app-navigation+#app-content #controls {
left: 250px;
- padding-right: 250px;
+}
+.viewer-mode #app-navigation+#app-content #controls {
+ left: 0;
}
#controls .button,
@@ -618,6 +620,12 @@ label.infield {
cursor: pointer;
}
+/* fixes for update page TODO should be fixed some time in a proper way */
+/* this is just for an error while updating the ownCloud instance */
+#body-login .updateProgress .error {
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
/* Alternative Logins */
#alternative-logins legend { margin-bottom:10px; }
diff --git a/core/js/js.js b/core/js/js.js
index a8dd9ca889d..544b26647a9 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1411,6 +1411,10 @@ OC.Util.History = {
if (pos >= 0) {
return hash.substr(pos + 1);
}
+ if (hash.length) {
+ // remove hash sign
+ return hash.substr(1);
+ }
return '';
},
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 0e4c346e8cc..a76f9170dc8 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -144,7 +144,13 @@ var OCdialogs = {
*/
filepicker:function(title, callback, multiselect, mimetypeFilter, modal) {
var self = this;
+ // avoid opening the picker twice
+ if (this.filepicker.loading) {
+ return;
+ }
+ this.filepicker.loading = true;
$.when(this._getFilePickerTemplate()).then(function($tmpl) {
+ self.filepicker.loading = false;
var dialogName = 'oc-dialog-filepicker-content';
if(self.$filePicker) {
self.$filePicker.ocdialog('close');
@@ -220,6 +226,7 @@ var OCdialogs = {
.fail(function(status, error) {
// If the method is called while navigating away
// from the page, it is probably not needed ;)
+ self.filepicker.loading = false;
if(status !== 0) {
alert(t('core', 'Error loading file picker template: {error}', {error: error}));
}
diff --git a/core/js/share.js b/core/js/share.js
index e164602d0ab..1c59524939c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -569,6 +569,9 @@ OC.Share={
}
html += '<label><input type="checkbox" name="mailNotification" class="mailNotification" ' + checked + ' />'+t('core', 'notify by email')+'</label> ';
}
+ if (possiblePermissions & OC.PERMISSION_SHARE) {
+ html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />'+t('core', 'can share')+'</label>';
+ }
if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
html += '<label><input type="checkbox" name="edit" class="permissions" '+editChecked+' />'+t('core', 'can edit')+'</label> ';
}
@@ -583,9 +586,6 @@ OC.Share={
if (possiblePermissions & OC.PERMISSION_DELETE) {
html += '<label><input type="checkbox" name="delete" class="permissions" '+deleteChecked+' data-permissions="'+OC.PERMISSION_DELETE+'" />'+t('core', 'delete')+'</label>';
}
- if (possiblePermissions & OC.PERMISSION_SHARE) {
- html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />'+t('core', 'share')+'</label>';
- }
html += '</div>';
html += '</li>';
html = $(html).appendTo('#shareWithList');
diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js
index 2af3497051c..3d208d9ef3f 100644
--- a/core/js/tests/specHelper.js
+++ b/core/js/tests/specHelper.js
@@ -85,7 +85,7 @@ window.Snap.prototype = {
beforeEach(function() {
// test area for elements that need absolute selector access or measure widths/heights
// which wouldn't work for detached or hidden elements
- $testArea = $('<div id="testArea" style="position: absolute; width: 1280px; height: 800px; top: -3000px; left: -3000px;"></div>');
+ $testArea = $('<div id="testArea" style="position: absolute; width: 1280px; height: 800px; top: -3000px; left: -3000px; opacity: 0;"></div>');
$('body').append($testArea);
// enforce fake XHR, tests should not depend on the server and
// must use fake responses for expected calls
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index b3ebc2c06bc..83646ed3646 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -77,7 +77,6 @@ $TRANSLATIONS = array(
"create" => "skep",
"update" => "opdateer",
"delete" => "uitvee",
-"share" => "deel",
"Password protected" => "Beskerm met wagwoord",
"Error unsetting expiration date" => "Fout met skrapping van verval datum",
"Error setting expiration date" => "Fout met opstel van verval datum",
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index ceb4b4e757e..c19f7fed8cb 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
"create" => "إنشاء",
"update" => "تحديث",
"delete" => "حذف",
-"share" => "مشاركة",
"Password protected" => "محمي بكلمة السر",
"Error unsetting expiration date" => "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية",
"Error setting expiration date" => "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية",
diff --git a/core/l10n/ast.php b/core/l10n/ast.php
index a40484dfc80..23f7e63d8ae 100644
--- a/core/l10n/ast.php
+++ b/core/l10n/ast.php
@@ -108,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "crear",
"update" => "xubir",
"delete" => "desaniciar",
-"share" => "compartir",
"Password protected" => "Contraseña protexida",
"Error unsetting expiration date" => "Fallu desafitando la data de caducidá",
"Error setting expiration date" => "Fallu afitando la fecha de caducidá",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 1374d391985..a5c6f0cbbd7 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -63,7 +63,6 @@ $TRANSLATIONS = array(
"create" => "създаване",
"update" => "Обновяване",
"delete" => "Изтриване",
-"share" => "Споделяне",
"Password protected" => "Защитено с парола",
"Error unsetting expiration date" => "Грешка при премахване на дата за изтичане",
"Error setting expiration date" => "Грепка при поставяне на дата за изтичане",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 905e60cd671..d1c4425d887 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -62,7 +62,6 @@ $TRANSLATIONS = array(
"create" => "তৈরী করুন",
"update" => "পরিবর্ধন কর",
"delete" => "মুছে ফেল",
-"share" => "ভাগাভাগি কর",
"Password protected" => "কূটশব্দদ্বারা সুরক্ষিত",
"Error unsetting expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে",
"Error setting expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 60623fe0647..d91b4321aef 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -108,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "crea",
"update" => "actualitza",
"delete" => "elimina",
-"share" => "comparteix",
"Password protected" => "Protegeix amb contrasenya",
"Error unsetting expiration date" => "Error en eliminar la data de venciment",
"Error setting expiration date" => "Error en establir la data de venciment",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index c5cc2b3113b..85f6acbd8a6 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -107,7 +107,6 @@ $TRANSLATIONS = array(
"create" => "vytvořit",
"update" => "aktualizovat",
"delete" => "smazat",
-"share" => "sdílet",
"Password protected" => "Chráněno heslem",
"Error unsetting expiration date" => "Chyba při odstraňování data vypršení platnosti",
"Error setting expiration date" => "Chyba při nastavení data vypršení platnosti",
@@ -136,7 +135,7 @@ $TRANSLATIONS = array(
"Yes, I really want to reset my password now" => "Ano, opravdu si nyní přeji obnovit mé heslo",
"Reset" => "Restartovat složku",
"New password" => "Nové heslo",
-"New Password" => "Nové Heslo",
+"New Password" => "Nové heslo",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!",
"For the best results, please consider using a GNU/Linux server instead." => "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.",
"Personal" => "Osobní",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index 892a5717491..860d274d20d 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -63,7 +63,6 @@ $TRANSLATIONS = array(
"create" => "creu",
"update" => "diweddaru",
"delete" => "dileu",
-"share" => "rhannu",
"Password protected" => "Diogelwyd â chyfrinair",
"Error unsetting expiration date" => "Gwall wrth ddad-osod dyddiad dod i ben",
"Error setting expiration date" => "Gwall wrth osod dyddiad dod i ben",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 34f89dae1b6..2f2932a0b1d 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -47,7 +47,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n måned siden","%n måneder siden"),
"last year" => "sidste år",
"years ago" => "år siden",
+"Couldn't send reset email. Please contact your administrator." => "Der opstod et problem under afsending af reset-emailen. Kontakt venligst systemadministratoren.",
+"I know what I'm doing" => "Jeg ved, hvad jeg har gang i",
"Reset password" => "Nulstil kodeord",
+"Password can not be changed. Please contact your administrator." => "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.",
"Yes" => "Ja",
"No" => "Nej",
"Choose" => "Vælg",
@@ -103,7 +106,6 @@ $TRANSLATIONS = array(
"create" => "opret",
"update" => "opdater",
"delete" => "slet",
-"share" => "del",
"Password protected" => "Beskyttet med adgangskode",
"Error unsetting expiration date" => "Fejl ved fjernelse af udløbsdato",
"Error setting expiration date" => "Fejl under sætning af udløbsdato",
@@ -129,6 +131,7 @@ $TRANSLATIONS = array(
"Yes, I really want to reset my password now" => "Ja, Jeg ønsker virkelig at nulstille mit kodeord",
"Reset" => "Nulstil",
"New password" => "Nyt kodeord",
+"New Password" => "Ny adgangskode",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!",
"For the best results, please consider using a GNU/Linux server instead." => "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.",
"Personal" => "Personligt",
@@ -177,6 +180,7 @@ $TRANSLATIONS = array(
"Please change your password to secure your account again." => "Skift adgangskode for at sikre din konto igen.",
"Server side authentication failed!" => "Server side godkendelse mislykkedes!",
"Please contact your administrator." => "Kontakt venligst din administrator",
+"Forgot your password? Reset it!" => "Glemt din adgangskode? Nulstil det!",
"remember" => "husk",
"Log in" => "Log ind",
"Alternative Logins" => "Alternative logins",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index a9f4e7a0a8c..603929d87f6 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -108,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "erstellen",
"update" => "aktualisieren",
"delete" => "löschen",
-"share" => "teilen",
"Password protected" => "Durch ein Passwort geschützt",
"Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
"Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index 18a23e1a2b4..46f40fa628e 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
"create" => "erstellen",
"update" => "aktualisieren",
"delete" => "löschen",
-"share" => "teilen",
"Password protected" => "Passwortgeschützt",
"Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
"Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index f7efdee5777..a126e3dcdfc 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -108,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "erstellen",
"update" => "aktualisieren",
"delete" => "löschen",
-"share" => "teilen",
"Password protected" => "Passwortgeschützt",
"Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
"Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 88824c296f2..4720ad96322 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -47,7 +47,12 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n μήνας πριν","%n μήνες πριν"),
"last year" => "τελευταίο χρόνο",
"years ago" => "χρόνια πριν",
+"Couldn't send reset email. Please contact your administrator." => "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
+"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "Ο σύνδεσμος για την επαναφορά του κωδικού πρόσβασής σας απεστάλη στο ηλ. ταχυδρομείο σας. Εάν δεν το παραλάβετε μέσα σε ένα εύλογο χρονικό διάστημα, ελέγξτε το φάκελο ανεπιθύμητων μηνυμάτων σας. <br>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;",
+"I know what I'm doing" => "Γνωρίζω τι κάνω",
"Reset password" => "Επαναφορά συνθηματικού",
+"Password can not be changed. Please contact your administrator." => "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
"Yes" => "Ναι",
"No" => "Όχι",
"Choose" => "Επιλέξτε",
@@ -103,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "δημιουργία",
"update" => "ενημέρωση",
"delete" => "διαγραφή",
-"share" => "διαμοιρασμός",
"Password protected" => "Προστασία με συνθηματικό",
"Error unsetting expiration date" => "Σφάλμα κατά την διαγραφή της ημ. λήξης",
"Error setting expiration date" => "Σφάλμα κατά τον ορισμό ημ. λήξης",
@@ -121,6 +125,9 @@ $TRANSLATIONS = array(
"Please reload the page." => "Παρακαλώ επαναφορτώστε τη σελίδα.",
"The update was unsuccessful." => "Η ενημέρωση δεν ήταν επιτυχής.",
"The update was successful. Redirecting you to ownCloud now." => "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
+"Couldn't reset password because the token is invalid" => "Αδυναμία επαναφοράς κωδικού πρόσβασης καθώς το τεκμήριο είναι άκυρο",
+"Couldn't send reset email. Please make sure your username is correct." => "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ ελέγξτε ότι το όνομα χρήστη σας είναι ορθό.",
+"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς καθώς δεν αντιστοιχεί καμμία διεύθυνση ηλ. ταχυδρομείου σε αυτό το όνομα χρήστη. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
"%s password reset" => "%s επαναφορά κωδικού πρόσβασης",
"Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
"You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
@@ -178,6 +185,7 @@ $TRANSLATIONS = array(
"Please change your password to secure your account again." => "Παρακαλώ αλλάξτε το συνθηματικό σας για να ασφαλίσετε πάλι τον λογαριασμό σας.",
"Server side authentication failed!" => "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!",
"Please contact your administrator." => "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
+"Forgot your password? Reset it!" => "Ξεχάσατε τον κωδικό πρόσβασής σας; Επαναφέρετέ τον!",
"remember" => "απομνημόνευση",
"Log in" => "Είσοδος",
"Alternative Logins" => "Εναλλακτικές Συνδέσεις",
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index ffaca5de1c5..e41d00fcae6 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -108,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "create",
"update" => "update",
"delete" => "delete",
-"share" => "share",
"Password protected" => "Password protected",
"Error unsetting expiration date" => "Error unsetting expiration date",
"Error setting expiration date" => "Error setting expiration date",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index d789fa42c33..ce44645151b 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -83,7 +83,6 @@ $TRANSLATIONS = array(
"create" => "krei",
"update" => "ĝisdatigi",
"delete" => "forigi",
-"share" => "kunhavigi",
"Password protected" => "Protektita per pasvorto",
"Error unsetting expiration date" => "Eraro dum malagordado de limdato",
"Error setting expiration date" => "Eraro dum agordado de limdato",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 09f8b2c29e7..34447fcccb2 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -49,6 +49,7 @@ $TRANSLATIONS = array(
"years ago" => "hace años",
"Couldn't send reset email. Please contact your administrator." => "El mail de reset no pudo ser enviado. Por favor, contacte con su administrador.",
"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "Un enlace para reestablecer su contraseña ha sido enviado a su email. Si usted no lo recibe en un tiempo razonable, revise tu carpeta spam/correo no deseado.<br>Si no lo encuentra, pregunte a su administrador local.",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Sus archivos están encriptados. Si no ha habilitado la clave de recuperación, no habrá manera de recuperar los datos despues de un reset de la contraseña. .<br /> Si no está seguro de lo que debe hacer, por favor contacte con su administrador antes de continuar.<br />¿Realmente desea continuar?",
"I know what I'm doing" => "Yo soy consciente de lo que estoy haciendo",
"Reset password" => "Restablecer contraseña",
"Password can not be changed. Please contact your administrator." => "La contraseña no se puede cambiar. Por favor, contacte con su administrador.",
@@ -107,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "crear",
"update" => "actualizar",
"delete" => "eliminar",
-"share" => "compartir",
"Password protected" => "Protegido con contraseña",
"Error unsetting expiration date" => "Error eliminando fecha de caducidad",
"Error setting expiration date" => "Error estableciendo fecha de caducidad",
@@ -125,6 +125,9 @@ $TRANSLATIONS = array(
"Please reload the page." => "Recargue/Actualice la página",
"The update was unsuccessful." => "Falló la actualización",
"The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
+"Couldn't reset password because the token is invalid" => "No se puede restablecer la contraseña porque el token no es válido",
+"Couldn't send reset email. Please make sure your username is correct." => "No se pudo resetear su correo electrónico. Por favor, asegúrese de que su nombre de usuario es correcto.",
+"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "No se pudo resetear su correo electrónico, porque no hay una dirección de correo electrónico asociada para este nombre de usuario. Por favor, póngase en contacto con su administrador.",
"%s password reset" => "%s restablecer contraseña",
"Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}",
"You will receive a link to reset your password via Email." => "Recibirá un enlace por correo electrónico para restablecer su contraseña",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 8f9c2dd78e6..95bef493e2f 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -94,7 +94,6 @@ $TRANSLATIONS = array(
"create" => "crear",
"update" => "actualizar",
"delete" => "borrar",
-"share" => "compartir",
"Password protected" => "Protegido por contraseña",
"Error unsetting expiration date" => "Error al remover la fecha de vencimiento",
"Error setting expiration date" => "Error al asignar fecha de vencimiento",
diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php
index 3131a3762d3..97658d7da16 100644
--- a/core/l10n/es_MX.php
+++ b/core/l10n/es_MX.php
@@ -87,7 +87,6 @@ $TRANSLATIONS = array(
"create" => "crear",
"update" => "actualizar",
"delete" => "eliminar",
-"share" => "compartir",
"Password protected" => "Protegido con contraseña",
"Error unsetting expiration date" => "Error eliminando fecha de caducidad",
"Error setting expiration date" => "Error estableciendo fecha de caducidad",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index e91991966d1..a56e63a4a22 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -5,6 +5,8 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Haldusrežiimis sisse lülitatud",
"Turned off maintenance mode" => "Haldusrežiimis välja lülitatud",
"Updated database" => "Uuendatud andmebaas",
+"Checked database schema update" => "Andmebaasi skeemi uuendus kontrollitud",
+"Disabled incompatible apps: %s" => "Keelatud mitteühilduvad rakendid: %s",
"No image or file provided" => "Ühtegi pilti või faili pole pakutud",
"Unknown filetype" => "Tundmatu failitüüp",
"Invalid image" => "Vigane pilt",
@@ -33,6 +35,7 @@ $TRANSLATIONS = array(
"File" => "Fail",
"Folder" => "Kaust",
"Image" => "Pilt",
+"Audio" => "Helid",
"Saving..." => "Salvestamine...",
"seconds ago" => "sekundit tagasi",
"_%n minute ago_::_%n minutes ago_" => array("%n minut tagasi","%n minutit tagasi"),
@@ -44,7 +47,12 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n kuu tagasi","%n kuud tagasi"),
"last year" => "viimasel aastal",
"years ago" => "aastat tagasi",
+"Couldn't send reset email. Please contact your administrator." => "Ei suutnud lähtestada e-maili. Palun kontakteeru süsteemihalduriga.",
+"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge<br>.Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. <br />Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. <br />Oled sa kindel, et sa soovid jätkata?",
+"I know what I'm doing" => "Ma tean mida teen",
"Reset password" => "Nulli parool",
+"Password can not be changed. Please contact your administrator." => "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.",
"Yes" => "Jah",
"No" => "Ei",
"Choose" => "Vali",
@@ -69,6 +77,7 @@ $TRANSLATIONS = array(
"Strong password" => "Väga hea parool",
"Shared" => "Jagatud",
"Shared by {owner}" => "Jagas {owner}",
+"Shared with {recipients}" => "Jagatud {recipients}",
"Share" => "Jaga",
"Error" => "Viga",
"Error while sharing" => "Viga jagamisel",
@@ -99,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "loo",
"update" => "uuenda",
"delete" => "kustuta",
-"share" => "jaga",
"Password protected" => "Parooliga kaitstud",
"Error unsetting expiration date" => "Viga aegumise kuupäeva eemaldamisel",
"Error setting expiration date" => "Viga aegumise kuupäeva määramisel",
@@ -113,8 +121,13 @@ $TRANSLATIONS = array(
"Edit tags" => "Muuda silte",
"Error loading dialog template: {error}" => "Viga dialoogi malli laadimisel: {error}",
"No tags selected for deletion." => "Kustutamiseks pole ühtegi silti valitud.",
+"Updating {productName} to version {version}, this may take a while." => "Uuendan {productName} versioonile {version}, see võtab veidi aega.",
"Please reload the page." => "Palun laadi see uuesti.",
+"The update was unsuccessful." => "Uuendus ebaõnnestus.",
"The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
+"Couldn't reset password because the token is invalid" => "Ei saanud parooli taastada, kuna märgend on vigane",
+"Couldn't send reset email. Please make sure your username is correct." => "Ei suutnud lähtestada e-maili. Palun veendu, et kasutajatunnus on õige.",
+"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Ei suutnud lähtestada e-maili, kuna sellel kasutajal pole e-posti määratud. Palun kontakteeru süsteemihalduriga.",
"%s password reset" => "%s parooli lähtestus",
"Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
"You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
@@ -123,6 +136,7 @@ $TRANSLATIONS = array(
"Yes, I really want to reset my password now" => "Jah, ma tõesti soovin oma parooli praegu taastada",
"Reset" => "Algseaded",
"New password" => "Uus parool",
+"New Password" => "Uus parool",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!",
"For the best results, please consider using a GNU/Linux server instead." => "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.",
"Personal" => "Isiklik",
@@ -154,11 +168,13 @@ $TRANSLATIONS = array(
"Storage & database" => "Andmehoidla ja andmebaas",
"Data folder" => "Andmete kaust",
"Configure the database" => "Seadista andmebaasi",
+"Only %s is available." => "Ainult %s on saadaval.",
"Database user" => "Andmebaasi kasutaja",
"Database password" => "Andmebaasi parool",
"Database name" => "Andmebasi nimi",
"Database tablespace" => "Andmebaasi tabeliruum",
"Database host" => "Andmebaasi host",
+"SQLite will be used as database. For larger installations we recommend to change this." => "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta.",
"Finish setup" => "Lõpeta seadistamine",
"Finishing …" => "Lõpetamine ...",
"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "See rakendus vajab toimimiseks JavaScripti. Palun <a href=\"http://enable-javascript.com/\" target=\"_blank\">luba JavaScript</a> ning laadi see leht uuesti.",
@@ -169,6 +185,7 @@ $TRANSLATIONS = array(
"Please change your password to secure your account again." => "Palun muuda parooli, et oma kasutajakonto uuesti turvata.",
"Server side authentication failed!" => "Serveripoolne autentimine ebaõnnestus!",
"Please contact your administrator." => "Palun kontakteeru oma süsteemihalduriga.",
+"Forgot your password? Reset it!" => "Unustasid parooli? Taasta see!",
"remember" => "pea meeles",
"Log in" => "Logi sisse",
"Alternative Logins" => "Alternatiivsed sisselogimisviisid",
@@ -177,6 +194,11 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "See tähendab, et seda saavad kasutada ainult administraatorid.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakteeru oma süsteemihalduriga, kui see teade püsib või on tekkinud ootamatult.",
"Thank you for your patience." => "Täname kannatlikkuse eest.",
+"%s will be updated to version %s." => "%s uuendatakse versioonile %s.",
+"The following apps will be disabled:" => "Järgnevad rakendid keelatakse:",
+"The theme %s has been disabled." => "Teema %s on keelatud.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Enne jätkamist veendu, et andmebaas, seadete ning andmete kataloog on varundatud.",
+"Start update" => "Käivita uuendus",
"This ownCloud instance is currently being updated, which may take a while." => "Seda ownCloud instantsi hetkel uuendatakse, võib võtta veidi aega.",
"Please reload this page after a short time to continue using ownCloud." => "Palun laadi see leht uuesti veidi aja pärast jätkamaks ownCloud kasutamist."
);
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index aff505ae9ca..4e4a74b4b57 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -103,7 +103,6 @@ $TRANSLATIONS = array(
"create" => "sortu",
"update" => "eguneratu",
"delete" => "ezabatu",
-"share" => "elkarbanatu",
"Password protected" => "Pasahitzarekin babestuta",
"Error unsetting expiration date" => "Errorea izan da muga data kentzean",
"Error setting expiration date" => "Errore bat egon da muga data ezartzean",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 5d63b2d534b..ef00a56a1cb 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
"create" => "ایجاد",
"update" => "به روز",
"delete" => "پاک کردن",
-"share" => "به اشتراک گذاشتن",
"Password protected" => "نگهداری از رمز عبور",
"Error unsetting expiration date" => "خطا در تنظیم نکردن تاریخ انقضا ",
"Error setting expiration date" => "خطا در تنظیم تاریخ انقضا",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index fb8d7a4ab46..18fe3b382ac 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -105,7 +105,6 @@ $TRANSLATIONS = array(
"create" => "luo",
"update" => "päivitä",
"delete" => "poista",
-"share" => "jaa",
"Password protected" => "Salasanasuojattu",
"Error unsetting expiration date" => "Virhe purettaessa eräpäivää",
"Error setting expiration date" => "Virhe päättymispäivää asettaessa",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 9044b98a2d4..125ba35de9b 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -35,6 +35,7 @@ $TRANSLATIONS = array(
"File" => "Fichier",
"Folder" => "Dossier",
"Image" => "Image",
+"Audio" => "Audio",
"Saving..." => "Enregistrement...",
"seconds ago" => "il y a quelques secondes",
"_%n minute ago_::_%n minutes ago_" => array("il y a %n minute","il y a %n minutes"),
@@ -46,7 +47,12 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("Il y a %n mois","Il y a %n mois"),
"last year" => "l'année dernière",
"years ago" => "il y a plusieurs années",
+"Couldn't send reset email. Please contact your administrator." => "Impossible d'envoyer l’émail de réinitialisation. Veuillez contacter votre administrateur.",
+"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "Le lien permettant de réinitialiser votre mot de passe vous a été transmis à votre adresse email.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local.",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura plus aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. Voulez-vous vraiment continuer ?",
+"I know what I'm doing" => "Je sais ce que je fais",
"Reset password" => "Réinitialiser le mot de passe",
+"Password can not be changed. Please contact your administrator." => "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.",
"Yes" => "Oui",
"No" => "Non",
"Choose" => "Choisir",
@@ -102,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "créer",
"update" => "mettre à jour",
"delete" => "supprimer",
-"share" => "partager",
"Password protected" => "Protégé par un mot de passe",
"Error unsetting expiration date" => "Une erreur est survenue pendant la suppression de la date d'expiration",
"Error setting expiration date" => "Erreur lors de la spécification de la date d'expiration",
@@ -120,6 +125,9 @@ $TRANSLATIONS = array(
"Please reload the page." => "Veuillez recharger la page.",
"The update was unsuccessful." => "La mise à jour a échoué.",
"The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.",
+"Couldn't reset password because the token is invalid" => "Impossible de réinitialiser le mot de passe car le jeton est invalide.",
+"Couldn't send reset email. Please make sure your username is correct." => "Impossible d'envoyer l’émail de réinitialisation. Veuillez vérifier que votre nom d'utilisateur est correct.",
+"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Impossible d'envoyer l'email de réinitialisation car il n'y a aucune adresse email pour cet utilisateur. Veuillez contacter votre administrateur.",
"%s password reset" => "Réinitialisation de votre mot de passe %s",
"Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
"You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.",
@@ -128,6 +136,7 @@ $TRANSLATIONS = array(
"Yes, I really want to reset my password now" => "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
"Reset" => "Réinitialiser",
"New password" => "Nouveau mot de passe",
+"New Password" => "Nouveau mot de passe",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X n'est pas supporté et %s ne fonctionnera pas correctement sur cette plateforme. Son utilisation est à vos risques et périls !",
"For the best results, please consider using a GNU/Linux server instead." => "Pour des résultats meilleurs encore, pensez à utiliser un serveur GNU/Linux à la place.",
"Personal" => "Personnel",
@@ -176,6 +185,7 @@ $TRANSLATIONS = array(
"Please change your password to secure your account again." => "Veuillez changer votre mot de passe pour sécuriser à nouveau votre compte.",
"Server side authentication failed!" => "L'authentification côté serveur a échoué !",
"Please contact your administrator." => "Veuillez contacter votre administrateur.",
+"Forgot your password? Reset it!" => "Mot de passe perdu ? Réinitialisez-le !",
"remember" => "se souvenir de moi",
"Log in" => "Connexion",
"Alternative Logins" => "Logins alternatifs",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 95c70e461e9..5facbd5f709 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -108,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "crear",
"update" => "actualizar",
"delete" => "eliminar",
-"share" => "compartir",
"Password protected" => "Protexido con contrasinal",
"Error unsetting expiration date" => "Produciuse un erro ao retirar a data de caducidade",
"Error setting expiration date" => "Produciuse un erro ao definir a data de caducidade",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index e8a4ee9b407..cc5c3641631 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -65,7 +65,6 @@ $TRANSLATIONS = array(
"create" => "יצירה",
"update" => "עדכון",
"delete" => "מחיקה",
-"share" => "שיתוף",
"Password protected" => "מוגן בססמה",
"Error unsetting expiration date" => "אירעה שגיאה בביטול תאריך התפוגה",
"Error setting expiration date" => "אירעה שגיאה בעת הגדרת תאריך התפוגה",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 365d230fb90..4fdbd02ead6 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -56,7 +56,6 @@ $TRANSLATIONS = array(
"create" => "kreiraj",
"update" => "ažuriraj",
"delete" => "izbriši",
-"share" => "djeli",
"Password protected" => "Zaštita lozinkom",
"Error unsetting expiration date" => "Greška prilikom brisanja datuma isteka",
"Error setting expiration date" => "Greška prilikom postavljanja datuma isteka",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 040d992af5f..82fc07d7248 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -103,7 +103,6 @@ $TRANSLATIONS = array(
"create" => "létrehoz",
"update" => "szerkeszt",
"delete" => "töröl",
-"share" => "megoszt",
"Password protected" => "Jelszóval van védve",
"Error unsetting expiration date" => "Nem sikerült a lejárati időt törölni",
"Error setting expiration date" => "Nem sikerült a lejárati időt beállítani",
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index bb544fdadfb..65cff076a72 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -85,7 +85,6 @@ $TRANSLATIONS = array(
"create" => "crear",
"update" => "actualisar",
"delete" => "deler",
-"share" => "compartir",
"Password protected" => "Proteger con contrasigno",
"Error unsetting expiration date" => "Error quando on levava le data de expiration",
"Error setting expiration date" => "Error quando on fixava le data de expiration",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 1d84d27b932..b4d6832e28f 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -95,7 +95,6 @@ $TRANSLATIONS = array(
"create" => "buat",
"update" => "perbarui",
"delete" => "hapus",
-"share" => "bagikan",
"Password protected" => "Sandi dilindungi",
"Error unsetting expiration date" => "Galat ketika menghapus tanggal kedaluwarsa",
"Error setting expiration date" => "Galat ketika mengatur tanggal kedaluwarsa",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 08829bcbcc0..8f41982eed3 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -62,7 +62,6 @@ $TRANSLATIONS = array(
"create" => "mynda",
"update" => "uppfæra",
"delete" => "eyða",
-"share" => "deila",
"Password protected" => "Verja með lykilorði",
"Error unsetting expiration date" => "Villa við að aftengja gildistíma",
"Error setting expiration date" => "Villa við að setja gildistíma",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index b26b60f36a2..59320286865 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -108,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "creare",
"update" => "aggiornare",
"delete" => "elimina",
-"share" => "condividi",
"Password protected" => "Protetta da password",
"Error unsetting expiration date" => "Errore durante la rimozione della data di scadenza",
"Error setting expiration date" => "Errore durante l'impostazione della data di scadenza",
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
index d33031337cf..f612eec193c 100644
--- a/core/l10n/ja.php
+++ b/core/l10n/ja.php
@@ -48,6 +48,9 @@ $TRANSLATIONS = array(
"last year" => "1年前",
"years ago" => "数年前",
"Couldn't send reset email. Please contact your administrator." => "リセットメールを送信できませんでした。管理者に問い合わせてください。",
+"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "パスワードをリセットする、このリンクをクリックするとメールを送信します。しばらく経ってもメールが届かなかった場合は、スパム/ジャンクフォルダを確認してください。<br>それでも見つからなかった場合は、管理者に問合せてください。",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?",
+"I know what I'm doing" => "どういう操作をしているか理解しています",
"Reset password" => "パスワードをリセット",
"Password can not be changed. Please contact your administrator." => "パスワードは変更できません。管理者に問い合わせてください。",
"Yes" => "はい",
@@ -84,10 +87,10 @@ $TRANSLATIONS = array(
"Shared with you by {owner}" => "{owner} と共有中",
"Share with user or group …" => "ユーザーもしくはグループと共有 ...",
"Share link" => "URLで共有",
-"The public link will expire no later than {days} days after it is created" => "公開用リンクは、作成してから {days} 日以内に有効期限切れになります",
-"By default the public link will expire after {days} days" => "デフォルトの設定では、公開用リンクは {days} 日後に有効期限切れになります",
-"Password protect" => "パスワード保護",
-"Choose a password for the public link" => "公開用リンクのパスワードを選択",
+"The public link will expire no later than {days} days after it is created" => "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
+"By default the public link will expire after {days} days" => "デフォルトの設定では、URLによる共有は {days} 日後に有効期限切れになります",
+"Password protect" => "パスワード保護を有効化",
+"Choose a password for the public link" => "URLによる共有のパスワードを入力",
"Allow Public Upload" => "アップロードを許可",
"Email link to person" => "メールリンク",
"Send" => "送信",
@@ -105,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "作成",
"update" => "アップデート",
"delete" => "削除",
-"share" => "共有",
"Password protected" => "パスワード保護",
"Error unsetting expiration date" => "有効期限の未設定エラー",
"Error setting expiration date" => "有効期限の設定でエラー発生",
@@ -183,6 +185,7 @@ $TRANSLATIONS = array(
"Please change your password to secure your account again." => "アカウント保護のため、パスワードを再度変更してください。",
"Server side authentication failed!" => "サーバーサイドの認証に失敗しました!",
"Please contact your administrator." => "管理者に問い合わせてください。",
+"Forgot your password? Reset it!" => "パスワードを忘れましたか?リセットします!",
"remember" => "パスワードを保存",
"Log in" => "ログイン",
"Alternative Logins" => "代替ログイン",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 50b60f9b103..3edcf4a1671 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
"create" => "შექმნა",
"update" => "განახლება",
"delete" => "წაშლა",
-"share" => "გაზიარება",
"Password protected" => "პაროლით დაცული",
"Error unsetting expiration date" => "შეცდომა ვადის გასვლის მოხსნის დროს",
"Error setting expiration date" => "შეცდომა ვადის გასვლის მითითების დროს",
diff --git a/core/l10n/km.php b/core/l10n/km.php
index 24d8ad8bc9a..bb959ce98bf 100644
--- a/core/l10n/km.php
+++ b/core/l10n/km.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
"create" => "បង្កើត",
"update" => "ធ្វើ​បច្ចុប្បន្នភាព",
"delete" => "លុប",
-"share" => "ចែក​រំលែក",
"Password protected" => "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
"Sending ..." => "កំពុង​ផ្ញើ ...",
"Email sent" => "បាន​ផ្ញើ​អ៊ីមែល",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 58c9fb43509..bd52e5eb277 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -92,7 +92,6 @@ $TRANSLATIONS = array(
"create" => "생성",
"update" => "업데이트",
"delete" => "삭제",
-"share" => "공유",
"Password protected" => "암호로 보호됨",
"Error unsetting expiration date" => "만료 날짜 해제 오류",
"Error setting expiration date" => "만료 날짜 설정 오류",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 471daa0af8e..8123c8fe865 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -77,7 +77,6 @@ $TRANSLATIONS = array(
"create" => "erstellen",
"update" => "aktualiséieren",
"delete" => "läschen",
-"share" => "deelen",
"Password protected" => "Passwuertgeschützt",
"Error unsetting expiration date" => "Feeler beim Läsche vum Verfallsdatum",
"Error setting expiration date" => "Feeler beim Setze vum Verfallsdatum",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 8a87ab03356..278df5ef460 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -87,7 +87,6 @@ $TRANSLATIONS = array(
"create" => "sukurti",
"update" => "atnaujinti",
"delete" => "ištrinti",
-"share" => "dalintis",
"Password protected" => "Apsaugota slaptažodžiu",
"Error unsetting expiration date" => "Klaida nuimant galiojimo laiką",
"Error setting expiration date" => "Klaida nustatant galiojimo laiką",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 3e0b01d791b..6ee34d8612d 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
"create" => "izveidot",
"update" => "atjaunināt",
"delete" => "dzēst",
-"share" => "dalīties",
"Password protected" => "Aizsargāts ar paroli",
"Error unsetting expiration date" => "Kļūda, noņemot termiņa datumu",
"Error setting expiration date" => "Kļūda, iestatot termiņa datumu",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index df335543d15..e8267b11a74 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -83,7 +83,6 @@ $TRANSLATIONS = array(
"create" => "креирај",
"update" => "ажурирај",
"delete" => "избриши",
-"share" => "сподели",
"Password protected" => "Заштитено со лозинка",
"Error unsetting expiration date" => "Грешка при тргање на рокот на траење",
"Error setting expiration date" => "Грешка при поставување на рок на траење",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index e9a228bdea9..3807f62a1bd 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -35,7 +35,6 @@ $TRANSLATIONS = array(
"can edit" => "ပြင်ဆင်နိုင်",
"create" => "ဖန်တီးမည်",
"delete" => "ဖျက်မည်",
-"share" => "ဝေမျှမည်",
"Password protected" => "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
"Add" => "ပေါင်းထည့်",
"You will receive a link to reset your password via Email." => "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index e5f959f1e13..3dace79ab7c 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -108,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "opprett",
"update" => "oppdater",
"delete" => "slett",
-"share" => "del",
"Password protected" => "Passordbeskyttet",
"Error unsetting expiration date" => "Feil ved nullstilling av utløpsdato",
"Error setting expiration date" => "Kan ikke sette utløpsdato",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 7c977ae71d7..7d297073222 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -47,7 +47,12 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("","%n maanden geleden"),
"last year" => "vorig jaar",
"years ago" => "jaar geleden",
+"Couldn't send reset email. Please contact your administrator." => "Kon herstel e-mail niet versturen. Neem contact op met uw beheerder.",
+"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "De link om uw wachtwoord te herstellen is per e-mail naar u verstuurd. Als u dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan uw spammapje. <br>Als het daar niet in zit, neem dan contact op met uw beheerder.",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Uw bestanden zijn versleuteld. Als u de herstelsleutel niet hebt geactiveerd, dan is er geen mogelijk om uw gegevens terug te krijgen nadat uw wachtwoord is hersteld. <br>Als u niet weet wat u moet doen, neem dan eerst contact op met uw beheerder. <br>Wilt u echt verder gaan?",
+"I know what I'm doing" => "Ik weet wat ik doe",
"Reset password" => "Reset wachtwoord",
+"Password can not be changed. Please contact your administrator." => "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.",
"Yes" => "Ja",
"No" => "Nee",
"Choose" => "Kies",
@@ -103,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "creëer",
"update" => "bijwerken",
"delete" => "verwijderen",
-"share" => "deel",
"Password protected" => "Wachtwoord beveiligd",
"Error unsetting expiration date" => "Fout tijdens het verwijderen van de vervaldatum",
"Error setting expiration date" => "Fout tijdens het instellen van de vervaldatum",
@@ -121,6 +125,9 @@ $TRANSLATIONS = array(
"Please reload the page." => "Herlaad deze pagina.",
"The update was unsuccessful." => "De update is niet geslaagd.",
"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
+"Couldn't reset password because the token is invalid" => "Kon het wachtwoord niet herstellen omdat het token ongeldig is",
+"Couldn't send reset email. Please make sure your username is correct." => "Kon e-mail niet versturen. Verifieer of uw gebruikersnaam correct is.",
+"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Kon wachtwoordherstel e-mailbericht niet versturen, omdat er geen e-mailadres bekend is voor deze gebruikersnaam. Neem contact op met uw beheerder.",
"%s password reset" => "%s wachtwoord reset",
"Use the following link to reset your password: {link}" => "Gebruik de volgende link om uw wachtwoord te resetten: {link}",
"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
@@ -129,6 +136,7 @@ $TRANSLATIONS = array(
"Yes, I really want to reset my password now" => "Ja, ik wil mijn wachtwoord nu echt resetten",
"Reset" => "Reset",
"New password" => "Nieuw wachtwoord",
+"New Password" => "Nieuw wachtwoord",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!",
"For the best results, please consider using a GNU/Linux server instead." => "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.",
"Personal" => "Persoonlijk",
@@ -177,6 +185,7 @@ $TRANSLATIONS = array(
"Please change your password to secure your account again." => "Wijzig uw wachtwoord zodat uw account weer beveiligd is.",
"Server side authentication failed!" => "Authenticatie bij de server mislukte!",
"Please contact your administrator." => "Neem contact op met uw systeembeheerder.",
+"Forgot your password? Reset it!" => "Wachtwoord vergeten? Herstel het!",
"remember" => "onthoud gegevens",
"Log in" => "Meld u aan",
"Alternative Logins" => "Alternatieve inlogs",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 48873b51771..d04e38c34b2 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -83,7 +83,6 @@ $TRANSLATIONS = array(
"create" => "lag",
"update" => "oppdater",
"delete" => "slett",
-"share" => "del",
"Password protected" => "Passordverna",
"Error unsetting expiration date" => "Klarte ikkje fjerna utløpsdato",
"Error setting expiration date" => "Klarte ikkje setja utløpsdato",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index 38b04414318..4fbd8b4f466 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -57,7 +57,6 @@ $TRANSLATIONS = array(
"create" => "crea",
"update" => "met a jorn",
"delete" => "escafa",
-"share" => "parteja",
"Password protected" => "Parat per senhal",
"Error unsetting expiration date" => "Error al metre de la data d'expiracion",
"Error setting expiration date" => "Error setting expiration date",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index f9b7efedfd3..eb6bf8eea09 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -47,7 +47,10 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"),
"last year" => "w zeszłym roku",
"years ago" => "lat temu",
+"Couldn't send reset email. Please contact your administrator." => "Nie mogę wysłać maila resetującego. Skontaktuj się z administratorem.",
+"I know what I'm doing" => "Wiem co robię",
"Reset password" => "Zresetuj hasło",
+"Password can not be changed. Please contact your administrator." => "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.",
"Yes" => "Tak",
"No" => "Nie",
"Choose" => "Wybierz",
@@ -103,7 +106,6 @@ $TRANSLATIONS = array(
"create" => "utwórz",
"update" => "uaktualnij",
"delete" => "usuń",
-"share" => "współdziel",
"Password protected" => "Zabezpieczone hasłem",
"Error unsetting expiration date" => "Błąd podczas usuwania daty wygaśnięcia",
"Error setting expiration date" => "Błąd podczas ustawiania daty wygaśnięcia",
@@ -121,6 +123,9 @@ $TRANSLATIONS = array(
"Please reload the page." => "Proszę przeładować stronę",
"The update was unsuccessful." => "Aktualizacja nie powiodła się.",
"The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
+"Couldn't reset password because the token is invalid" => "Nie można zresetować hasła, ponieważ token jest niepoprawny",
+"Couldn't send reset email. Please make sure your username is correct." => "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika jest poprawna.",
+"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika lub adres email jest poprawny. Skontaktuj się z administratorem.",
"%s password reset" => "%s reset hasła",
"Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {link}",
"You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
@@ -129,6 +134,7 @@ $TRANSLATIONS = array(
"Yes, I really want to reset my password now" => "Tak, naprawdę chcę zresetować hasło teraz",
"Reset" => "Resetuj",
"New password" => "Nowe hasło",
+"New Password" => "Nowe hasło",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!",
"For the best results, please consider using a GNU/Linux server instead." => "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.",
"Personal" => "Osobiste",
@@ -177,6 +183,7 @@ $TRANSLATIONS = array(
"Please change your password to secure your account again." => "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto.",
"Server side authentication failed!" => "Uwierzytelnianie po stronie serwera nie powiodło się!",
"Please contact your administrator." => "Skontaktuj się z administratorem",
+"Forgot your password? Reset it!" => "Nie pamiętasz hasła? Zresetuj je!",
"remember" => "pamiętaj",
"Log in" => "Zaloguj",
"Alternative Logins" => "Alternatywne loginy",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index b97bdc93796..bffe14ecddb 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -108,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "criar",
"update" => "atualizar",
"delete" => "remover",
-"share" => "compartilhar",
"Password protected" => "Protegido com senha",
"Error unsetting expiration date" => "Erro ao remover data de expiração",
"Error setting expiration date" => "Erro ao definir data de expiração",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index ec417c4f178..73c738b55f9 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Activado o modo de manutenção",
"Turned off maintenance mode" => "Desactivado o modo de manutenção",
"Updated database" => "Base de dados actualizada",
+"Checked database schema update" => "Atualização do esquema da base de dados verificada.",
"Disabled incompatible apps: %s" => "Apps incompatíveis desativadas: %s",
"No image or file provided" => "Não foi selecionado nenhum ficheiro para importar",
"Unknown filetype" => "Ficheiro desconhecido",
@@ -46,7 +47,12 @@ $TRANSLATIONS = array(
"_%n month ago_::_%n months ago_" => array("%n mês atrás","%n meses atrás"),
"last year" => "ano passado",
"years ago" => "anos atrás",
+"Couldn't send reset email. Please contact your administrator." => "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.",
+"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
+"I know what I'm doing" => "Tenho a certeza",
"Reset password" => "Repor password",
+"Password can not be changed. Please contact your administrator." => "A password não pode ser alterada. Contacte o seu administrador.",
"Yes" => "Sim",
"No" => "Não",
"Choose" => "Escolha",
@@ -71,6 +77,7 @@ $TRANSLATIONS = array(
"Strong password" => "Password muito forte",
"Shared" => "Partilhado",
"Shared by {owner}" => "Partilhado por {owner}",
+"Shared with {recipients}" => "Partilhado com {recipients}",
"Share" => "Partilhar",
"Error" => "Erro",
"Error while sharing" => "Erro ao partilhar",
@@ -101,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "criar",
"update" => "actualizar",
"delete" => "apagar",
-"share" => "partilhar",
"Password protected" => "Protegido com palavra-passe",
"Error unsetting expiration date" => "Erro ao retirar a data de expiração",
"Error setting expiration date" => "Erro ao aplicar a data de expiração",
@@ -119,6 +125,9 @@ $TRANSLATIONS = array(
"Please reload the page." => "Por favor recarregue a página.",
"The update was unsuccessful." => "Não foi possível atualizar.",
"The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
+"Couldn't reset password because the token is invalid" => "É impossível efetuar reset à password. ",
+"Couldn't send reset email. Please make sure your username is correct." => "Ocorreu um problema com o envio do e-mail, por favor confirme o seu utilizador.",
+"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Ocorreu um problema com o envio do e-mail, por favor contacte o administrador.",
"%s password reset" => "%s reposição da password",
"Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
"You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
@@ -127,6 +136,7 @@ $TRANSLATIONS = array(
"Yes, I really want to reset my password now" => "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora.",
"Reset" => "Repor",
"New password" => "Nova palavra-chave",
+"New Password" => "Nova password",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
"For the best results, please consider using a GNU/Linux server instead." => "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
"Personal" => "Pessoal",
@@ -158,11 +168,13 @@ $TRANSLATIONS = array(
"Storage & database" => "Armazenamento e base de dados",
"Data folder" => "Pasta de dados",
"Configure the database" => "Configure a base de dados",
+"Only %s is available." => "Apenas %s está disponível.",
"Database user" => "Utilizador da base de dados",
"Database password" => "Password da base de dados",
"Database name" => "Nome da base de dados",
"Database tablespace" => "Tablespace da base de dados",
"Database host" => "Anfitrião da base de dados",
+"SQLite will be used as database. For larger installations we recommend to change this." => "Será usado SQLite como base de dados. Para instalações maiores é recomendável a sua alteração.",
"Finish setup" => "Acabar instalação",
"Finishing …" => "A terminar...",
"This application requires JavaScript to be enabled for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Esta aplicação requer JavaScript ativado para uma operação correta. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">ative o JavaScript</a> e recarregue esta interface.",
@@ -173,6 +185,7 @@ $TRANSLATIONS = array(
"Please change your password to secure your account again." => "Por favor mude a sua palavra-passe para assegurar a sua conta de novo.",
"Server side authentication failed!" => "Autenticação do lado do servidor falhou!",
"Please contact your administrator." => "Por favor contacte o administrador.",
+"Forgot your password? Reset it!" => "Esqueceu-se da password? Recupere-a!",
"remember" => "lembrar",
"Log in" => "Entrar",
"Alternative Logins" => "Contas de acesso alternativas",
@@ -184,6 +197,8 @@ $TRANSLATIONS = array(
"%s will be updated to version %s." => "O %s irá ser atualizado para a versão %s.",
"The following apps will be disabled:" => "As seguintes apps irão ser desativadas:",
"The theme %s has been disabled." => "O tema %s foi desativado.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Por favor garanta a cópia de segurança da base de dados e das pastas 'config' e 'data' antes de prosseguir.",
+"Start update" => "Iniciar atualização",
"This ownCloud instance is currently being updated, which may take a while." => "Esta instância do ownCloud está a ser actualizada, poderá demorar algum tempo.",
"Please reload this page after a short time to continue using ownCloud." => "Por favo recarregue esta página após algum tempo para continuar a usar ownCloud."
);
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 4cfe6ebc2b7..c6ffc2ce684 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
"create" => "creare",
"update" => "actualizare",
"delete" => "ștergere",
-"share" => "partajare",
"Password protected" => "Protejare cu parolă",
"Error unsetting expiration date" => "Eroare la anularea datei de expirare",
"Error setting expiration date" => "Eroare la specificarea datei de expirare",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index d8fe5740726..2adde7f9ba4 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
"Turned on maintenance mode" => "Режим отладки включён",
"Turned off maintenance mode" => "Режим отладки отключён",
"Updated database" => "База данных обновлена",
+"Checked database schema update" => "Проверено обновление схемы БД",
"Disabled incompatible apps: %s" => "Отключенные несовместимые приложения: %s",
"No image or file provided" => "Не указано изображение или файл",
"Unknown filetype" => "Неизвестный тип файла",
@@ -36,17 +37,19 @@ $TRANSLATIONS = array(
"Image" => "Изображение",
"Audio" => "Аудио",
"Saving..." => "Сохранение...",
-"seconds ago" => "несколько секунд назад",
+"seconds ago" => "только что",
"_%n minute ago_::_%n minutes ago_" => array("%n минуту назад","%n минуты назад","%n минут назад"),
"_%n hour ago_::_%n hours ago_" => array("%n час назад","%n часа назад","%n часов назад"),
"today" => "сегодня",
"yesterday" => "вчера",
"_%n day ago_::_%n days ago_" => array("%n день назад","%n дня назад","%n дней назад"),
-"last month" => "в прошлом месяце",
+"last month" => "месяц назад",
"_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"),
-"last year" => "в прошлом году",
+"last year" => "год назад",
"years ago" => "несколько лет назад",
"Couldn't send reset email. Please contact your administrator." => "Не удалось отправить письмо для сброса пароля. Пожалуйста, свяжитесь с вашим администратором.",
+"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "Ссылка для восстановления пароля была отправлена на вашу почту. Если вы не получили её, проверьте папку спама.<br>Если там письма со ссылкой нет, то обратитесь к локальному администратору.",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к локальному администратору.<br />Вытдействительно хотите продолжить?",
"I know what I'm doing" => "Я понимаю, что делаю",
"Reset password" => "Сбросить пароль",
"Password can not be changed. Please contact your administrator." => "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
@@ -74,6 +77,7 @@ $TRANSLATIONS = array(
"Strong password" => "Устойчивый к взлому пароль",
"Shared" => "Общие",
"Shared by {owner}" => "Доступ открыл {owner}",
+"Shared with {recipients}" => "Доступ открыт {recipients}",
"Share" => "Открыть доступ",
"Error" => "Ошибка",
"Error while sharing" => "Ошибка при открытии доступа",
@@ -104,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "создать",
"update" => "обновить",
"delete" => "удалить",
-"share" => "открыть доступ",
"Password protected" => "Защищено паролем",
"Error unsetting expiration date" => "Ошибка при отмене срока доступа",
"Error setting expiration date" => "Ошибка при установке срока доступа",
@@ -122,7 +125,9 @@ $TRANSLATIONS = array(
"Please reload the page." => "Пожалуйста, перезагрузите страницу.",
"The update was unsuccessful." => "Обновление не удалось.",
"The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
+"Couldn't reset password because the token is invalid" => "Невозможно сбросить пароль потому, что ключ неправильный",
"Couldn't send reset email. Please make sure your username is correct." => "Не удалось отправить письмо для сброса пароля. Пожалуйста, убедитесь в том, что ваше имя пользователя введено верно.",
+"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Невозможно отправить письмо для сброса пароля, т.к. у вашего аккаунта не прописан адрес почты. Пожалуйста, свяжитесь с администратором.",
"%s password reset" => "%s сброс пароля",
"Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
"You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index 8a245fe8bdb..3a660806fd4 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -53,7 +53,6 @@ $TRANSLATIONS = array(
"create" => "සදන්න",
"update" => "යාවත්කාලීන කරන්න",
"delete" => "මකන්න",
-"share" => "බෙදාහදාගන්න",
"Password protected" => "මුර පදයකින් ආරක්ශාකර ඇත",
"Error unsetting expiration date" => "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්",
"Error setting expiration date" => "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 33a5e309727..09336bfe5a6 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -108,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "vytvoriť",
"update" => "aktualizovať",
"delete" => "vymazať",
-"share" => "zdieľať",
"Password protected" => "Chránené heslom",
"Error unsetting expiration date" => "Chyba pri odstraňovaní dátumu expirácie",
"Error setting expiration date" => "Chyba pri nastavení dátumu expirácie",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 4fe12d76021..35a3c378555 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -33,6 +33,7 @@ $TRANSLATIONS = array(
"File" => "Datoteka",
"Folder" => "Mapa",
"Image" => "Slika",
+"Audio" => "Zvok",
"Saving..." => "Poteka shranjevanje ...",
"seconds ago" => "pred nekaj sekundami",
"_%n minute ago_::_%n minutes ago_" => array("pred %n minuto","pred %n minutama","pred %n minutami","pred %n minutami"),
@@ -45,6 +46,7 @@ $TRANSLATIONS = array(
"last year" => "lansko leto",
"years ago" => "let nazaj",
"Reset password" => "Ponastavi geslo",
+"Password can not be changed. Please contact your administrator." => "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.",
"Yes" => "Da",
"No" => "Ne",
"Choose" => "Izbor",
@@ -96,7 +98,6 @@ $TRANSLATIONS = array(
"create" => "ustvari",
"update" => "posodobi",
"delete" => "izbriše",
-"share" => "določi souporabo",
"Password protected" => "Zaščiteno z geslom",
"Error unsetting expiration date" => "Napaka brisanja datuma preteka",
"Error setting expiration date" => "Napaka nastavljanja datuma preteka",
@@ -111,6 +112,7 @@ $TRANSLATIONS = array(
"Error loading dialog template: {error}" => "Napaka nalaganja predloge pogovornega okna: {error}",
"No tags selected for deletion." => "Ni izbranih oznak za izbris.",
"Please reload the page." => "Stran je treba ponovno naložiti",
+"The update was unsuccessful." => "Posodobitev je spodletela",
"The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
"%s password reset" => "Ponastavitev gesla %s",
"Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {link}",
@@ -120,6 +122,7 @@ $TRANSLATIONS = array(
"Yes, I really want to reset my password now" => "Da, potrjujem ponastavitev gesla",
"Reset" => "Ponastavi",
"New password" => "Novo geslo",
+"New Password" => "Novo geslo",
"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ",
"For the best results, please consider using a GNU/Linux server instead." => "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.",
"Personal" => "Osebno",
@@ -174,6 +177,8 @@ $TRANSLATIONS = array(
"This means only administrators can use the instance." => "To pomeni, da lahko oblak uporabljajo le osebe s skrbniškimi dovoljenji.",
"Contact your system administrator if this message persists or appeared unexpectedly." => "Stopite v stik s skrbnikom sistema, če se bo sporočilo še naprej nepričakovano prikazovalo.",
"Thank you for your patience." => "Hvala za potrpežljivost!",
+"The theme %s has been disabled." => "Tema %s je onemogočena za uporabo.",
+"Start update" => "Začni posodobitev",
"This ownCloud instance is currently being updated, which may take a while." => "Nastavitev oblaka ownCloud se trenutno posodablja. Opravilo je lahko dolgotrajno ...",
"Please reload this page after a short time to continue using ownCloud." => "Ponovno naložite to stran po krajšem preteku časa in nadaljujte z uporabo oblaka ownCloud."
);
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 2465ca92be2..2479d69a4cf 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -67,7 +67,6 @@ $TRANSLATIONS = array(
"create" => "krijo",
"update" => "azhurno",
"delete" => "elimino",
-"share" => "nda",
"Password protected" => "Mbrojtur me kod",
"Error unsetting expiration date" => "Veprim i gabuar gjatë heqjes së datës së përfundimit",
"Error setting expiration date" => "Veprim i gabuar gjatë caktimit të datës së përfundimit",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 09ffd425242..bcb0ebdb6aa 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -61,7 +61,6 @@ $TRANSLATIONS = array(
"create" => "направи",
"update" => "ажурирај",
"delete" => "обриши",
-"share" => "подели",
"Password protected" => "Заштићено лозинком",
"Error unsetting expiration date" => "Грешка код поништавања датума истека",
"Error setting expiration date" => "Грешка код постављања датума истека",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index e46d4dd94d5..15adc5e5d8b 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -60,7 +60,6 @@ $TRANSLATIONS = array(
"create" => "napravi",
"update" => "ažuriranje",
"delete" => "brisanje",
-"share" => "deljenje",
"Password protected" => "Zaštćeno lozinkom",
"Error unsetting expiration date" => "Greška u uklanjanju datuma isteka",
"Error setting expiration date" => "Greška u postavljanju datuma isteka",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 81c6e735a4c..e8ea85e09b4 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -101,7 +101,6 @@ $TRANSLATIONS = array(
"create" => "skapa",
"update" => "uppdatera",
"delete" => "radera",
-"share" => "dela",
"Password protected" => "Lösenordsskyddad",
"Error unsetting expiration date" => "Fel vid borttagning av utgångsdatum",
"Error setting expiration date" => "Fel vid sättning av utgångsdatum",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 77dcf0468cf..d70437dff08 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -61,7 +61,6 @@ $TRANSLATIONS = array(
"create" => "உருவவாக்கல்",
"update" => "இற்றைப்படுத்தல்",
"delete" => "நீக்குக",
-"share" => "பகிர்தல்",
"Password protected" => "கடவுச்சொல் பாதுகாக்கப்பட்டது",
"Error unsetting expiration date" => "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு",
"Error setting expiration date" => "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 2f54c4d92f8..f195dce509b 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
"create" => "สร้าง",
"update" => "อัพเดท",
"delete" => "ลบ",
-"share" => "แชร์",
"Password protected" => "ใส่รหัสผ่านไว้",
"Error unsetting expiration date" => "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ",
"Error setting expiration date" => "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 3b1bab2c72c..f75de2cb1ee 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -108,7 +108,6 @@ $TRANSLATIONS = array(
"create" => "oluştur",
"update" => "güncelle",
"delete" => "sil",
-"share" => "paylaş",
"Password protected" => "Parola korumalı",
"Error unsetting expiration date" => "Son kullanma tarihi kaldırma hatası",
"Error setting expiration date" => "Son kullanma tarihi ayarlama hatası",
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index f1d373099d4..977f8f465a5 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -39,7 +39,6 @@ $TRANSLATIONS = array(
"group" => "گۇرۇپپا",
"Unshare" => "ھەمبەھىرلىمە",
"delete" => "ئۆچۈر",
-"share" => "ھەمبەھىر",
"Warning" => "ئاگاھلاندۇرۇش",
"Delete" => "ئۆچۈر",
"Add" => "قوش",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index b65f613c51c..a9773127951 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
"November" => "Листопад",
"December" => "Грудень",
"Settings" => "Налаштування",
+"File" => "Файл",
"Folder" => "Тека",
"Saving..." => "Зберігаю...",
"seconds ago" => "секунди тому",
@@ -92,7 +93,6 @@ $TRANSLATIONS = array(
"create" => "створити",
"update" => "оновити",
"delete" => "видалити",
-"share" => "опублікувати",
"Password protected" => "Захищено паролем",
"Error unsetting expiration date" => "Помилка при відміні терміна дії",
"Error setting expiration date" => "Помилка при встановленні терміна дії",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 9b5774c5b29..a8d64ba7822 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -88,7 +88,6 @@ $TRANSLATIONS = array(
"create" => "نیا بنائیں",
"update" => "اپ ڈیٹ",
"delete" => "ختم کریں",
-"share" => "شئیر کریں",
"Password protected" => "پاسورڈ سے محفوظ کیا گیا ہے",
"Error unsetting expiration date" => "خرابی غیر تصحیح تاریخ معیاد",
"Error setting expiration date" => "خرابی تصحیح تاریخ معیاد",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 47e7f5e4a07..27f2daac596 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -87,7 +87,6 @@ $TRANSLATIONS = array(
"create" => "tạo",
"update" => "cập nhật",
"delete" => "xóa",
-"share" => "chia sẻ",
"Password protected" => "Mật khẩu bảo vệ",
"Error unsetting expiration date" => "Lỗi không thiết lập ngày kết thúc",
"Error setting expiration date" => "Lỗi cấu hình ngày kết thúc",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 2b4107808c1..17b3a82ea66 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -99,7 +99,6 @@ $TRANSLATIONS = array(
"create" => "创建",
"update" => "更新",
"delete" => "删除",
-"share" => "共享",
"Password protected" => "密码已受保护",
"Error unsetting expiration date" => "取消设置过期日期时出错",
"Error setting expiration date" => "设置过期日期时出错",
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index 4920b88ee3c..01a4de44c22 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -51,7 +51,6 @@ $TRANSLATIONS = array(
"create" => "新增",
"update" => "更新",
"delete" => "刪除",
-"share" => "分享",
"Password protected" => "密碼保護",
"Sending ..." => "傳送中",
"Email sent" => "郵件已傳",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index a74558d908c..d0ba680c042 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -29,6 +29,7 @@ $TRANSLATIONS = array(
"November" => "十一月",
"December" => "十二月",
"Settings" => "設定",
+"File" => "檔案",
"Folder" => "資料夾",
"Saving..." => "儲存中...",
"seconds ago" => "幾秒前",
@@ -92,7 +93,6 @@ $TRANSLATIONS = array(
"create" => "建立",
"update" => "更新",
"delete" => "刪除",
-"share" => "分享",
"Password protected" => "受密碼保護",
"Error unsetting expiration date" => "取消到期日設定失敗",
"Error setting expiration date" => "設定到期日發生錯誤",
diff --git a/l10n/ach/core.po b/l10n/ach/core.po
index 6f2ac78a538..17f5a898516 100644
--- a/l10n/ach/core.po
+++ b/l10n/ach/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/ach/files_sharing.po b/l10n/ach/files_sharing.po
index 107739ac509..5a05fb6d227 100644
--- a/l10n/ach/files_sharing.po
+++ b/l10n/ach/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ady/core.po b/l10n/ady/core.po
index 6536f34bb08..36ae4c39c50 100644
--- a/l10n/ady/core.po
+++ b/l10n/ady/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/ady/files_sharing.po b/l10n/ady/files_sharing.po
index 0354ba56b56..298d7e4cde1 100644
--- a/l10n/ady/files_sharing.po
+++ b/l10n/ady/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index f4b5907cb00..01299a15459 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -248,75 +248,75 @@ msgstr "Herstel wagwoord"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Kies"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Nuwe leêrs"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Bestaande leêrs"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Kanseleer"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Gaan voort"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -455,29 +455,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "kan wysig"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "toegang beheer"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "skep"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "opdateer"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "uitvee"
-#: js/share.js:587
-msgid "share"
-msgstr "deel"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Beskerm met wagwoord"
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index 755a0e8b173..84336dc9339 100644
--- a/l10n/af_ZA/files_sharing.po
+++ b/l10n/af_ZA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ak/core.po b/l10n/ak/core.po
index f1b27ada7b4..49d1798f429 100644
--- a/l10n/ak/core.po
+++ b/l10n/ak/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/ak/files_sharing.po b/l10n/ak/files_sharing.po
index 356ea25ea46..7dd245c787d 100644
--- a/l10n/ak/files_sharing.po
+++ b/l10n/ak/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/am_ET/core.po b/l10n/am_ET/core.po
index c810177ff60..16f4af7b7c0 100644
--- a/l10n/am_ET/core.po
+++ b/l10n/am_ET/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/am_ET/files_sharing.po b/l10n/am_ET/files_sharing.po
index 30487106890..0ff5c06a2bd 100644
--- a/l10n/am_ET/files_sharing.po
+++ b/l10n/am_ET/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index e9e860ffacc..ad88829c9a1 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -265,31 +265,31 @@ msgstr "تعديل كلمة السر"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "نعم"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "لا"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "اختيار"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "موافق"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
@@ -299,45 +299,45 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "الغاء"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -476,29 +476,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "التحرير مسموح"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "ضبط الوصول"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "إنشاء"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "تحديث"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "حذف"
-#: js/share.js:587
-msgid "share"
-msgstr "مشاركة"
-
#: js/share.js:917
msgid "Password protected"
msgstr "محمي بكلمة السر"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index b45f4be3ee3..7aab1dfd5d1 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -179,7 +179,7 @@ msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق ال
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} موجود مسبقا"
@@ -217,43 +217,43 @@ msgid ""
"big."
msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "قيد الانتظار"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "حدث خطأ أثناء نقل الملف"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "خطأ"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "اسم"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "حجم"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "معدل"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "لا يوجد مجلدات %n"
@@ -263,7 +263,7 @@ msgstr[3] "عدد قليل من مجلدات %n"
msgstr[4] "عدد كبير من مجلدات %n"
msgstr[5] "مجلدات %n"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "لا يوجد ملفات %n"
@@ -273,7 +273,7 @@ msgstr[3] "قليل من ملفات %n"
msgstr[4] "الكثير من ملفات %n"
msgstr[5] " ملفات %n"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "لا يوجد ملفات %n لتحميلها"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index b9feac45116..5745dd78de0 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -50,7 +50,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -124,7 +124,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "حفظ"
#: templates/public.php:28
msgid "Download"
@@ -140,7 +140,7 @@ msgid "Direct link"
msgstr "رابط مباشر"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 102d54fd315..f5444498ed2 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ar/user_webdavauth.po b/l10n/ar/user_webdavauth.po
index 28c3b75cb18..61ce86dde13 100644
--- a/l10n/ar/user_webdavauth.po
+++ b/l10n/ar/user_webdavauth.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ast/core.po b/l10n/ast/core.po
index c3c84088e98..858f2aa6a57 100644
--- a/l10n/ast/core.po
+++ b/l10n/ast/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-16 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 10:30+0000\n"
-"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -250,75 +250,75 @@ msgstr "Restablecer contraseña"
msgid "Password can not be changed. Please contact your administrator."
msgstr "Nun pue camudase la contraseña. Por favor, contauta col alministrador."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Esbillar"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Fallu cargando'l ficheru de plantía d'escoyeta: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Aceutar"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Fallu cargando'l mensaxe de la plantía: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflictu de ficheru"
msgstr[1] "{count} conflictos de ficheru "
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Conflictu nun ficheru"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Ficheros nuevos"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Ficheros qu'esisten yá"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "¿Qué ficheros quies caltener?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si seleiciones dambes versiones, el ficheru copiáu va tener un númberu amestáu al so nome"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Encaboxar"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(esbillao too)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "(esbillaos {count})"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Falu cargando plantía de ficheru esistente"
@@ -457,29 +457,29 @@ msgid "notify by email"
msgstr "notificar per corréu"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "pue editar"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "control d'accesu"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "crear"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "xubir"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "desaniciar"
-#: js/share.js:587
-msgid "share"
-msgstr "compartir"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Contraseña protexida"
diff --git a/l10n/ast/files.po b/l10n/ast/files.po
index 86a83a6ab83..77995d9ffa5 100644
--- a/l10n/ast/files.po
+++ b/l10n/ast/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-09 01:54-0400\n"
-"PO-Revision-Date: 2014-06-08 14:30+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
@@ -180,7 +180,7 @@ msgstr "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encabo
msgid "URL cannot be empty"
msgstr "La URL nun pue tar balera"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} yá existe"
@@ -218,55 +218,55 @@ msgid ""
"big."
msgstr "Ta preparándose la to descarga. Esto podría llevar dalgún tiempu si los ficheros son grandes."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Pendiente"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Fallu moviendo'l ficheru."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Fallu moviendo'l ficheru"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Fallu"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Nun pudo renomase'l ficheru"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Fallu desaniciando'l ficheru."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nome"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Tamañu"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Modificáu"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n carpeta"
msgstr[1] "%n carpetes"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n ficheru"
msgstr[1] "%n ficheros"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Xubiendo %n ficheru"
diff --git a/l10n/ast/files_sharing.po b/l10n/ast/files_sharing.po
index 5f00de76aff..9db7c5d8444 100644
--- a/l10n/ast/files_sharing.po
+++ b/l10n/ast/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
@@ -22,21 +22,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "La compartición sirvidor a sirvidor nun ta habilitada nesti sirvidor"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Nun pudo amestase una compartición remota"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Compartío contigo"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Compartío con otros"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Compartíu por enllaz"
@@ -52,17 +52,17 @@ msgstr "Entá nun compartiesti dengún ficheru."
msgid "You haven't shared any files by link yet."
msgstr "Entá nun compartiesti nengún ficheru por enllaz."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Amestar {name} de {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Nun s'alcontró denguna instalación d'ownCloud en {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Url ownCloud inválida"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -118,15 +118,15 @@ msgstr "Pa más información, entrúga-y a la persona qu'unvió esti enllaz"
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Guardar en ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "exemplu.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Guardar"
#: templates/public.php:28
msgid "Download"
@@ -142,13 +142,13 @@ msgid "Direct link"
msgstr "Enllaz direutu"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Permitir a otres instancies montar enllaces compartíos públicos d'esti sirvidor"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Permitir a los usuarios montar enllaces compartíos públicos"
diff --git a/l10n/ast/lib.po b/l10n/ast/lib.po
index 42b1c7a666e..b66fc82a171 100644
--- a/l10n/ast/lib.po
+++ b/l10n/ast/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-20 01:54-0400\n"
+"PO-Revision-Date: 2014-06-19 21:50+0000\n"
+"Last-Translator: Ḷḷumex03 <l.lumex03.tornes@gmail.com>\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -61,7 +61,7 @@ msgstr "Fallu al anovar \"%s\"."
msgid ""
"App \\\"%s\\\" can't be installed because it is not compatible with this "
"version of ownCloud."
-msgstr ""
+msgstr "L'aplicación \\\"%s\\\" nun pue instalase porque nun ye compatible con esta versión d'ownCloud"
#: private/app.php:1147
msgid "No app name specified"
diff --git a/l10n/ast/settings.po b/l10n/ast/settings.po
index 929cc5330ce..c61f331041c 100644
--- a/l10n/ast/settings.po
+++ b/l10n/ast/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-20 01:54-0400\n"
+"PO-Revision-Date: 2014-06-19 22:00+0000\n"
+"Last-Translator: Ḷḷumex03 <l.lumex03.tornes@gmail.com>\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -49,15 +49,15 @@ msgstr "Corréu-e unviáu"
msgid "You need to set your user email before being able to send test emails."
msgstr "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba."
-#: admin/controller.php:116 templates/admin.php:350
+#: admin/controller.php:116 templates/admin.php:337
msgid "Send mode"
msgstr "Mou d'unviu"
-#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144
msgid "Encryption"
msgstr "Cifráu"
-#: admin/controller.php:120 templates/admin.php:387
+#: admin/controller.php:120 templates/admin.php:374
msgid "Authentication method"
msgstr "Métodu d'autenticación"
@@ -112,7 +112,7 @@ msgstr "Nun pudieron desaniciase dafechu les tos claves de cifráu, por favor co
#: ajax/installapp.php:18 ajax/uninstallapp.php:18
msgid "Couldn't remove app."
-msgstr ""
+msgstr "Nun pudo desaniciase l'aplicación."
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -195,7 +195,7 @@ msgstr "El back-end nun sofita cambeos de contraseña, pero la contraseña de ci
msgid "Unable to change password"
msgstr "Nun pudo camudase la contraseña"
-#: js/admin.js:126
+#: js/admin.js:127
msgid "Sending..."
msgstr "Unviando..."
@@ -213,7 +213,7 @@ msgstr "Anovar a {appversion}"
#: js/apps.js:90
msgid "Uninstall App"
-msgstr ""
+msgstr "Desinstalar aplicación"
#: js/apps.js:96 js/apps.js:158 js/apps.js:191
msgid "Disable"
@@ -257,15 +257,15 @@ msgstr "Anováu"
#: js/apps.js:233
msgid "Uninstalling ...."
-msgstr ""
+msgstr "Desinstalando ..."
#: js/apps.js:236
msgid "Error while uninstalling app"
-msgstr ""
+msgstr "Fallu entrín se desinstalaba l'aplicación"
#: js/apps.js:237 templates/apps.php:56
msgid "Uninstall"
-msgstr ""
+msgstr "Desinstalar"
#: js/personal.js:256
msgid "Select a profile picture"
@@ -319,11 +319,11 @@ msgstr "Hai d'escribir un nome de grupu válidu"
msgid "deleted {groupName}"
msgstr "desaniciáu {groupName}"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "desfacer"
-#: js/users/users.js:37 templates/admin.php:302
+#: js/users/users.js:37 templates/admin.php:292
#: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10
#: templates/users/part.userlist.php:41
msgid "Groups"
@@ -339,31 +339,31 @@ msgstr "Alministrador del Grupu"
msgid "Delete"
msgstr "Desaniciar"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "enxamás"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
msgstr "desaniciáu {userName}"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "amestar Grupu"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Tien d'apurrise un nome d'usuariu válidu"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Fallu al crear usuariu"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Tien d'apurrise una contraseña válida"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste."
@@ -566,23 +566,23 @@ msgstr "Usa'l serviciu cron del sistema pa llamar al ficheru cron.php cada 15 mi
msgid "Sharing"
msgstr "Compartiendo"
-#: templates/admin.php:240
+#: templates/admin.php:238
msgid "Allow apps to use the Share API"
msgstr "Permitir a les aplicaciones usar la API de Compartición"
-#: templates/admin.php:247
+#: templates/admin.php:243
msgid "Allow users to share via link"
msgstr "Permitir a los usuarios compartir vía enllaz"
-#: templates/admin.php:251
+#: templates/admin.php:249
msgid "Enforce password protection"
msgstr "Ameyora la proteición por contraseña."
-#: templates/admin.php:254
+#: templates/admin.php:252
msgid "Allow public uploads"
msgstr "Permitir xubes públiques"
-#: templates/admin.php:258
+#: templates/admin.php:256
msgid "Set default expiration date"
msgstr "Afitar la data d'espiración predeterminada"
@@ -598,116 +598,116 @@ msgstr "díes"
msgid "Enforce expiration date"
msgstr "Facer cumplir la data de caducidá"
-#: templates/admin.php:276
+#: templates/admin.php:271
msgid "Allow resharing"
msgstr "Permitir re-compartición"
-#: templates/admin.php:283
+#: templates/admin.php:276
msgid "Restrict users to only share with users in their groups"
msgstr "Restrinxir a los usuarios a compartir namái con otros usuarios nos sos grupos"
-#: templates/admin.php:290
+#: templates/admin.php:281
msgid "Allow users to send mail notification for shared files"
msgstr "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos"
-#: templates/admin.php:297
+#: templates/admin.php:286
msgid "Exclude groups from sharing"
msgstr "Esclúi grupos de compartir"
-#: templates/admin.php:308
+#: templates/admin.php:298
msgid ""
"These groups will still be able to receive shares, but not to initiate them."
msgstr "Estos grupos van poder siguir recibiendo conteníos compartíos, pero nun van poder anicialos"
-#: templates/admin.php:316
+#: templates/admin.php:303
msgid "Security"
msgstr "Seguridá"
-#: templates/admin.php:327
+#: templates/admin.php:314
msgid "Enforce HTTPS"
msgstr "Forciar HTTPS"
-#: templates/admin.php:329
+#: templates/admin.php:316
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada."
-#: templates/admin.php:335
+#: templates/admin.php:322
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Por favor, conéutate a %s al traviés de HTTPS p'habilitar o deshabilitar l'aplicación de SSL."
-#: templates/admin.php:345
+#: templates/admin.php:332
msgid "Email Server"
msgstr "Sirvidor de corréu-e"
-#: templates/admin.php:347
+#: templates/admin.php:334
msgid "This is used for sending out notifications."
msgstr "Esto úsase pa unviar notificaciones."
-#: templates/admin.php:378
+#: templates/admin.php:365
msgid "From address"
msgstr "Dende la direición"
-#: templates/admin.php:379
+#: templates/admin.php:366
msgid "mail"
msgstr "corréu"
-#: templates/admin.php:400
+#: templates/admin.php:387
msgid "Authentication required"
msgstr "Necesítase autenticación"
-#: templates/admin.php:404
+#: templates/admin.php:391
msgid "Server address"
msgstr "Direición del sirvidor"
-#: templates/admin.php:408
+#: templates/admin.php:395
msgid "Port"
msgstr "Puertu"
-#: templates/admin.php:413
+#: templates/admin.php:400
msgid "Credentials"
msgstr "Credenciales"
-#: templates/admin.php:414
+#: templates/admin.php:401
msgid "SMTP Username"
msgstr "Nome d'usuariu SMTP"
-#: templates/admin.php:417
+#: templates/admin.php:404
msgid "SMTP Password"
msgstr "Contraseña SMTP"
-#: templates/admin.php:421
+#: templates/admin.php:408
msgid "Test email settings"
msgstr "Probar configuración de corréu electrónicu"
-#: templates/admin.php:422
+#: templates/admin.php:409
msgid "Send email"
msgstr "Unviar mensaxe"
-#: templates/admin.php:427
+#: templates/admin.php:414
msgid "Log"
msgstr "Rexistru"
-#: templates/admin.php:428
+#: templates/admin.php:415
msgid "Log level"
msgstr "Nivel de rexistru"
-#: templates/admin.php:460
+#: templates/admin.php:447
msgid "More"
msgstr "Más"
-#: templates/admin.php:461
+#: templates/admin.php:448
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:467 templates/personal.php:196
+#: templates/admin.php:454 templates/personal.php:196
msgid "Version"
msgstr "Versión"
-#: templates/admin.php:471 templates/personal.php:199
+#: templates/admin.php:458 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ast/user_ldap.po b/l10n/ast/user_ldap.po
index 71cb7c7b2df..bba0d4f92c4 100644
--- a/l10n/ast/user_ldap.po
+++ b/l10n/ast/user_ldap.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ast/user_webdavauth.po b/l10n/ast/user_webdavauth.po
index 81324ba3fe5..c946efcd956 100644
--- a/l10n/ast/user_webdavauth.po
+++ b/l10n/ast/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-09 01:54-0400\n"
-"PO-Revision-Date: 2014-06-08 14:50+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/az/core.po b/l10n/az/core.po
index 5b0ebd3ace2..2ba1c9e49ff 100644
--- a/l10n/az/core.po
+++ b/l10n/az/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/az/files_sharing.po b/l10n/az/files_sharing.po
index d06da633b7a..3551e6ae682 100644
--- a/l10n/az/files_sharing.po
+++ b/l10n/az/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 0bafa73f9d1..5a71cba6f2d 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -255,31 +255,31 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Так"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Выбар"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Добра"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
@@ -287,45 +287,45 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -464,27 +464,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/be/files_sharing.po b/l10n/be/files_sharing.po
index b3577e7b50b..f5f97a380a4 100644
--- a/l10n/be/files_sharing.po
+++ b/l10n/be/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 8d2066d3d9c..665ccb3edce 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -247,75 +247,75 @@ msgstr "Нулиране на парола"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Избери"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Добре"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Отказ"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -454,29 +454,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "може да променя"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "контрол на достъпа"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "създаване"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "Обновяване"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "Изтриване"
-#: js/share.js:587
-msgid "share"
-msgstr "Споделяне"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Защитено с парола"
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index d5013ad4e35..6f46be2da58 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Чакащо"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Грешка"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Име"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Размер"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Променено"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 860bc3d49be..d377a923d94 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Запис"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index dd63bc6a683..edef56ba536 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/user_webdavauth.po b/l10n/bg_BG/user_webdavauth.po
index 35b6d3c10e2..41e21a3d9f6 100644
--- a/l10n/bg_BG/user_webdavauth.po
+++ b/l10n/bg_BG/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 2a65ea35daf..fe0d8e7f83c 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr "কূটশব্দ পূনঃনির্ধারণ কর"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "হ্যাঁ"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "না"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "বেছে নিন"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "তথাস্তু"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "বাতির"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,29 +453,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "সম্পাদনা করতে পারবেন"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "অধিগম্যতা নিয়ন্ত্রণ"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "তৈরী করুন"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "পরিবর্ধন কর"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "মুছে ফেল"
-#: js/share.js:587
-msgid "share"
-msgstr "ভাগাভাগি কর"
-
#: js/share.js:917
msgid "Password protected"
msgstr "কূটশব্দদ্বারা সুরক্ষিত"
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 4a0a6bd1278..ace23ed888d 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠ
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} টি বিদ্যমান"
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "মুলতুবি"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "সমস্যা"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "রাম"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "আকার"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "পরিবর্তিত"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index 075548f8469..8ea6feac56e 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "সংরক্ষণ"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index d9268cb59bd..5bc63769ce8 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/user_webdavauth.po b/l10n/bn_BD/user_webdavauth.po
index 249d0ff33ad..e912001350e 100644
--- a/l10n/bn_BD/user_webdavauth.po
+++ b/l10n/bn_BD/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_IN/core.po b/l10n/bn_IN/core.po
index 4c14a0290ff..da8314dc6ee 100644
--- a/l10n/bn_IN/core.po
+++ b/l10n/bn_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/bn_IN/files_sharing.po b/l10n/bn_IN/files_sharing.po
index 54f507e73b6..38a5319bb49 100644
--- a/l10n/bn_IN/files_sharing.po
+++ b/l10n/bn_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index cd1ee00ed0a..cf0e07ed312 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -250,76 +250,76 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -458,27 +458,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index 3f462a1e06a..164adf80211 100644
--- a/l10n/bs/files.po
+++ b/l10n/bs/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,57 +215,57 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr ""
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Ime"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Veličina"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr ""
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/bs/files_sharing.po b/l10n/bs/files_sharing.po
index 502bdf4652c..067e20a6239 100644
--- a/l10n/bs/files_sharing.po
+++ b/l10n/bs/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Spasi"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/bs/user_ldap.po b/l10n/bs/user_ldap.po
index dd8d3f98af4..919f3eaf562 100644
--- a/l10n/bs/user_ldap.po
+++ b/l10n/bs/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:13+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bs/user_webdavauth.po b/l10n/bs/user_webdavauth.po
index 0f210d481d1..bbabe682911 100644
--- a/l10n/bs/user_webdavauth.po
+++ b/l10n/bs/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 64955d32583..e3bb368bbfa 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 16:10+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -249,75 +249,75 @@ msgstr "Reinicialitza la contrasenya"
msgid "Password can not be changed. Please contact your administrator."
msgstr "La contrasenya no es pot canviar. Contacteu amb l'administrador."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Escull"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Error en carregar la plantilla de càrrega de fitxers: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "D'acord"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Error en carregar la plantilla de missatge: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflicte de fitxer"
msgstr[1] "{count} conflictes de fitxer"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Un fitxer en conflicte"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Fitxers nous"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Fitxers que ja existeixen"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Quin fitxer voleu conservar?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Cancel·la"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Continua"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(selecciona-ho tot)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} seleccionats)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Error en carregar la plantilla de fitxer existent"
@@ -456,29 +456,29 @@ msgid "notify by email"
msgstr "notifica per correu electrònic"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "pot editar"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "control d'accés"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "crea"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "actualitza"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "elimina"
-#: js/share.js:587
-msgid "share"
-msgstr "comparteix"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Protegeix amb contrasenya"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index f0453bc8d6a..d2534ef3511 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 16:10+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index b0f6b5b57db..064a9bcf8cd 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-14 01:54-0400\n"
-"PO-Revision-Date: 2014-06-14 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 15:30+0000\n"
+"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -81,7 +81,7 @@ msgstr "No es pot desencriptar aquest fitxer, probablement és un fitxer compart
msgid ""
"Unknown error. Please check your system settings or contact your "
"administrator"
-msgstr ""
+msgstr "Error desconegut. Comproveu l'arranjament del sistema o aviseu a l'administrador"
#: hooks/hooks.php:66
msgid "Missing requirements."
@@ -109,7 +109,7 @@ msgstr "encriptació inicial en procés... Proveu-ho més tard."
#: templates/invalid_private_key.php:8
#, php-format
msgid "Go directly to your %spersonal settings%s."
-msgstr ""
+msgstr "Vés directament a l'%sarranjament personal%s."
#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index 8b3c32bc262..49ca3beb282 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 15:40+0000\n"
+"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -46,11 +46,11 @@ msgstr "Secret"
#: appinfo/app.php:56 appinfo/app.php:65
msgid "Bucket"
-msgstr ""
+msgstr "Cub"
#: appinfo/app.php:60
msgid "Amazon S3 and compliant"
-msgstr ""
+msgstr "Amazon S3 i similars"
#: appinfo/app.php:63
msgid "Access Key"
@@ -62,15 +62,15 @@ msgstr "Clau secreta"
#: appinfo/app.php:66
msgid "Hostname (optional)"
-msgstr ""
+msgstr "Nom de l'equip (opcional)"
#: appinfo/app.php:67
msgid "Port (optional)"
-msgstr ""
+msgstr "Port (opcional)"
#: appinfo/app.php:68
msgid "Region (optional)"
-msgstr ""
+msgstr "Regió (opcional)"
#: appinfo/app.php:69
msgid "Enable SSL"
@@ -78,15 +78,15 @@ msgstr "Habilita SSL"
#: appinfo/app.php:70
msgid "Enable Path Style"
-msgstr ""
+msgstr "Permet l'estil del camí"
#: appinfo/app.php:78
msgid "App key"
-msgstr ""
+msgstr "Clau de l'aplicació"
#: appinfo/app.php:79
msgid "App secret"
-msgstr ""
+msgstr "Secret de l'aplicació"
#: appinfo/app.php:89 appinfo/app.php:130 appinfo/app.php:141
#: appinfo/app.php:174
@@ -106,7 +106,7 @@ msgstr "Contrasenya"
#: appinfo/app.php:92 appinfo/app.php:134 appinfo/app.php:144
#: appinfo/app.php:155 appinfo/app.php:177
msgid "Root"
-msgstr ""
+msgstr "Arrel"
#: appinfo/app.php:93
msgid "Secure ftps://"
@@ -118,11 +118,11 @@ msgstr "Client ID"
#: appinfo/app.php:102
msgid "Client secret"
-msgstr ""
+msgstr "Secret del client"
#: appinfo/app.php:109
msgid "OpenStack Object Storage"
-msgstr ""
+msgstr "OpenStack Object Storage"
#: appinfo/app.php:112
msgid "Username (required)"
@@ -130,35 +130,35 @@ msgstr "Nom d'usuari (necessari)"
#: appinfo/app.php:113
msgid "Bucket (required)"
-msgstr ""
+msgstr "Cub (requerit)"
#: appinfo/app.php:114
msgid "Region (optional for OpenStack Object Storage)"
-msgstr ""
+msgstr "Regió (opcional per OpenStack Object Storage)"
#: appinfo/app.php:115
msgid "API Key (required for Rackspace Cloud Files)"
-msgstr ""
+msgstr "Clau API (requerit per fitxers al núvol Rackspace)"
#: appinfo/app.php:116
msgid "Tenantname (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Tenantname (requerit per OpenStack Object Storage)"
#: appinfo/app.php:117
msgid "Password (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Contrasenya (requerit per OpenStack Object Storage)"
#: appinfo/app.php:118
msgid "Service Name (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Nom del servei (requerit per OpenStack Object Storage)"
#: appinfo/app.php:119
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "URL del punt identificador final (requerit per OpenStack Object Storage)"
#: appinfo/app.php:120
msgid "Timeout of HTTP requests in seconds (optional)"
-msgstr ""
+msgstr "Temps d'espera dels requeriments HTTP en segons (opcional)"
#: appinfo/app.php:133 appinfo/app.php:143
msgid "Share"
@@ -166,7 +166,7 @@ msgstr "Comparteix"
#: appinfo/app.php:138
msgid "SMB / CIFS using OC login"
-msgstr ""
+msgstr "SMB / CIFS usant acreditació OC"
#: appinfo/app.php:142
msgid "Username as share"
@@ -210,9 +210,9 @@ msgstr "Personal"
#: js/mountsfilelist.js:36
msgid "System"
-msgstr ""
+msgstr "Sistema"
-#: js/settings.js:318 js/settings.js:325
+#: js/settings.js:320 js/settings.js:327
msgid "Saved"
msgstr "Desat"
@@ -247,7 +247,7 @@ msgstr "<b>Nota:</b> %s no està instal·lat. No es pot muntar %s. Demaneu a l'a
#: templates/list.php:7
msgid "You don't have any external storages"
-msgstr ""
+msgstr "No teniu emmagatzaments externs"
#: templates/list.php:16
msgid "Name"
@@ -255,11 +255,11 @@ msgstr "Nom"
#: templates/list.php:20
msgid "Storage type"
-msgstr ""
+msgstr "Tipus d'emmagatzemament"
#: templates/list.php:23
msgid "Scope"
-msgstr ""
+msgstr "Abast"
#: templates/settings.php:2
msgid "External Storage"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 86bd4eaa2db..aaef9a9fd18 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -20,47 +20,47 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "La compartició entre servidors no està activat en aquest servidor"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "No s'ha pogut afegir una compartició remota"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
-msgstr ""
+msgstr "Compartit per vós"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
-msgstr ""
+msgstr "Compartit amb altres"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
-msgstr ""
+msgstr "Compartit amb enllaç"
#: js/app.js:35
msgid "No files have been shared with you yet."
-msgstr ""
+msgstr "Encara no hi ha fitxers compartits amb vós."
#: js/app.js:54
msgid "You haven't shared any files yet."
-msgstr ""
+msgstr "Encara no heu compartit cap fitxer."
#: js/app.js:73
msgid "You haven't shared any files by link yet."
-msgstr ""
+msgstr "Encara no heu compartit cap fitxer amb enllaç."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Afegiu {name} de {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "No s'ha trobat cap instal·lació ownCloud a {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "La url d'ownCloud no és vàlida"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -88,7 +88,7 @@ msgstr "Nom"
#: templates/list.php:20
msgid "Share time"
-msgstr ""
+msgstr "Temps de compartició"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
@@ -116,15 +116,15 @@ msgstr "Per més informació contacteu amb qui us ha enviat l'enllaç."
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Desa a ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "exemple.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Desa"
#: templates/public.php:28
msgid "Download"
@@ -140,13 +140,13 @@ msgid "Direct link"
msgstr "Enllaç directe"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Permet que altres instàncies muntin enllaços públics compartits des d'aqeust servidor"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Permet que usuaris muntin compartits amb enllaços públics"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 368040b28b2..a5e05bcf8a4 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 15:50+0000\n"
+"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr "Voleu mantenir la configuració?"
#: js/settings.js:93
msgid "{nthServer}. Server"
-msgstr ""
+msgstr "{nthServer}. Servidor"
#: js/settings.js:99
msgid "Cannot add server configuration"
@@ -96,15 +96,15 @@ msgstr "Error"
#: js/settings.js:244
msgid "Please specify a Base DN"
-msgstr ""
+msgstr "Especifiqueu una base DN"
#: js/settings.js:245
msgid "Could not determine Base DN"
-msgstr ""
+msgstr "No s'ha pogut determinar la base DN"
#: js/settings.js:276
msgid "Please specify the port"
-msgstr ""
+msgstr "Especifiqueu el port"
#: js/settings.js:780
msgid "Configuration OK"
@@ -170,15 +170,15 @@ msgstr "La característica desitjada no s'ha trobat"
#: settings.php:52
msgid "Server"
-msgstr ""
+msgstr "Servidor"
#: settings.php:53
msgid "User Filter"
-msgstr ""
+msgstr "Filtre d'usuari"
#: settings.php:54
msgid "Login Filter"
-msgstr ""
+msgstr "Filtre d'acreditació"
#: settings.php:55
msgid "Group Filter"
@@ -258,12 +258,12 @@ msgstr "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid re
#: templates/part.wizard-server.php:6
msgid "1. Server"
-msgstr ""
+msgstr "1. Servidor"
#: templates/part.wizard-server.php:13
#, php-format
msgid "%s. Server:"
-msgstr ""
+msgstr "%s. Servidor:"
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
@@ -271,7 +271,7 @@ msgstr "Afegeix la configuració del servidor"
#: templates/part.wizard-server.php:21
msgid "Delete Configuration"
-msgstr ""
+msgstr "Esborra la configuració"
#: templates/part.wizard-server.php:30
msgid "Host"
@@ -338,7 +338,7 @@ msgstr "Continua"
#: templates/settings.php:7
msgid "Expert"
-msgstr ""
+msgstr "Expert"
#: templates/settings.php:8
msgid "Advanced"
diff --git a/l10n/ca/user_webdavauth.po b/l10n/ca/user_webdavauth.po
index 39ed37b86b5..b51102cafd4 100644
--- a/l10n/ca/user_webdavauth.po
+++ b/l10n/ca/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 16:40+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca@valencia/core.po b/l10n/ca@valencia/core.po
index 2841be6d23f..a5ab067db92 100644
--- a/l10n/ca@valencia/core.po
+++ b/l10n/ca@valencia/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/ca@valencia/files_sharing.po b/l10n/ca@valencia/files_sharing.po
index 7d1e721e676..4b970653baa 100644
--- a/l10n/ca@valencia/files_sharing.po
+++ b/l10n/ca@valencia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index e3d33c5b261..9448374dc41 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-16 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 07:00+0000\n"
-"Last-Translator: Jaroslav Lichtblau <jaroslav@lichtblau.cz>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -260,76 +260,76 @@ msgstr "Obnovit heslo"
msgid "Password can not be changed. Please contact your administrator."
msgstr "Heslo nelze změnit. Kontaktujte prosím svého správce systému."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Ano"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Vybrat"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Chyba při nahrávání šablony výběru souborů: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Chyba při nahrávání šablony zprávy: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} souborový konflikt"
msgstr[1] "{count} souborové konflikty"
msgstr[2] "{count} souborových konfliktů"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Jeden konflikt souboru"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Nové soubory"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Již existující soubory"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Které soubory chcete ponechat?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Zrušit"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Pokračovat"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(vybráno vše)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "(vybráno {count})"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Chyba při nahrávání šablony existence souboru"
@@ -468,29 +468,29 @@ msgid "notify by email"
msgstr "upozornit e-mailem"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "lze upravovat"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "řízení přístupu"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "vytvořit"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "aktualizovat"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "smazat"
-#: js/share.js:587
-msgid "share"
-msgstr "sdílet"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Chráněno heslem"
@@ -614,7 +614,7 @@ msgstr "Nové heslo"
#: lostpassword/templates/resetpassword.php:6
msgid "New Password"
-msgstr "Nové Heslo"
+msgstr "Nové heslo"
#: setup/controller.php:140
#, php-format
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index f68bb7ee1bc..ff15ea1d49e 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Josef Moravec <josef.moravec@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -187,7 +187,7 @@ msgstr "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení
msgid "URL cannot be empty"
msgstr "URL nemůže zůstat prázdná"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} již existuje"
@@ -225,57 +225,57 @@ msgid ""
"big."
msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Nevyřízené"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Chyba při přesunu souboru."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Chyba při přesunu souboru"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Chyba"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Nepodařilo se přejmenovat soubor"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Chyba při mazání souboru."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Název"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Velikost"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Upraveno"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n složka"
msgstr[1] "%n složky"
msgstr[2] "%n složek"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n soubor"
msgstr[1] "%n soubory"
msgstr[2] "%n souborů"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Nahrávám %n soubor"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index b29b3508ce6..e8399baad48 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -24,21 +24,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Sdílení mezi servery není povoleno"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Nelze přidat vzdálené úložiště"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Sdíleno s vámi"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Sdíleno s ostatními"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Sdíleno pomocí odkazu"
@@ -54,17 +54,17 @@ msgstr "Zatím jste nesdíleli žádné soubory."
msgid "You haven't shared any files by link yet."
msgstr "Zatím jste nesdíleli pomocí odkazu žádný soubor."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Přidat {name} od {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Nebyla nalezen žádný funkční ownCloud na {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Neplatná ownCloud url"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -120,15 +120,15 @@ msgstr "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz.
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Uložit na ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "example.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Uložit"
#: templates/public.php:28
msgid "Download"
@@ -144,13 +144,13 @@ msgid "Direct link"
msgstr "Přímý odkaz"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Povolit připojování veřejně sdílených odkazů z tohoto serveru"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Povolit uživatelům připojovat veřejně sdílené odkazy"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 66156f28b29..c70d1e7ed12 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 19:50+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 18:31+0000\n"
"Last-Translator: Jaroslav Lichtblau <jaroslav@lichtblau.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -220,7 +220,7 @@ msgstr "Aktualizovat na {appversion}"
#: js/apps.js:90
msgid "Uninstall App"
-msgstr "Odinstalovat Aplikaci"
+msgstr "Odinstalovat aplikaci"
#: js/apps.js:96 js/apps.js:158 js/apps.js:191
msgid "Disable"
@@ -326,7 +326,7 @@ msgstr "Musíte zadat platný název skupiny"
msgid "deleted {groupName}"
msgstr "smazána {groupName}"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "vrátit zpět"
@@ -341,36 +341,36 @@ msgstr "Skupiny"
msgid "Group Admin"
msgstr "Správa skupiny"
-#: js/users/users.js:63 templates/users/part.grouplist.php:44
+#: js/users/users.js:63 templates/users/part.grouplist.php:46
#: templates/users/part.userlist.php:108
msgid "Delete"
msgstr "Smazat"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "nikdy"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
msgstr "smazán {userName}"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "přidat skupinu"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Musíte zadat platné uživatelské jméno"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Chyba při vytváření užiatele"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Musíte zadat platné heslo"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Varování: Osobní složka uživatele \"{user}\" již existuje."
@@ -897,11 +897,11 @@ msgstr "Vaše šifrovací klíče byly zálohovány. Pokud se něco pokazilo, da
#: templates/personal.php:178
msgid "Restore Encryption Keys"
-msgstr "Obnovit Šifrovací Klíče"
+msgstr "Obnovit šifrovací klíče"
#: templates/personal.php:182
msgid "Delete Encryption Keys"
-msgstr "Smazat Šifrovací Klíče"
+msgstr "Smazat šifrovací klíče"
#: templates/users/part.createuser.php:4
msgid "Login Name"
@@ -924,7 +924,7 @@ msgstr "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesl
#: templates/users/part.createuser.php:32
msgid "Search Users and Groups"
-msgstr "Prohledat Užiatele a Skupiny"
+msgstr "Prohledat uživatele a skupiny"
#: templates/users/part.grouplist.php:5
msgid "Add Group"
@@ -938,7 +938,7 @@ msgstr "Skupina"
msgid "Everyone"
msgstr "Všichni"
-#: templates/users/part.grouplist.php:29
+#: templates/users/part.grouplist.php:31
msgid "Admins"
msgstr "Administrátoři"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 3da9370a271..b5ed0fda1a2 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-14 09:50+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 18:31+0000\n"
"Last-Translator: Jaroslav Lichtblau <jaroslav@lichtblau.cz>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -150,7 +150,7 @@ msgstr "Opravdu si přejete smazat současné nastavení serveru?"
msgid "Confirm Deletion"
msgstr "Potvrdit smazání"
-#: lib/wizard.php:83 lib/wizard.php:97
+#: lib/wizard.php:97 lib/wizard.php:112
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -158,7 +158,7 @@ msgstr[0] "nalezena %s skupina"
msgstr[1] "nalezeny %s skupiny"
msgstr[2] "nalezeno %s skupin"
-#: lib/wizard.php:130
+#: lib/wizard.php:126
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -166,25 +166,25 @@ msgstr[0] "nalezen %s uživatel"
msgstr[1] "nalezeni %s uživatelé"
msgstr[2] "nalezeno %s uživatelů"
-#: lib/wizard.php:825 lib/wizard.php:837
-msgid "Invalid Host"
-msgstr "Neplatný hostitel"
-
-#: lib/wizard.php:1025
+#: lib/wizard.php:317 lib/wizard.php:1051
msgid "Could not find the desired feature"
msgstr "Nelze nalézt požadovanou vlastnost"
+#: lib/wizard.php:858 lib/wizard.php:870
+msgid "Invalid Host"
+msgstr "Neplatný hostitel"
+
#: settings.php:52
msgid "Server"
msgstr "Server"
#: settings.php:53
msgid "User Filter"
-msgstr "Uživatelský Filtr"
+msgstr "Uživatelský filtr"
#: settings.php:54
msgid "Login Filter"
-msgstr "Přihlašovací Filtr"
+msgstr "Přihlašovací filtr"
#: settings.php:55
msgid "Group Filter"
diff --git a/l10n/cs_CZ/user_webdavauth.po b/l10n/cs_CZ/user_webdavauth.po
index a6a43988b4c..90df77730d6 100644
--- a/l10n/cs_CZ/user_webdavauth.po
+++ b/l10n/cs_CZ/user_webdavauth.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-07 01:54-0400\n"
-"PO-Revision-Date: 2014-06-06 10:20+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Josef Moravec <josef.moravec@gmail.com>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 0ff0c6d5423..19a008eadcb 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -255,31 +255,31 @@ msgstr "Ailosod cyfrinair"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Ie"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Na"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Dewisiwch"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Iawn"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
@@ -287,45 +287,45 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Diddymu"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -464,29 +464,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "yn gallu golygu"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "rheolaeth mynediad"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "creu"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "diweddaru"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "dileu"
-#: js/share.js:587
-msgid "share"
-msgstr "rhannu"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Diogelwyd â chyfrinair"
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 033a3ef57a6..969eb0ac980 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} yn bodoli'n barod"
@@ -215,43 +215,43 @@ msgid ""
"big."
msgstr "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "I ddod"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Gwall"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Enw"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Maint"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Addaswyd"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
@@ -259,7 +259,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
@@ -267,7 +267,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index 07c872a598d..d61b527d0b9 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Cadw"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 9c273228c78..8eb4ffd0a00 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/user_webdavauth.po b/l10n/cy_GB/user_webdavauth.po
index a93e77f1840..81281ece29d 100644
--- a/l10n/cy_GB/user_webdavauth.po
+++ b/l10n/cy_GB/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 892ee2cf00b..ccb6f6fdb9b 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -5,6 +5,7 @@
# Translators:
# Anders J. Sørensen, 2013-2014
# Claus Christensen <claus_chr@webspeed.dk>, 2013
+# Johannes Hessellund <osos@openeyes.dk>, 2014
# Kasper Affeldt <kasper.affeldt@gmail.com>, 2013
# Leif Lodahl <leiflodahl@gmail.com>, 2013
# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2014
@@ -15,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -225,7 +226,7 @@ msgstr "år siden"
#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175
msgid "Couldn't send reset email. Please contact your administrator."
-msgstr ""
+msgstr "Der opstod et problem under afsending af reset-emailen. Kontakt venligst systemadministratoren."
#: js/lostpassword.js:5
msgid ""
@@ -244,7 +245,7 @@ msgstr ""
#: js/lostpassword.js:10
msgid "I know what I'm doing"
-msgstr ""
+msgstr "Jeg ved, hvad jeg har gang i"
#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9
msgid "Reset password"
@@ -252,77 +253,77 @@ msgstr "Nulstil kodeord"
#: js/lostpassword.js:16
msgid "Password can not be changed. Please contact your administrator."
-msgstr ""
+msgstr "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nej"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Vælg"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Fejl ved indlæsning af filvælger skabelon: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Fejl ved indlæsning af besked skabelon: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} filkonflikt"
msgstr[1] "{count} filkonflikter"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "En filkonflikt"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Nye filer"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Allerede eksisterende filer"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Hvilke filer ønsker du at beholde?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Hvis du vælger begge versioner, vil den kopierede fil få tilføjet et nummer til sit navn."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Annuller"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Videre"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(alle valgt)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} valgt)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Fejl ved inlæsning af; fil eksistere skabelon"
@@ -461,29 +462,29 @@ msgid "notify by email"
msgstr "Giv besked med mail"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "kan redigere"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "Adgangskontrol"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "opret"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "opdater"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "slet"
-#: js/share.js:587
-msgid "share"
-msgstr "del"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Beskyttet med adgangskode"
@@ -607,7 +608,7 @@ msgstr "Nyt kodeord"
#: lostpassword/templates/resetpassword.php:6
msgid "New Password"
-msgstr ""
+msgstr "Ny adgangskode"
#: setup/controller.php:140
#, php-format
@@ -835,7 +836,7 @@ msgstr "Kontakt venligst din administrator"
#: templates/login.php:50
msgid "Forgot your password? Reset it!"
-msgstr ""
+msgstr "Glemt din adgangskode? Nulstil det!"
#: templates/login.php:55
msgid "remember"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 8d54fd8ec81..26e368cb2f2 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Johannes Hessellund <osos@openeyes.dk>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -183,7 +183,7 @@ msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuler
msgid "URL cannot be empty"
msgstr "URL kan ikke være tom"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} eksisterer allerede"
@@ -221,55 +221,55 @@ msgid ""
"big."
msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Afventer"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Fejl ved flytning af fil"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Fejl ved flytning af fil"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Fejl"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Kunne ikke omdøbe filen"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Fejl ved sletnign af fil."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Navn"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Størrelse"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Ændret"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mappe"
msgstr[1] "%n mapper"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fil"
msgstr[1] "%n filer"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Uploader %n fil"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index d60ca53fb94..1ca1f69ebaa 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -29,15 +29,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Delt med dig"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Delt med andre"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Delt via link"
@@ -53,7 +53,7 @@ msgstr "Du har ikke delt nogen filer endnu."
msgid "You haven't shared any files by link yet."
msgstr "Du har ikke delt nogen filer endnu."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -127,7 +127,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Gem"
#: templates/public.php:28
msgid "Download"
@@ -143,7 +143,7 @@ msgid "Direct link"
msgstr "Direkte link"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 626b0099706..458f7fd7294 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/user_webdavauth.po b/l10n/da/user_webdavauth.po
index f1398cc6838..6a793885cf7 100644
--- a/l10n/da/user_webdavauth.po
+++ b/l10n/da/user_webdavauth.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-13 01:54-0400\n"
-"PO-Revision-Date: 2014-06-12 19:15+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Anders J. Sørensen\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 87b0d16b63c..bbbc2bcdb7d 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -18,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-16 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 11:40+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -257,75 +257,75 @@ msgstr "Passwort zurücksetzen"
msgid "Password can not be changed. Please contact your administrator."
msgstr "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Auswählen"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} Dateikonflikt"
msgstr[1] "{count} Dateikonflikte"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Ein Dateikonflikt"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Neue Dateien"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Die Dateien existieren bereits"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Welche Dateien möchtest Du behalten?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Wenn Du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Fortsetzen"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(Alle ausgewählt)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} ausgewählt)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Fehler beim Laden der vorhanden Dateivorlage"
@@ -464,29 +464,29 @@ msgid "notify by email"
msgstr "Per E-Mail informieren"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "erstellen"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "löschen"
-#: js/share.js:587
-msgid "share"
-msgstr "teilen"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Durch ein Passwort geschützt"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index f2bce3dbe65..c891ac5faae 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -185,7 +185,7 @@ msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload a
msgid "URL cannot be empty"
msgstr "Die URL darf nicht leer sein"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} existiert bereits"
@@ -223,55 +223,55 @@ msgid ""
"big."
msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Ausstehend"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Fehler beim Verschieben der Datei."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Fehler beim Verschieben der Datei"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Fehler"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Die Datei konnte nicht umbenannt werden"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Fehler beim Löschen der Datei."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Name"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Größe"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Geändert"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n Ordner"
msgstr[1] "%n Ordner"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n Datei"
msgstr[1] "%n Dateien"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n Datei wird hochgeladen"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index bca8097d05a..87cbdff4f39 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-14 01:54-0400\n"
-"PO-Revision-Date: 2014-06-13 16:01+0000\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 19:21+0000\n"
"Last-Translator: kabum <uu.kabum@gmail.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -167,7 +167,7 @@ msgstr "Teilen"
#: appinfo/app.php:138
msgid "SMB / CIFS using OC login"
-msgstr "´"
+msgstr "SMB / CIFS mit OC-Login"
#: appinfo/app.php:142
msgid "Username as share"
@@ -213,7 +213,7 @@ msgstr "Persönlich"
msgid "System"
msgstr "System"
-#: js/settings.js:318 js/settings.js:325
+#: js/settings.js:320 js/settings.js:327
msgid "Saved"
msgstr "Gespeichert"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 66a4ef77458..4c238c5b728 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -25,21 +25,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Entfernte Freigabe kann nicht hinzu gefügt werden"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Mit Dir geteilt"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Von Dir geteilt"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Geteilt über einen Link"
@@ -55,17 +55,17 @@ msgstr "Du hast bis jetzt keine Dateien mit anderen geteilt."
msgid "You haven't shared any files by link yet."
msgstr "Du hast bis jetzt keine Dateien über einen Link mit anderen geteilt."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "{name} wird von {owner}@{remote} hinzugefügt"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Keine OwnCloud-Installation auf {remote} gefunden"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Ungültige OwnCloud-URL"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -121,15 +121,15 @@ msgstr "Für mehr Informationen, frage bitte die Person, die Dir diesen Link ges
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "In OwnCloud speichern"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "beispiel.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Speichern"
#: templates/public.php:28
msgid "Download"
@@ -145,13 +145,13 @@ msgid "Direct link"
msgstr "Direkter Link"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Erlaube Nutzern das Hinzufügen von freigegebenen öffentlichen Links"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index f5c9ee6d098..a4873da91ff 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 06:20+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 16:29+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -327,7 +327,7 @@ msgstr "Ein gültiger Gruppenname muss angegeben werden"
msgid "deleted {groupName}"
msgstr "{groupName} gelöscht"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "rückgängig machen"
@@ -347,31 +347,31 @@ msgstr "Gruppenadministrator"
msgid "Delete"
msgstr "Löschen"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "niemals"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
msgstr "{userName} gelöscht"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "Gruppe hinzufügen"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Es muss ein gültiger Benutzername angegeben werden"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer \"{user}\" existiert bereits"
@@ -441,7 +441,7 @@ msgid ""
"configure your webserver in a way that the data directory is no longer "
"accessible or you move the data directory outside the webserver document "
"root."
-msgstr "Dein Datenverzeichnis und deine Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers."
+msgstr "Dein Datenverzeichnis und deine Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers."
#: templates/admin.php:75 templates/admin.php:90
msgid "Setup Warning"
@@ -534,7 +534,7 @@ msgid ""
"installation of 3rd party apps don´t work. Accessing files from remote and "
"sending of notification emails might also not work. We suggest to enable "
"internet connection for this server if you want to have all features."
-msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen."
+msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen."
#: templates/admin.php:189
msgid "Cron"
@@ -612,7 +612,7 @@ msgstr "Erlaubt erneutes Teilen"
#: templates/admin.php:276
msgid "Restrict users to only share with users in their groups"
-msgstr "c"
+msgstr "Erlaube Nutzern nur das Teilen in ihrer Gruppe"
#: templates/admin.php:281
msgid "Allow users to send mail notification for shared files"
@@ -921,7 +921,7 @@ msgstr "Admin-Wiederherstellungspasswort"
msgid ""
"Enter the recovery password in order to recover the users files during "
"password change"
-msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen"
+msgstr "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen"
#: templates/users/part.createuser.php:32
msgid "Search Users and Groups"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index e99253ce63d..2b897a4c958 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index 78c63300760..c0f4af6b635 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index 841bd73afb2..c9e57b05cea 100644
--- a/l10n/de_AT/core.po
+++ b/l10n/de_AT/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -247,75 +247,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -454,27 +454,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:575
-msgid "access control"
-msgstr ""
-
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po
index d6ff4bf0cb2..461aa42fb6b 100644
--- a/l10n/de_AT/files.po
+++ b/l10n/de_AT/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr ""
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr ""
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr ""
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/de_AT/files_sharing.po b/l10n/de_AT/files_sharing.po
index 8b51af3b048..6f99a5e43b0 100644
--- a/l10n/de_AT/files_sharing.po
+++ b/l10n/de_AT/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Speichern"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/de_AT/user_ldap.po b/l10n/de_AT/user_ldap.po
index 4b9853be08d..4bd51efa3d6 100644
--- a/l10n/de_AT/user_ldap.po
+++ b/l10n/de_AT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_AT/user_webdavauth.po b/l10n/de_AT/user_webdavauth.po
index e6bcd47a0b4..2f4885a6dde 100644
--- a/l10n/de_AT/user_webdavauth.po
+++ b/l10n/de_AT/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index c593cfd5592..c45527156f5 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -256,75 +256,75 @@ msgstr "Passwort zurücksetzen"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Auswählen"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Neue Dateien"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -463,29 +463,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "erstellen"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "löschen"
-#: js/share.js:587
-msgid "share"
-msgstr "teilen"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Passwortgeschützt"
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index b7640989285..7b64f586be4 100644
--- a/l10n/de_CH/files.po
+++ b/l10n/de_CH/files.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -186,7 +186,7 @@ msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} existiert bereits"
@@ -224,55 +224,55 @@ msgid ""
"big."
msgstr "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Ausstehend"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Fehler"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Name"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Grösse"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Geändert"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] "%n Ordner"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] "%n Dateien"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n Datei wird hochgeladen"
diff --git a/l10n/de_CH/files_sharing.po b/l10n/de_CH/files_sharing.po
index 4177c992494..026b948f934 100644
--- a/l10n/de_CH/files_sharing.po
+++ b/l10n/de_CH/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
@@ -28,15 +28,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -52,7 +52,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -126,7 +126,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Speichern"
#: templates/public.php:28
msgid "Download"
@@ -142,7 +142,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
index 3e86324e5a3..cafc58be0bb 100644
--- a/l10n/de_CH/user_ldap.po
+++ b/l10n/de_CH/user_ldap.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_CH/user_webdavauth.po b/l10n/de_CH/user_webdavauth.po
index d1ae4ae3727..f3974de22a3 100644
--- a/l10n/de_CH/user_webdavauth.po
+++ b/l10n/de_CH/user_webdavauth.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 906ecb42834..06f773f1dea 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -18,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-16 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 11:40+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -257,75 +257,75 @@ msgstr "Passwort zurücksetzen"
msgid "Password can not be changed. Please contact your administrator."
msgstr "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nein"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Auswählen"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Fehler beim Laden der Dateiauswahlvorlage: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Fehler beim Laden der Nachrichtenvorlage: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} Dateikonflikt"
msgstr[1] "{count} Dateikonflikte"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Ein Dateikonflikt"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Neue Dateien"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Die Dateien existieren bereits"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Welche Dateien möchten Sie behalten?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Abbrechen"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Fortsetzen"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(Alle ausgewählt)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} ausgewählt)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Fehler beim Laden der vorhanden Dateivorlage"
@@ -464,29 +464,29 @@ msgid "notify by email"
msgstr "Per E-Mail informieren"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "kann bearbeiten"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "Zugriffskontrolle"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "erstellen"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "aktualisieren"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "löschen"
-#: js/share.js:587
-msgid "share"
-msgstr "teilen"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Passwortgeschützt"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index b839ce3e348..bcf542a3df7 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -188,7 +188,7 @@ msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload
msgid "URL cannot be empty"
msgstr "Die URL darf nicht leer sein"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} existiert bereits"
@@ -226,55 +226,55 @@ msgid ""
"big."
msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Ausstehend"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Fehler beim Verschieben der Datei."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Fehler beim Verschieben der Datei"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Fehler"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Die Datei konnte nicht umbenannt werden"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Fehler beim Löschen der Datei."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Name"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Größe"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Geändert"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n Ordner"
msgstr[1] "%n Ordner"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n Datei"
msgstr[1] "%n Dateien"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n Datei wird hoch geladen"
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 4ff00c7164c..45cafd5573b 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -7,13 +7,14 @@
# Mario Siegmann <mario_siegmann@web.de>, 2014
# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
# Tristan <blobbyjj@ymail.com>, 2013
+# kabum <uu.kabum@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 12:00+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 19:21+0000\n"
+"Last-Translator: kabum <uu.kabum@gmail.com>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -167,7 +168,7 @@ msgstr "Teilen"
#: appinfo/app.php:138
msgid "SMB / CIFS using OC login"
-msgstr "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)"
+msgstr "SMB / CIFS mit OC-Login"
#: appinfo/app.php:142
msgid "Username as share"
@@ -213,7 +214,7 @@ msgstr "Persönlich"
msgid "System"
msgstr "System"
-#: js/settings.js:318 js/settings.js:325
+#: js/settings.js:320 js/settings.js:327
msgid "Saved"
msgstr "Gespeichert"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index d369f31f6c4..22d95c85d4a 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
@@ -24,21 +24,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Entfernte Freigabe kann nicht hinzu gefügt werden"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Mit Ihnen geteilt"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Von Ihnen geteilt"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Geteilt über einen Link"
@@ -54,17 +54,17 @@ msgstr "Sie haben bis jetzt keine Dateien mit anderen geteilt."
msgid "You haven't shared any files by link yet."
msgstr "Sie haben bis jetzt keine Dateien über einen Link mit anderen geteilt."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "{name} wird von {owner}@{remote} hinzugefügt"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Keine OwnCloud-Installation auf {remote} gefunden"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Ungültige OwnCloud-URL"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -120,15 +120,15 @@ msgstr "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen L
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "In OwnCloud speichern"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "beispiel.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Speichern"
#: templates/public.php:28
msgid "Download"
@@ -144,13 +144,13 @@ msgid "Direct link"
msgstr "Direkte Verlinkung"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Erlaube Nutzern das Hinzufügen von freigegebenen öffentlichen Links"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 6e269529ac4..f859997a0f3 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 06:20+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 15:44+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -327,7 +327,7 @@ msgstr "Ein gültiger Gruppenname muss angegeben werden"
msgid "deleted {groupName}"
msgstr "{groupName} gelöscht"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "rückgängig machen"
@@ -347,31 +347,31 @@ msgstr "Gruppenadministrator"
msgid "Delete"
msgstr "Löschen"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "niemals"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
msgstr "{userName} gelöscht"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "Gruppe hinzufügen"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Es muss ein gültiger Benutzername angegeben werden"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Es muss ein gültiges Passwort angegeben werden"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer \"{user}\" existiert bereits"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index f5c2a6e2a7f..c6512cdfcd0 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po
index 578feaa2265..86b8a399ea6 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 8ebc5d61b0a..adb74f6fa66 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -18,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 19:01+0000\n"
-"Last-Translator: Theodore Grammenos <theodorewii121@hotmail.com>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -228,14 +228,14 @@ msgstr "χρόνια πριν"
#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175
msgid "Couldn't send reset email. Please contact your administrator."
-msgstr ""
+msgstr "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ επικοινωνήστε με το διαχειριστή σας."
#: js/lostpassword.js:5
msgid ""
"The link to reset your password has been sent to your email. If you do not "
"receive it within a reasonable amount of time, check your spam/junk "
"folders.<br>If it is not there ask your local administrator."
-msgstr ""
+msgstr "Ο σύνδεσμος για την επαναφορά του κωδικού πρόσβασής σας απεστάλη στο ηλ. ταχυδρομείο σας. Εάν δεν το παραλάβετε μέσα σε ένα εύλογο χρονικό διάστημα, ελέγξτε το φάκελο ανεπιθύμητων μηνυμάτων σας. <br>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας."
#: js/lostpassword.js:7
msgid ""
@@ -243,11 +243,11 @@ msgid ""
"will be no way to get your data back after your password is reset.<br />If "
"you are not sure what to do, please contact your administrator before you "
"continue. <br />Do you really want to continue?"
-msgstr ""
+msgstr "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;"
#: js/lostpassword.js:10
msgid "I know what I'm doing"
-msgstr ""
+msgstr "Γνωρίζω τι κάνω"
#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9
msgid "Reset password"
@@ -255,77 +255,77 @@ msgstr "Επαναφορά συνθηματικού"
#: js/lostpassword.js:16
msgid "Password can not be changed. Please contact your administrator."
-msgstr ""
+msgstr "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Ναι"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Όχι"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Επιλέξτε"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Οκ"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} αρχείο διαφέρει"
msgstr[1] "{count} αρχεία διαφέρουν"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Ένα αρχείο διαφέρει"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Νέα Αρχεία"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Ήδη υπάρχοντα αρχεία"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Ποια αρχεία θέλετε να κρατήσετε;"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Εάν επιλέξετε και τις δυο εκδοχές, ένας αριθμός θα προστεθεί στο αντιγραφόμενο αρχείο."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Άκυρο"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Συνέχεια"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(όλα τα επιλεγμένα)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} επιλέχθησαν)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Σφάλμα κατά την φόρτωση του προτύπου ύπαρξης αρχείου"
@@ -464,29 +464,29 @@ msgid "notify by email"
msgstr "ειδοποίηση με email"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "δυνατότητα αλλαγής"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "έλεγχος πρόσβασης"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "δημιουργία"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "ενημέρωση"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "διαγραφή"
-#: js/share.js:587
-msgid "share"
-msgstr "διαμοιρασμός"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Προστασία με συνθηματικό"
@@ -557,17 +557,17 @@ msgstr "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο
#: lostpassword/controller/lostcontroller.php:110
msgid "Couldn't reset password because the token is invalid"
-msgstr ""
+msgstr "Αδυναμία επαναφοράς κωδικού πρόσβασης καθώς το τεκμήριο είναι άκυρο"
#: lostpassword/controller/lostcontroller.php:136
msgid "Couldn't send reset email. Please make sure your username is correct."
-msgstr ""
+msgstr "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ ελέγξτε ότι το όνομα χρήστη σας είναι ορθό."
#: lostpassword/controller/lostcontroller.php:151
msgid ""
"Couldn't send reset email because there is no email address for this "
"username. Please contact your administrator."
-msgstr ""
+msgstr "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς καθώς δεν αντιστοιχεί καμμία διεύθυνση ηλ. ταχυδρομείου σε αυτό το όνομα χρήστη. Παρακαλώ επικοινωνήστε με το διαχειριστή σας."
#: lostpassword/controller/lostcontroller.php:168
#, php-format
@@ -838,7 +838,7 @@ msgstr "Παρακαλώ επικοινωνήστε με τον διαχειρι
#: templates/login.php:50
msgid "Forgot your password? Reset it!"
-msgstr ""
+msgstr "Ξεχάσατε τον κωδικό πρόσβασής σας; Επαναφέρετέ τον!"
#: templates/login.php:55
msgid "remember"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 63d953701b2..ecb1bf542de 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-09 01:54-0400\n"
-"PO-Revision-Date: 2014-06-08 16:40+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Vassilis Kehayas <vkehayas@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -185,7 +185,7 @@ msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέ
msgid "URL cannot be empty"
msgstr "Η URL δεν πρέπει να είναι κενή"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} υπάρχει ήδη"
@@ -223,55 +223,55 @@ msgid ""
"big."
msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Εκκρεμεί"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Σφάλμα κατά τη μετακίνηση του αρχείου."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Σφάλμα κατά τη μετακίνηση του αρχείου"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Σφάλμα"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Αδυναμία μετονομασίας αρχείου"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Σφάλμα διαγραφής αρχείου."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Όνομα"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Μέγεθος"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Τροποποιήθηκε"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n φάκελος"
msgstr[1] "%n φάκελοι"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n αρχείο"
msgstr[1] "%n αρχεία"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Ανέβασμα %n αρχείου"
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index 4390f9a4f4e..fb9fb6be181 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -8,14 +8,14 @@
# Spyros Melissovas <peppe@cs.uoi.gr>, 2014
# Theodore Grammenos <theodorewii121@hotmail.com>, 2013
# Theodore Grammenos <theodorewii121@hotmail.com>, 2013
-# Vassilis Kehayas <vkehayas@gmail.com>, 2013
+# Vassilis Kehayas <vkehayas@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-14 01:54-0400\n"
-"PO-Revision-Date: 2014-06-14 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-22 01:54-0400\n"
+"PO-Revision-Date: 2014-06-21 16:31+0000\n"
+"Last-Translator: Vassilis Kehayas <vkehayas@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"
@@ -112,7 +112,7 @@ msgstr "Εκτέλεση αρχικής κρυπτογράφησης... Παρα
#: templates/invalid_private_key.php:8
#, php-format
msgid "Go directly to your %spersonal settings%s."
-msgstr ""
+msgstr "Πηγαίνετε κατ'ευθείαν στις %sπροσωπικές ρυθμίσεις%s σας."
#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index aa89b4552c2..3cbbcf3bccf 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -22,21 +22,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Ο διαμοιρασμός μεταξύ διακομιστών δεν έχει ενεργοποιηθεί σε αυτόν το διακομιστή"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Αδυναμία προσθήκης απομακρυσμένου κοινόχρηστου φακέλου"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Διαμοιρασμένο με εσάς"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Διαμοιρασμένο με άλλους"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Διαμοιρασμένο μέσω συνδέσμου"
@@ -52,17 +52,17 @@ msgstr "Δεν έχετε διαμοιραστεί κανένα αρχείο α
msgid "You haven't shared any files by link yet."
msgstr "Δεν έχετε διαμοιραστεί κανένα αρχείο μέσω συνδέσμου ακόμα."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Προσθήκη {name} από {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Δεν βρέθηκε εγκατεστημένο ownCloud στο {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Άκυρη url ownCloud "
#: js/share.js:60
msgid "Shared by {owner}"
@@ -118,15 +118,15 @@ msgstr "Για περισσότερες πληροφορίες, παρακαλώ
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Αποθήκευση στο ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "example.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Αποθήκευση"
#: templates/public.php:28
msgid "Download"
@@ -142,13 +142,13 @@ msgid "Direct link"
msgstr "Άμεσος σύνδεσμος"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Να επιτρέπεται σε άλλες εγκαταστάσεις να επιθέτουν δημόσιους συνδέσμους που έχουν διαμοιραστεί από αυτόν το διακομιστή"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Να επιτρέπεται στους χρήστες να επιθέτουν κοινόχρηστους φακέλους με δημόσιους συνδέσμους"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index f312eac268b..6cc78be06ea 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 19:01+0000\n"
-"Last-Translator: Theodore Grammenos <theodorewii121@hotmail.com>\n"
+"POT-Creation-Date: 2014-06-22 01:54-0400\n"
+"PO-Revision-Date: 2014-06-21 16:29+0000\n"
+"Last-Translator: Vassilis Kehayas <vkehayas@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"
@@ -119,7 +119,7 @@ msgstr "Δεν ήταν δυνατή η οριστική διαγραφή των
#: ajax/installapp.php:18 ajax/uninstallapp.php:18
msgid "Couldn't remove app."
-msgstr ""
+msgstr "Αδυναμία αφαίρεσης εφαρμογής."
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -220,7 +220,7 @@ msgstr "Ενημέρωση σε {appversion}"
#: js/apps.js:90
msgid "Uninstall App"
-msgstr ""
+msgstr "Απεγκατάσταση Εφαρμογής"
#: js/apps.js:96 js/apps.js:158 js/apps.js:191
msgid "Disable"
@@ -264,11 +264,11 @@ msgstr "Ενημερώθηκε"
#: js/apps.js:233
msgid "Uninstalling ...."
-msgstr ""
+msgstr "Απεγκατάσταση ...."
#: js/apps.js:236
msgid "Error while uninstalling app"
-msgstr ""
+msgstr "Σφάλμα κατά την απεγκατάσταση της εφαρμογής"
#: js/apps.js:237 templates/apps.php:56
msgid "Uninstall"
@@ -324,9 +324,9 @@ msgstr "Πρέπει να δοθεί ένα έγκυρο όνομα ομάδας
#: js/users/groups.js:205
msgid "deleted {groupName}"
-msgstr ""
+msgstr "διαγραφή {groupName}"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "αναίρεση"
@@ -346,31 +346,31 @@ msgstr "Ομάδα Διαχειριστών"
msgid "Delete"
msgstr "Διαγραφή"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "ποτέ"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
-msgstr ""
+msgstr "διαγραφή {userName}"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "προσθήκη ομάδας"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Πρέπει να δοθεί έγκυρο όνομα χρήστη"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Σφάλμα δημιουργίας χρήστη"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Προειδοποίηση: Ο μητρικός κατάλογος του χρήστη \"{user}\" υπάρχει ήδη"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 5ef30771ec0..0b0d97dbfe4 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Vassilis Kehayas <vkehayas@gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/user_webdavauth.po b/l10n/el/user_webdavauth.po
index 832eb2d7c75..c6f583b35f5 100644
--- a/l10n/el/user_webdavauth.po
+++ b/l10n/el/user_webdavauth.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 16:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+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/en@pirate/core.po b/l10n/en@pirate/core.po
index 337531497ee..1f3033a4f4e 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -247,75 +247,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -454,27 +454,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index 0b3d4020bc2..47ca487b384 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -50,7 +50,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -140,7 +140,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index 0c8f6d20eee..a81fb0710a2 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-16 13:30+0000\n"
-"Last-Translator: Darren Richardson <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -247,75 +247,75 @@ msgstr "Reset password"
msgid "Password can not be changed. Please contact your administrator."
msgstr "Password can not be changed. Please contact your administrator."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Yes"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Choose"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Error loading file picker template: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Error loading message template: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} file conflict"
msgstr[1] "{count} file conflicts"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "One file conflict"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "New Files"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Already existing files"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Which files do you wish to keep?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "If you select both versions, the copied file will have a number added to its name."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Cancel"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Continue"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(all selected)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} selected)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Error loading file exists template"
@@ -454,29 +454,29 @@ msgid "notify by email"
msgstr "notify by email"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "can edit"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "access control"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "create"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "update"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "delete"
-#: js/share.js:587
-msgid "share"
-msgstr "share"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Password protected"
diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index 632e032f5a2..470316586e3 100644
--- a/l10n/en_GB/files.po
+++ b/l10n/en_GB/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -178,7 +178,7 @@ msgstr "File upload is in progress. Leaving the page now will cancel the upload.
msgid "URL cannot be empty"
msgstr "URL cannot be empty"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} already exists"
@@ -216,55 +216,55 @@ msgid ""
"big."
msgstr "Your download is being prepared. This might take some time if the files are big."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Pending"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Error moving file."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Error moving file"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Error"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Could not rename file"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Error deleting file."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Name"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Size"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Modified"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n folder"
msgstr[1] "%n folders"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n file"
msgstr[1] "%n files"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Uploading %n file"
diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
index 6e6baebc4d8..f6c7b07f517 100644
--- a/l10n/en_GB/files_sharing.po
+++ b/l10n/en_GB/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -20,21 +20,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Server to server sharing is not enabled on this server"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Couldn't add remote share"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Shared with you"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Shared with others"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Shared by link"
@@ -50,17 +50,17 @@ msgstr "You haven't shared any files yet."
msgid "You haven't shared any files by link yet."
msgstr "You haven't shared any files by link yet."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Add {name} from {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "No ownCloud installation found at {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Invalid ownCloud URL"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -116,15 +116,15 @@ msgstr "For more info, please ask the person who sent this link."
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Save to ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "example.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Save"
#: templates/public.php:28
msgid "Download"
@@ -140,13 +140,13 @@ msgid "Direct link"
msgstr "Direct link"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Allow other instances to mount public links shared from this server"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Allow users to mount public link shares"
diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po
index 171442d373f..77cde5dbffb 100644
--- a/l10n/en_GB/user_ldap.po
+++ b/l10n/en_GB/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Darren Richardson <transifex@mnestis.net>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en_GB/user_webdavauth.po b/l10n/en_GB/user_webdavauth.po
index e8a197c8087..c0211a0240a 100644
--- a/l10n/en_GB/user_webdavauth.po
+++ b/l10n/en_GB/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 13:21+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Darren Richardson <transifex@mnestis.net>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/en_NZ/core.po b/l10n/en_NZ/core.po
index b3789f07b06..6314a035018 100644
--- a/l10n/en_NZ/core.po
+++ b/l10n/en_NZ/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/en_NZ/files_sharing.po b/l10n/en_NZ/files_sharing.po
index d4a38a7bd8d..fd8df31b843 100644
--- a/l10n/en_NZ/files_sharing.po
+++ b/l10n/en_NZ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 12566f698bf..801050be3d0 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -248,75 +248,75 @@ msgstr "Rekomenci la pasvorton"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Jes"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Elekti"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Akcepti"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} dosierkonflikto"
msgstr[1] "{count} dosierkonfliktoj"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Unu dosierkonflikto"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Novaj dosieroj"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Kiujn dosierojn vi volas konservi?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se vi elektos ambaŭ eldonojn, la kopiota dosiero havos numeron aldonitan al sia nomo."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Nuligi"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(ĉiuj elektitas)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} elektitas)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -455,29 +455,29 @@ msgid "notify by email"
msgstr "avizi per retpoŝto"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "povas redakti"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "alirkontrolo"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "krei"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "ĝisdatigi"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "forigi"
-#: js/share.js:587
-msgid "share"
-msgstr "kunhavigi"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Protektita per pasvorto"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 675fd548692..81e0cb5632c 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 14:41+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
"allowed."
msgstr "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:159
#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
@@ -89,54 +89,54 @@ msgstr "Ne povis agordiĝi la alŝuta dosierujo."
msgid "Invalid Token"
msgstr ""
-#: ajax/upload.php:75
+#: ajax/upload.php:77
msgid "No file was uploaded. Unknown error"
msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
-#: ajax/upload.php:82
+#: ajax/upload.php:84
msgid "There is no error, the file uploaded with success"
msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese."
-#: ajax/upload.php:83
+#: ajax/upload.php:85
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: "
-#: ajax/upload.php:85
+#: ajax/upload.php:87
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo"
-#: ajax/upload.php:86
+#: ajax/upload.php:88
msgid "The uploaded file was only partially uploaded"
msgstr "la alŝutita dosiero nur parte alŝutiĝis"
-#: ajax/upload.php:87
+#: ajax/upload.php:89
msgid "No file was uploaded"
msgstr "Neniu dosiero alŝutiĝis."
-#: ajax/upload.php:88
+#: ajax/upload.php:90
msgid "Missing a temporary folder"
msgstr "Mankas provizora dosierujo."
-#: ajax/upload.php:89
+#: ajax/upload.php:91
msgid "Failed to write to disk"
msgstr "Malsukcesis skribo al disko"
-#: ajax/upload.php:109
+#: ajax/upload.php:111
msgid "Not enough storage available"
msgstr "Ne haveblas sufiĉa memoro"
-#: ajax/upload.php:171
+#: ajax/upload.php:173
msgid "Upload failed. Could not find uploaded file"
msgstr "La alŝuto malsukcesis. Ne troviĝis alŝutota dosiero."
-#: ajax/upload.php:181
+#: ajax/upload.php:183
msgid "Upload failed. Could not get file info."
msgstr "La alŝuto malsukcesis. Ne povis ekhaviĝi informo pri dosiero."
-#: ajax/upload.php:196
+#: ajax/upload.php:198
msgid "Invalid directory."
msgstr "Nevalida dosierujo."
@@ -178,7 +178,7 @@ msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton."
msgid "URL cannot be empty"
msgstr "La URL ne povas malpleni"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1192
msgid "{new_name} already exists"
msgstr "{new_name} jam ekzistas"
@@ -194,19 +194,19 @@ msgstr "Ne povis kreiĝi dosierujo"
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:211
+#: js/fileactions.js:213
msgid "Share"
msgstr "Kunhavigi"
-#: js/fileactions.js:224
+#: js/fileactions.js:226
msgid "Delete permanently"
msgstr "Forigi por ĉiam"
-#: js/fileactions.js:226 templates/list.php:78 templates/list.php:79
+#: js/fileactions.js:228 templates/list.php:78 templates/list.php:79
msgid "Delete"
msgstr "Forigi"
-#: js/fileactions.js:262
+#: js/fileactions.js:264
msgid "Rename"
msgstr "Alinomigi"
@@ -216,55 +216,55 @@ msgid ""
"big."
msgstr "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:623 js/filelist.js:1713
msgid "Pending"
msgstr "Traktotaj"
-#: js/filelist.js:1139
+#: js/filelist.js:1143
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1151
msgid "Error moving file"
msgstr "Eraris movo de dosiero"
-#: js/filelist.js:1147
+#: js/filelist.js:1151
msgid "Error"
msgstr "Eraro"
-#: js/filelist.js:1225
+#: js/filelist.js:1240
msgid "Could not rename file"
msgstr "Ne povis alinomiĝi dosiero"
-#: js/filelist.js:1346
+#: js/filelist.js:1358
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1461 templates/list.php:62
msgid "Name"
msgstr "Nomo"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1462 templates/list.php:73
msgid "Size"
msgstr "Grando"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1463 templates/list.php:76
msgid "Modified"
msgstr "Modifita"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1473 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n dosierujo"
msgstr[1] "%n dosierujoj"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1479 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n dosiero"
msgstr[1] "%n dosieroj"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1606 js/filelist.js:1645
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Alŝutatas %n dosiero"
@@ -313,7 +313,7 @@ msgstr "%s ne povis alinomiĝi"
#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
-msgstr ""
+msgstr "Alŝuti (maks. %s)"
#: templates/admin.php:6
msgid "File handling"
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index de369c73f8d..a7639374546 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Mariano <mstreet@kde.org.ar>, 2013
+# Mariano <mstreet@kde.org.ar>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-14 01:54-0400\n"
-"PO-Revision-Date: 2014-06-14 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 15:31+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -182,7 +182,7 @@ msgstr "Ĝisdatigi la pasvorton de la malpublika klavo"
#: templates/settings-personal.php:41
msgid "Enable password recovery:"
-msgstr ""
+msgstr "Kapabligi restaŭron de pasvorto:"
#: templates/settings-personal.php:43
msgid ""
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 0487d318894..7ac7cda5ab4 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Mariano <mstreet@kde.org.ar>, 2013
+# Mariano <mstreet@kde.org.ar>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -20,47 +20,47 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Interservila kunhavo ne kapabliĝis en ĉi tiu servilo"
#: ajax/external.php:50
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
-msgstr ""
+msgstr "Kunhavata kun vi"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
-msgstr ""
+msgstr "Kunhavata kun aliaj"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
-msgstr ""
+msgstr "Kunhavata per ligilo"
#: js/app.js:35
msgid "No files have been shared with you yet."
-msgstr ""
+msgstr "Neniu dosiero kunhaviĝis kun vi ankoraŭ."
#: js/app.js:54
msgid "You haven't shared any files yet."
-msgstr ""
+msgstr "Vi kunhavigis neniun dosieron ankoraŭ."
#: js/app.js:73
msgid "You haven't shared any files by link yet."
-msgstr ""
+msgstr "Vi kunhavigis neniun dosieron per ligilo ankoraŭ."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Aldoni {name} el {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Ne troviĝis instalo de ownCloud ĉe {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Nevalidas URL de ownCloud"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -76,7 +76,7 @@ msgstr "Ĉi tiu kunhavigo estas protektata per pasvorto"
#: templates/authenticate.php:7
msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "La pasvorto malĝustas. Provu denove."
#: templates/authenticate.php:10 templates/authenticate.php:12
msgid "Password"
@@ -116,15 +116,15 @@ msgstr "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilo
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Konservi en ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "example.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Konservi"
#: templates/public.php:28
msgid "Download"
@@ -133,14 +133,14 @@ msgstr "Elŝuti"
#: templates/public.php:59
#, php-format
msgid "Download %s"
-msgstr ""
+msgstr "Elŝuti %s"
#: templates/public.php:63
msgid "Direct link"
msgstr "Direkta ligilo"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 0087e504830..ff783a99c0a 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 14:21+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,50 +18,50 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:678
+#: base.php:673
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:679
+#: base.php:674
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
"example configuration is provided in config/config.sample.php."
msgstr ""
-#: private/app.php:361
+#: private/app.php:366
msgid "Help"
msgstr "Helpo"
-#: private/app.php:374
+#: private/app.php:379
msgid "Personal"
msgstr "Persona"
-#: private/app.php:385
+#: private/app.php:390
msgid "Settings"
msgstr "Agordo"
-#: private/app.php:397
+#: private/app.php:402
msgid "Users"
msgstr "Uzantoj"
-#: private/app.php:410
+#: private/app.php:415
msgid "Admin"
msgstr "Administranto"
-#: private/app.php:978
+#: private/app.php:987
#, php-format
msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "Malsukcesis ĝisdatigo de “%s”."
-#: private/app.php:1135
+#: private/app.php:1144
#, php-format
msgid ""
"App \\\"%s\\\" can't be installed because it is not compatible with this "
"version of ownCloud."
-msgstr ""
+msgstr "La aplikaĵo “%s” ne povas instaliĝi ĉar ĝi ne kongruas kun ĉi tiu eldono de ownCloud."
-#: private/app.php:1147
+#: private/app.php:1156
msgid "No app name specified"
msgstr ""
@@ -79,55 +79,55 @@ msgstr "TTT-servoj regataj de vi"
#: private/installer.php:77
msgid "App directory already exists"
-msgstr ""
+msgstr "La dosierujo de la aplikaĵo jam ekzistas"
#: private/installer.php:90
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: private/installer.php:231
+#: private/installer.php:235
msgid "No source specified when installing app"
msgstr ""
-#: private/installer.php:238
+#: private/installer.php:242
msgid "No href specified when installing app from http"
msgstr ""
-#: private/installer.php:243
+#: private/installer.php:247
msgid "No path specified when installing app from local file"
msgstr ""
-#: private/installer.php:257
+#: private/installer.php:261
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: private/installer.php:271
+#: private/installer.php:275
msgid "Failed to open archive when installing app"
msgstr ""
-#: private/installer.php:309
+#: private/installer.php:313
msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "La aplikaĵo ne provizas dosieron info.xml"
-#: private/installer.php:315
+#: private/installer.php:319
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: private/installer.php:321
+#: private/installer.php:325
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
-msgstr ""
+msgstr "La aplikaĵo ne povas instaliĝi ĉar ĝi ne kongruas kun ĉi tiu eldono de ownCloud"
-#: private/installer.php:327
+#: private/installer.php:331
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: private/installer.php:340
+#: private/installer.php:344
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
@@ -147,7 +147,7 @@ msgstr "Ĵetono eksvalidiĝis. Bonvolu reŝargi la paĝon."
#: private/json.php:74
msgid "Unknown user"
-msgstr ""
+msgstr "Nekonata uzanto"
#: private/setup/abstractdatabase.php:26
#, php-format
@@ -245,13 +245,13 @@ msgstr "Starigi administran uzantonomon."
msgid "Set an admin password."
msgstr "Starigi administran pasvorton."
-#: private/setup.php:164
+#: private/setup.php:170
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita."
-#: private/setup.php:165
+#: private/setup.php:171
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>."
@@ -320,57 +320,57 @@ msgstr ""
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:820
+#: private/share/share.php:860
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:881
+#: private/share/share.php:921
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:1002
+#: private/share/share.php:1046
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:1009
+#: private/share/share.php:1053
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:1015
+#: private/share/share.php:1059
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1432
+#: private/share/share.php:1476
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1441
+#: private/share/share.php:1485
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1457
+#: private/share/share.php:1501
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1469
+#: private/share/share.php:1513
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1483
+#: private/share/share.php:1527
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 33c923af56c..efaa86ed56b 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 14:21+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -48,15 +48,15 @@ msgstr "La retpoŝtaĵo sendiĝis"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:350
+#: admin/controller.php:116 templates/admin.php:337
msgid "Send mode"
msgstr "Sendi pli"
-#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144
msgid "Encryption"
msgstr "Ĉifrado"
-#: admin/controller.php:120 templates/admin.php:387
+#: admin/controller.php:120 templates/admin.php:374
msgid "Authentication method"
msgstr "Aŭtentiga metodo"
@@ -194,7 +194,7 @@ msgstr ""
msgid "Unable to change password"
msgstr "Ne eblis ŝanĝi la pasvorton"
-#: js/admin.js:126
+#: js/admin.js:127
msgid "Sending..."
msgstr "Sendante..."
@@ -212,7 +212,7 @@ msgstr "Ĝisdatigi al {appversion}"
#: js/apps.js:90
msgid "Uninstall App"
-msgstr ""
+msgstr "Malinstali aplikaĵon"
#: js/apps.js:96 js/apps.js:158 js/apps.js:191
msgid "Disable"
@@ -228,11 +228,11 @@ msgstr "Bonvolu atendi..."
#: js/apps.js:155 js/apps.js:156 js/apps.js:182
msgid "Error while disabling app"
-msgstr ""
+msgstr "Eraris malkapabligo de aplikaĵo"
#: js/apps.js:181 js/apps.js:210 js/apps.js:211
msgid "Error while enabling app"
-msgstr ""
+msgstr "Eraris kapabligo de aplikaĵo"
#: js/apps.js:220
msgid "Updating...."
@@ -256,15 +256,15 @@ msgstr "Ĝisdatigita"
#: js/apps.js:233
msgid "Uninstalling ...."
-msgstr ""
+msgstr "Malinstalante..."
#: js/apps.js:236
msgid "Error while uninstalling app"
-msgstr ""
+msgstr "Eraris malinstalo de aplikaĵo"
#: js/apps.js:237 templates/apps.php:56
msgid "Uninstall"
-msgstr ""
+msgstr "Malinstali"
#: js/personal.js:256
msgid "Select a profile picture"
@@ -316,13 +316,13 @@ msgstr ""
#: js/users/groups.js:205
msgid "deleted {groupName}"
-msgstr ""
+msgstr "{groupName} foriĝis"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "malfari"
-#: js/users/users.js:37 templates/admin.php:302
+#: js/users/users.js:37 templates/admin.php:292
#: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10
#: templates/users/part.userlist.php:41
msgid "Groups"
@@ -333,38 +333,38 @@ msgstr "Grupoj"
msgid "Group Admin"
msgstr "Grupadministranto"
-#: js/users/users.js:63 templates/users/part.grouplist.php:44
+#: js/users/users.js:63 templates/users/part.grouplist.php:46
#: templates/users/part.userlist.php:108
msgid "Delete"
msgstr "Forigi"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "neniam"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
-msgstr ""
+msgstr "{userName} foriĝis"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "aldoni grupon"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Valida uzantonomo devas proviziĝi"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Eraris kreo de uzanto"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Valida pasvorto devas proviziĝi"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
-msgstr ""
+msgstr "Averto: hejmdosierujo por la uzanto “{user”} jam ekzistas"
#: personal.php:50 personal.php:51
msgid "__language_name__"
@@ -372,23 +372,23 @@ msgstr "Esperanto"
#: templates/admin.php:8
msgid "Everything (fatal issues, errors, warnings, info, debug)"
-msgstr ""
+msgstr "Ĉio (fatalaĵoj, eraroj, avertoj, informoj, sencimigaj mesaĝoj)"
#: templates/admin.php:9
msgid "Info, warnings, errors and fatal issues"
-msgstr ""
+msgstr "Informoj, avertoj, eraroj kaj fatalaĵoj"
#: templates/admin.php:10
msgid "Warnings, errors and fatal issues"
-msgstr ""
+msgstr "Avertoj, eraroj kaj fatalaĵoj"
#: templates/admin.php:11
msgid "Errors and fatal issues"
-msgstr ""
+msgstr "Eraroj kaj fatalaĵoj"
#: templates/admin.php:12
msgid "Fatal issues only"
-msgstr ""
+msgstr "Fatalaĵoj nur"
#: templates/admin.php:16 templates/admin.php:23
msgid "None"
@@ -516,7 +516,7 @@ msgstr ""
#: templates/admin.php:172
msgid "Internet connection not working"
-msgstr ""
+msgstr "La Interreto-konekto ne funkcias"
#: templates/admin.php:175
msgid ""
@@ -565,29 +565,29 @@ msgstr ""
msgid "Sharing"
msgstr "Kunhavigo"
-#: templates/admin.php:240
+#: templates/admin.php:238
msgid "Allow apps to use the Share API"
msgstr "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo"
-#: templates/admin.php:247
+#: templates/admin.php:243
msgid "Allow users to share via link"
msgstr ""
-#: templates/admin.php:251
+#: templates/admin.php:249
msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:252
msgid "Allow public uploads"
msgstr "Permesi publikajn alŝutojn"
-#: templates/admin.php:258
+#: templates/admin.php:256
msgid "Set default expiration date"
msgstr ""
#: templates/admin.php:260
msgid "Expire after "
-msgstr ""
+msgstr "Eksvalidigi post"
#: templates/admin.php:263
msgid "days"
@@ -597,116 +597,116 @@ msgstr "tagoj"
msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:276
+#: templates/admin.php:271
msgid "Allow resharing"
msgstr "Kapabligi rekunhavigon"
-#: templates/admin.php:283
+#: templates/admin.php:276
msgid "Restrict users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:290
+#: templates/admin.php:281
msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:297
+#: templates/admin.php:286
msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:308
+#: templates/admin.php:298
msgid ""
"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:316
+#: templates/admin.php:303
msgid "Security"
msgstr "Sekuro"
-#: templates/admin.php:327
+#: templates/admin.php:314
msgid "Enforce HTTPS"
msgstr ""
-#: templates/admin.php:329
+#: templates/admin.php:316
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr ""
-#: templates/admin.php:335
+#: templates/admin.php:322
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr ""
-#: templates/admin.php:345
+#: templates/admin.php:332
msgid "Email Server"
msgstr "Retpoŝtoservilo"
-#: templates/admin.php:347
+#: templates/admin.php:334
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:378
+#: templates/admin.php:365
msgid "From address"
msgstr "El adreso"
-#: templates/admin.php:379
+#: templates/admin.php:366
msgid "mail"
-msgstr ""
+msgstr "retpoŝto"
-#: templates/admin.php:400
+#: templates/admin.php:387
msgid "Authentication required"
msgstr "Aŭtentiĝo nepras"
-#: templates/admin.php:404
+#: templates/admin.php:391
msgid "Server address"
msgstr "Servila adreso"
-#: templates/admin.php:408
+#: templates/admin.php:395
msgid "Port"
msgstr "Pordo"
-#: templates/admin.php:413
+#: templates/admin.php:400
msgid "Credentials"
msgstr "Aŭtentigiloj"
-#: templates/admin.php:414
+#: templates/admin.php:401
msgid "SMTP Username"
msgstr "SMTP-uzantonomo"
-#: templates/admin.php:417
+#: templates/admin.php:404
msgid "SMTP Password"
msgstr "SMTP-pasvorto"
-#: templates/admin.php:421
+#: templates/admin.php:408
msgid "Test email settings"
msgstr ""
-#: templates/admin.php:422
+#: templates/admin.php:409
msgid "Send email"
msgstr "Sendi retpoŝton"
-#: templates/admin.php:427
+#: templates/admin.php:414
msgid "Log"
msgstr "Protokolo"
-#: templates/admin.php:428
+#: templates/admin.php:415
msgid "Log level"
msgstr "Registronivelo"
-#: templates/admin.php:460
+#: templates/admin.php:447
msgid "More"
msgstr "Pli"
-#: templates/admin.php:461
+#: templates/admin.php:448
msgid "Less"
msgstr "Malpli"
-#: templates/admin.php:467 templates/personal.php:196
+#: templates/admin.php:454 templates/personal.php:196
msgid "Version"
msgstr "Eldono"
-#: templates/admin.php:471 templates/personal.php:199
+#: templates/admin.php:458 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -746,7 +746,7 @@ msgstr "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\
#: templates/apps.php:59
msgid "Enable only for specific groups"
-msgstr ""
+msgstr "Kapabligi nur por specifajn grupojn"
#: templates/apps.php:61
msgid "All"
@@ -846,7 +846,7 @@ msgstr "Forigi bildon"
#: templates/personal.php:98
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "Aŭ PNG aŭ JPG. Prefere ĝi kvadratu, sed vi povos stuci ĝin."
#: templates/personal.php:100
msgid "Your avatar is provided by your original account."
@@ -916,11 +916,11 @@ msgstr ""
#: templates/users/part.createuser.php:32
msgid "Search Users and Groups"
-msgstr ""
+msgstr "Serĉi uzantojn kaj grupojn"
#: templates/users/part.grouplist.php:5
msgid "Add Group"
-msgstr ""
+msgstr "Aldoni grupon"
#: templates/users/part.grouplist.php:10
msgid "Group"
@@ -928,11 +928,11 @@ msgstr "Grupo"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
-msgstr ""
+msgstr "Ĉiuj"
-#: templates/users/part.grouplist.php:29
+#: templates/users/part.grouplist.php:31
msgid "Admins"
-msgstr ""
+msgstr "Administrantoj"
#: templates/users/part.setquota.php:7
msgid "Default Quota"
@@ -964,7 +964,7 @@ msgstr ""
#: templates/users/part.userlist.php:16
msgid "Last Login"
-msgstr ""
+msgstr "Lasta ensaluto"
#: templates/users/part.userlist.php:30
msgid "change full name"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 7aa61581a7b..9aa5fae2ded 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Mariano <mstreet@kde.org.ar>, 2013
+# Mariano <mstreet@kde.org.ar>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 15:02+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -73,7 +73,7 @@ msgstr "Ĉu daŭrigi la agordon?"
#: js/settings.js:93
msgid "{nthServer}. Server"
-msgstr ""
+msgstr "{nthServer}. Servilo"
#: js/settings.js:99
msgid "Cannot add server configuration"
@@ -105,15 +105,15 @@ msgstr ""
#: js/settings.js:780
msgid "Configuration OK"
-msgstr ""
+msgstr "La agordaro ĝustas"
#: js/settings.js:789
msgid "Configuration incorrect"
-msgstr ""
+msgstr "La agordaro malĝustas"
#: js/settings.js:798
msgid "Configuration incomplete"
-msgstr ""
+msgstr "La agordaro neplenas"
#: js/settings.js:815 js/settings.js:824
msgid "Select groups"
@@ -143,39 +143,39 @@ msgstr ""
msgid "Confirm Deletion"
msgstr "Konfirmi forigon"
-#: lib/wizard.php:83 lib/wizard.php:97
+#: lib/wizard.php:97 lib/wizard.php:112
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s grupo troviĝis"
msgstr[1] "%s grupoj troviĝis"
-#: lib/wizard.php:130
+#: lib/wizard.php:126
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s uzanto troviĝis"
msgstr[1] "%s uzanto troviĝis"
-#: lib/wizard.php:825 lib/wizard.php:837
-msgid "Invalid Host"
-msgstr "Nevalida gastigo"
-
-#: lib/wizard.php:1025
+#: lib/wizard.php:317 lib/wizard.php:1051
msgid "Could not find the desired feature"
msgstr ""
+#: lib/wizard.php:858 lib/wizard.php:870
+msgid "Invalid Host"
+msgstr "Nevalida gastigo"
+
#: settings.php:52
msgid "Server"
-msgstr ""
+msgstr "Servilo"
#: settings.php:53
msgid "User Filter"
-msgstr ""
+msgstr "Filtrilo de uzanto"
#: settings.php:54
msgid "Login Filter"
-msgstr ""
+msgstr "Ensaluta filtrilo"
#: settings.php:55
msgid "Group Filter"
@@ -232,7 +232,7 @@ msgstr "grupoj trovitaj"
#: templates/part.wizard-loginfilter.php:4
msgid "Users login with this attribute:"
-msgstr ""
+msgstr "Uzantoj ensalutas kun ĉi tiu atributo:"
#: templates/part.wizard-loginfilter.php:8
msgid "LDAP Username:"
@@ -255,12 +255,12 @@ msgstr ""
#: templates/part.wizard-server.php:6
msgid "1. Server"
-msgstr ""
+msgstr "1. Servilo"
#: templates/part.wizard-server.php:13
#, php-format
msgid "%s. Server:"
-msgstr ""
+msgstr "%s. Servilo:"
#: templates/part.wizard-server.php:18
msgid "Add Server Configuration"
@@ -268,7 +268,7 @@ msgstr "Aldoni agordon de servilo"
#: templates/part.wizard-server.php:21
msgid "Delete Configuration"
-msgstr ""
+msgstr "Forigi agordaron"
#: templates/part.wizard-server.php:30
msgid "Host"
@@ -335,7 +335,7 @@ msgstr ""
#: templates/settings.php:7
msgid "Expert"
-msgstr ""
+msgstr "Sperta"
#: templates/settings.php:8
msgid "Advanced"
@@ -413,7 +413,7 @@ msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
#: templates/settings.php:30
msgid "Directory Settings"
-msgstr ""
+msgstr "Agordo de dosierujo"
#: templates/settings.php:32
msgid "User Display Name Field"
@@ -433,7 +433,7 @@ msgstr ""
#: templates/settings.php:34
msgid "User Search Attributes"
-msgstr ""
+msgstr "Atributoj de serĉo de uzanto"
#: templates/settings.php:34 templates/settings.php:37
msgid "Optional; one attribute per line"
diff --git a/l10n/eo/user_webdavauth.po b/l10n/eo/user_webdavauth.po
index f46152a44e3..bcf5f792bd4 100644
--- a/l10n/eo/user_webdavauth.po
+++ b/l10n/eo/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index afca4f3698a..7b50de05bc2 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -24,9 +24,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-16 17:30+0000\n"
-"Last-Translator: Carlos Andrés Burgos Urey <business@carlos-burgos.com>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -249,7 +249,7 @@ msgid ""
"will be no way to get your data back after your password is reset.<br />If "
"you are not sure what to do, please contact your administrator before you "
"continue. <br />Do you really want to continue?"
-msgstr ""
+msgstr "Sus archivos están encriptados. Si no ha habilitado la clave de recuperación, no habrá manera de recuperar los datos despues de un reset de la contraseña. .<br /> Si no está seguro de lo que debe hacer, por favor contacte con su administrador antes de continuar.<br />¿Realmente desea continuar?"
#: js/lostpassword.js:10
msgid "I know what I'm doing"
@@ -263,75 +263,75 @@ msgstr "Restablecer contraseña"
msgid "Password can not be changed. Please contact your administrator."
msgstr "La contraseña no se puede cambiar. Por favor, contacte con su administrador."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Seleccionar"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Error cargando plantilla del seleccionador de archivos: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Aceptar"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Error cargando plantilla del mensaje: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflicto de archivo"
msgstr[1] "{count} conflictos de archivo"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "On conflicto de archivo"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Nuevos Archivos"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Archivos ya existentes"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "¿Que archivos deseas mantener?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(seleccionados todos)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Error cargando plantilla de archivo existente"
@@ -470,29 +470,29 @@ msgid "notify by email"
msgstr "notificar por correo electrónico"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "puede editar"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "crear"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "actualizar"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "eliminar"
-#: js/share.js:587
-msgid "share"
-msgstr "compartir"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Protegido con contraseña"
@@ -563,17 +563,17 @@ msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud
#: lostpassword/controller/lostcontroller.php:110
msgid "Couldn't reset password because the token is invalid"
-msgstr ""
+msgstr "No se puede restablecer la contraseña porque el token no es válido"
#: lostpassword/controller/lostcontroller.php:136
msgid "Couldn't send reset email. Please make sure your username is correct."
-msgstr ""
+msgstr "No se pudo resetear su correo electrónico. Por favor, asegúrese de que su nombre de usuario es correcto."
#: lostpassword/controller/lostcontroller.php:151
msgid ""
"Couldn't send reset email because there is no email address for this "
"username. Please contact your administrator."
-msgstr ""
+msgstr "No se pudo resetear su correo electrónico, porque no hay una dirección de correo electrónico asociada para este nombre de usuario. Por favor, póngase en contacto con su administrador."
#: lostpassword/controller/lostcontroller.php:168
#, php-format
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 50661a2a70b..d095b5fd0f2 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-12 01:54-0400\n"
-"PO-Revision-Date: 2014-06-11 22:10+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index 854e008c070..3d55a81083d 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -10,7 +10,7 @@
# juanman <juanma@kde.org.ar>, 2013
# Maenso <balero_arana@hotmail.com>, 2013
# mikel anabitarte <inactive+mikelanabitarte@transifex.com>, 2013
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014
# Rubén del Campo Gómez <yo@rubendelcampo.es>, 2013
# Sam Askari <saskarip@gmail.com>, 2013
# William Díaz <wdiazux@gmail.com>, 2013
@@ -19,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-14 01:54-0400\n"
-"PO-Revision-Date: 2014-06-14 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-25 06:33-0400\n"
+"PO-Revision-Date: 2014-06-25 10:31+0000\n"
+"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\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"
@@ -118,7 +118,7 @@ msgstr "Cifrado inicial en curso... Inténtelo más tarde."
#: templates/invalid_private_key.php:8
#, php-format
msgid "Go directly to your %spersonal settings%s."
-msgstr ""
+msgstr "Ir directamente a %sOpciones%s."
#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 633194790f1..9fed95e29ac 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -9,13 +9,14 @@
# Jose Luis <joseluis.tirado@gmail.com>, 2014
# joses <jose_mari_s@hotmail.com>, 2014
# juanman <juanma@kde.org.ar>, 2013
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2014
# Rubén del Campo Gómez <yo@rubendelcampo.es>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -26,21 +27,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Compartir entre servidores no está habilitado en este servidor"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "No se puede añadir un compartido remoto"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Compartido contigo"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Compartido con otros"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Compartido por medio de enlaces"
@@ -56,17 +57,17 @@ msgstr "Aún no has compartido ningún archivo."
msgid "You haven't shared any files by link yet."
msgstr "Usted todavía no ha compartido ningún archivo por medio de enlaces."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Añadir {name} desde {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "No se encontró una instalación de ownCloud en {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "URL de ownCloud inválido"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -122,15 +123,15 @@ msgstr "Para mayor información, contacte a la persona que le envió el enlace."
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Guardar en ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "ejemplo.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Guardar"
#: templates/public.php:28
msgid "Download"
@@ -146,13 +147,13 @@ msgid "Direct link"
msgstr "Enlace directo"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Permitir a otros montar enlaces publicos compartidos de este servidor"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Permitir a los usuarios montar enlaces publicos compartidos"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 0ca4acf1212..f1d237af25e 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po
index c3ef53d78fc..2fc914dce86 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 16:51+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 3f06acbe761..fcc88aea856 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -248,75 +248,75 @@ msgstr "Restablecer contraseña"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Elegir"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Error cargando la plantilla del selector de archivo: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Aceptar"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Error cargando la plantilla del mensaje: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "un archivo en conflicto"
msgstr[1] "{count} archivos en conflicto"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Un archivo en conflicto"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Nuevos archivos"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "¿Qué archivos deseas retener?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si tu seleccionas ambas versiones, el archivo copiado tendrá un número agregado a su nombre."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(todos están seleccionados)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Error cargando la plantilla de archivo existente"
@@ -455,29 +455,29 @@ msgid "notify by email"
msgstr "notificar por correo"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "podés editar"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "crear"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "actualizar"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "borrar"
-#: js/share.js:587
-msgid "share"
-msgstr "compartir"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Protegido por contraseña"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index ae575af2e9a..47a778586bf 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgstr "La subida del archivo está en proceso. Si salís de la página ahora, l
msgid "URL cannot be empty"
msgstr "La URL no puede estar vacía"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} ya existe"
@@ -219,55 +219,55 @@ msgid ""
"big."
msgstr "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Pendientes"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Error moviendo el archivo"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Error"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "No se pudo renombrar el archivo"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Error al borrar el archivo."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nombre"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Tamaño"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Modificado"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n carpeta"
msgstr[1] "%n carpetas"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n archivo"
msgstr[1] "%n archivos"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Subiendo %n archivo"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index 0fb08063dc0..49ba0a1dc8d 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -51,7 +51,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Guardar"
#: templates/public.php:28
msgid "Download"
@@ -141,7 +141,7 @@ msgid "Direct link"
msgstr "Vínculo directo"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 28bcfaca883..27b0c10c76b 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index dc4c734a160..24a6d2a7d0c 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_BO/core.po b/l10n/es_BO/core.po
index e3fdb470756..8cdc1a15f8f 100644
--- a/l10n/es_BO/core.po
+++ b/l10n/es_BO/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/es_BO/files_sharing.po b/l10n/es_BO/files_sharing.po
index e1fbeab7df2..88929dae710 100644
--- a/l10n/es_BO/files_sharing.po
+++ b/l10n/es_BO/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/es_CL/core.po b/l10n/es_CL/core.po
index 8f3dc1c6db4..d6eb43c46d8 100644
--- a/l10n/es_CL/core.po
+++ b/l10n/es_CL/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -247,75 +247,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Si"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Choose"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -454,27 +454,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/es_CL/files_sharing.po b/l10n/es_CL/files_sharing.po
index a98d0677e40..89ddc8eb558 100644
--- a/l10n/es_CL/files_sharing.po
+++ b/l10n/es_CL/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/es_CO/core.po b/l10n/es_CO/core.po
index f15cabff753..471ba8e1913 100644
--- a/l10n/es_CO/core.po
+++ b/l10n/es_CO/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/es_CO/files_sharing.po b/l10n/es_CO/files_sharing.po
index 085f3c3dc12..c0461f1e95f 100644
--- a/l10n/es_CO/files_sharing.po
+++ b/l10n/es_CO/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/es_CR/core.po b/l10n/es_CR/core.po
index c9634c05155..02857f0703d 100644
--- a/l10n/es_CR/core.po
+++ b/l10n/es_CR/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/es_CR/files_sharing.po b/l10n/es_CR/files_sharing.po
index 42ed5f82731..e7957a193f4 100644
--- a/l10n/es_CR/files_sharing.po
+++ b/l10n/es_CR/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/es_EC/core.po b/l10n/es_EC/core.po
index e1fe1edfa88..5c054082bb1 100644
--- a/l10n/es_EC/core.po
+++ b/l10n/es_EC/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/es_EC/files_sharing.po b/l10n/es_EC/files_sharing.po
index 2e73fba26f9..64d748d8198 100644
--- a/l10n/es_EC/files_sharing.po
+++ b/l10n/es_EC/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po
index f741b57d7ea..995eb38d1d9 100644
--- a/l10n/es_MX/core.po
+++ b/l10n/es_MX/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr "Restablecer contraseña"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Sí"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Seleccionar"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Error cargando plantilla del seleccionador de archivos: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Aceptar"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Error cargando plantilla del mensaje: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflicto de archivo"
msgstr[1] "{count} conflictos de archivo"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Un conflicto de archivo"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "¿Que archivos deseas mantener?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(todos seleccionados)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Error cargando plantilla de archivo existente"
@@ -453,29 +453,29 @@ msgid "notify by email"
msgstr "notificar al usuario por correo electrónico"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "puede editar"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "crear"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "actualizar"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "eliminar"
-#: js/share.js:587
-msgid "share"
-msgstr "compartir"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Protegido con contraseña"
diff --git a/l10n/es_MX/files.po b/l10n/es_MX/files.po
index 97564d3c455..3e31dcc23cf 100644
--- a/l10n/es_MX/files.po
+++ b/l10n/es_MX/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "La subida del archivo está en proceso. Si sale de la página ahora, la
msgid "URL cannot be empty"
msgstr "La dirección URL no puede estar vacía"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} ya existe"
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr "Su descarga está siendo preparada. Esto podría tardar algo de tiempo si los archivos son grandes."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Pendiente"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Error moviendo archivo"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Error"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "No se pudo renombrar el archivo"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Error borrando el archivo."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nombre"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Tamaño"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Modificado"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n carpeta"
msgstr[1] "%n carpetas"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n archivo"
msgstr[1] "%n archivos"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Subiendo %n archivo"
diff --git a/l10n/es_MX/files_sharing.po b/l10n/es_MX/files_sharing.po
index 0ba4052ccc0..ceb71f86a50 100644
--- a/l10n/es_MX/files_sharing.po
+++ b/l10n/es_MX/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Guardar"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr "Enlace directo"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/es_MX/user_ldap.po b/l10n/es_MX/user_ldap.po
index b577efccc6b..30981bf513c 100644
--- a/l10n/es_MX/user_ldap.po
+++ b/l10n/es_MX/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_MX/user_webdavauth.po b/l10n/es_MX/user_webdavauth.po
index eae29380fa2..e85b6e09b67 100644
--- a/l10n/es_MX/user_webdavauth.po
+++ b/l10n/es_MX/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_PE/core.po b/l10n/es_PE/core.po
index a1429b7b499..f137ef77ee6 100644
--- a/l10n/es_PE/core.po
+++ b/l10n/es_PE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/es_PE/files_sharing.po b/l10n/es_PE/files_sharing.po
index 14408a4b479..a12c692790e 100644
--- a/l10n/es_PE/files_sharing.po
+++ b/l10n/es_PE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/es_PY/core.po b/l10n/es_PY/core.po
index c5a3b2a4515..271bc394587 100644
--- a/l10n/es_PY/core.po
+++ b/l10n/es_PY/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/es_PY/files_sharing.po b/l10n/es_PY/files_sharing.po
index c1dbe394bae..4bb30fa7bdb 100644
--- a/l10n/es_PY/files_sharing.po
+++ b/l10n/es_PY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/es_US/core.po b/l10n/es_US/core.po
index 48672e0a2c0..104f6c654e6 100644
--- a/l10n/es_US/core.po
+++ b/l10n/es_US/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/es_US/files_sharing.po b/l10n/es_US/files_sharing.po
index faf79beb6b1..82fa77456d4 100644
--- a/l10n/es_US/files_sharing.po
+++ b/l10n/es_US/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/es_UY/core.po b/l10n/es_UY/core.po
index 2480270937c..f773f541cee 100644
--- a/l10n/es_UY/core.po
+++ b/l10n/es_UY/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/es_UY/files_sharing.po b/l10n/es_UY/files_sharing.po
index 63cd3a733e3..ebf673bc2a0 100644
--- a/l10n/es_UY/files_sharing.po
+++ b/l10n/es_UY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 10a60fba67b..021126939a3 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -42,12 +42,12 @@ msgstr "Uuendatud andmebaas"
#: ajax/update.php:19
msgid "Checked database schema update"
-msgstr ""
+msgstr "Andmebaasi skeemi uuendus kontrollitud"
#: ajax/update.php:27
#, php-format
msgid "Disabled incompatible apps: %s"
-msgstr ""
+msgstr "Keelatud mitteühilduvad rakendid: %s"
#: avatar/controller.php:69
msgid "No image or file provided"
@@ -163,7 +163,7 @@ msgstr "Pilt"
#: js/js.js:593
msgid "Audio"
-msgstr ""
+msgstr "Helid"
#: js/js.js:607
msgid "Saving..."
@@ -219,14 +219,14 @@ msgstr "aastat tagasi"
#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175
msgid "Couldn't send reset email. Please contact your administrator."
-msgstr ""
+msgstr "Ei suutnud lähtestada e-maili. Palun kontakteeru süsteemihalduriga."
#: js/lostpassword.js:5
msgid ""
"The link to reset your password has been sent to your email. If you do not "
"receive it within a reasonable amount of time, check your spam/junk "
"folders.<br>If it is not there ask your local administrator."
-msgstr ""
+msgstr "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge<br>.Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt."
#: js/lostpassword.js:7
msgid ""
@@ -234,11 +234,11 @@ msgid ""
"will be no way to get your data back after your password is reset.<br />If "
"you are not sure what to do, please contact your administrator before you "
"continue. <br />Do you really want to continue?"
-msgstr ""
+msgstr "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. <br />Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. <br />Oled sa kindel, et sa soovid jätkata?"
#: js/lostpassword.js:10
msgid "I know what I'm doing"
-msgstr ""
+msgstr "Ma tean mida teen"
#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9
msgid "Reset password"
@@ -246,77 +246,77 @@ msgstr "Nulli parool"
#: js/lostpassword.js:16
msgid "Password can not be changed. Please contact your administrator."
-msgstr ""
+msgstr "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Jah"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Ei"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Vali"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Viga failivalija malli laadimisel: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Viga sõnumi malli laadimisel: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} failikonflikt"
msgstr[1] "{count} failikonflikti"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Üks failikonflikt"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Uued failid"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Juba olemasolevad failid"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Milliseid faile sa soovid alles hoida?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Loobu"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Jätka"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(kõik valitud)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} valitud)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Viga faili olemasolu malli laadimisel"
@@ -350,7 +350,7 @@ msgstr "Jagas {owner}"
#: js/share.js:205
msgid "Shared with {recipients}"
-msgstr ""
+msgstr "Jagatud {recipients}"
#: js/share.js:211
msgid "Share"
@@ -455,29 +455,29 @@ msgid "notify by email"
msgstr "teavita e-postiga"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "saab muuta"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "ligipääsukontroll"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "loo"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "uuenda"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "kustuta"
-#: js/share.js:587
-msgid "share"
-msgstr "jaga"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Parooliga kaitstud"
@@ -532,7 +532,7 @@ msgstr "Kustutamiseks pole ühtegi silti valitud."
#: js/update.js:30
msgid "Updating {productName} to version {version}, this may take a while."
-msgstr ""
+msgstr "Uuendan {productName} versioonile {version}, see võtab veidi aega."
#: js/update.js:43
msgid "Please reload the page."
@@ -540,7 +540,7 @@ msgstr "Palun laadi see uuesti."
#: js/update.js:52
msgid "The update was unsuccessful."
-msgstr ""
+msgstr "Uuendus ebaõnnestus."
#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
@@ -548,17 +548,17 @@ msgstr "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi."
#: lostpassword/controller/lostcontroller.php:110
msgid "Couldn't reset password because the token is invalid"
-msgstr ""
+msgstr "Ei saanud parooli taastada, kuna märgend on vigane"
#: lostpassword/controller/lostcontroller.php:136
msgid "Couldn't send reset email. Please make sure your username is correct."
-msgstr ""
+msgstr "Ei suutnud lähtestada e-maili. Palun veendu, et kasutajatunnus on õige."
#: lostpassword/controller/lostcontroller.php:151
msgid ""
"Couldn't send reset email because there is no email address for this "
"username. Please contact your administrator."
-msgstr ""
+msgstr "Ei suutnud lähtestada e-maili, kuna sellel kasutajal pole e-posti määratud. Palun kontakteeru süsteemihalduriga."
#: lostpassword/controller/lostcontroller.php:168
#, php-format
@@ -601,7 +601,7 @@ msgstr "Uus parool"
#: lostpassword/templates/resetpassword.php:6
msgid "New Password"
-msgstr ""
+msgstr "Uus parool"
#: setup/controller.php:140
#, php-format
@@ -753,7 +753,7 @@ msgstr "Seadista andmebaasi"
#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
-msgstr ""
+msgstr "Ainult %s on saadaval."
#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
@@ -779,7 +779,7 @@ msgstr "Andmebaasi host"
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
-msgstr ""
+msgstr "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta."
#: templates/installation.php:159
msgid "Finish setup"
@@ -829,7 +829,7 @@ msgstr "Palun kontakteeru oma süsteemihalduriga."
#: templates/login.php:50
msgid "Forgot your password? Reset it!"
-msgstr ""
+msgstr "Unustasid parooli? Taasta see!"
#: templates/login.php:55
msgid "remember"
@@ -871,26 +871,26 @@ msgstr "Täname kannatlikkuse eest."
#: templates/update.admin.php:3
#, php-format
msgid "%s will be updated to version %s."
-msgstr ""
+msgstr "%s uuendatakse versioonile %s."
#: templates/update.admin.php:7
msgid "The following apps will be disabled:"
-msgstr ""
+msgstr "Järgnevad rakendid keelatakse:"
#: templates/update.admin.php:17
#, php-format
msgid "The theme %s has been disabled."
-msgstr ""
+msgstr "Teema %s on keelatud."
#: templates/update.admin.php:21
msgid ""
"Please make sure that the database, the config folder and the data folder "
"have been backed up before proceeding."
-msgstr ""
+msgstr "Enne jätkamist veendu, et andmebaas, seadete ning andmete kataloog on varundatud."
#: templates/update.admin.php:23
msgid "Start update"
-msgstr ""
+msgstr "Käivita uuendus"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 7ddc9303040..503e9ebb21a 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -179,7 +179,7 @@ msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle ülesla
msgid "URL cannot be empty"
msgstr "URL ei saa olla tühi"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} on juba olemas"
@@ -217,55 +217,55 @@ msgid ""
"big."
msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. "
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Ootel"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Viga faili liigutamisel."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Viga faili eemaldamisel"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Viga"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Ei suuda faili ümber nimetada"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Viga faili kustutamisel."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nimi"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Suurus"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Muudetud"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n kataloog"
msgstr[1] "%n kataloogi"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fail"
msgstr[1] "%n faili"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Laadin üles %n faili"
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index 6e2d56a50d5..d930b0ef3c1 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-14 01:54-0400\n"
-"PO-Revision-Date: 2014-06-14 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
+"Last-Translator: Pisike Sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -108,7 +108,7 @@ msgstr "Toimub esmane krüpteerimine... Palun proovi hiljem uuesti."
#: templates/invalid_private_key.php:8
#, php-format
msgid "Go directly to your %spersonal settings%s."
-msgstr ""
+msgstr "Liigi otse oma %s isiklike seadete %s juurde."
#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 328b233b1fd..e8c7ecbd22a 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 07:00+0000\n"
+"Last-Translator: Pisike Sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -49,7 +49,7 @@ msgstr "Korv"
#: appinfo/app.php:60
msgid "Amazon S3 and compliant"
-msgstr ""
+msgstr "Amazon S3 ja ühilduv"
#: appinfo/app.php:63
msgid "Access Key"
@@ -77,7 +77,7 @@ msgstr "SSL-i kasutamine"
#: appinfo/app.php:70
msgid "Enable Path Style"
-msgstr ""
+msgstr "Luba otsingtee stiilis"
#: appinfo/app.php:78
msgid "App key"
@@ -105,7 +105,7 @@ msgstr "Parool"
#: appinfo/app.php:92 appinfo/app.php:134 appinfo/app.php:144
#: appinfo/app.php:155 appinfo/app.php:177
msgid "Root"
-msgstr ""
+msgstr "Juur"
#: appinfo/app.php:93
msgid "Secure ftps://"
@@ -121,7 +121,7 @@ msgstr "Kliendi salasõna"
#: appinfo/app.php:109
msgid "OpenStack Object Storage"
-msgstr ""
+msgstr "OpenStack Object Storage"
#: appinfo/app.php:112
msgid "Username (required)"
@@ -133,31 +133,31 @@ msgstr "Korv (kohustuslik)"
#: appinfo/app.php:114
msgid "Region (optional for OpenStack Object Storage)"
-msgstr ""
+msgstr "Regioon (valikuline OpenStack Object Storage puhul)"
#: appinfo/app.php:115
msgid "API Key (required for Rackspace Cloud Files)"
-msgstr ""
+msgstr "API võti (vajalik Rackspace Cloud Files puhul)"
#: appinfo/app.php:116
msgid "Tenantname (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Rendinimi (tenantname , vajalik OpenStack Object Storage puhul)"
#: appinfo/app.php:117
msgid "Password (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Parool (vajalik OpenStack Object Storage puhul)"
#: appinfo/app.php:118
msgid "Service Name (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Teenuse nimi (vajalik OpenStack Object Storage puhul)"
#: appinfo/app.php:119
msgid "URL of identity endpoint (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Tuvastuse URL lõpp-punkt (vajalik OpenStack Object Storage puhul)"
#: appinfo/app.php:120
msgid "Timeout of HTTP requests in seconds (optional)"
-msgstr ""
+msgstr "HTTP päringu aegumine sekundites (valikuline)"
#: appinfo/app.php:133 appinfo/app.php:143
msgid "Share"
@@ -165,11 +165,11 @@ msgstr "Jaga"
#: appinfo/app.php:138
msgid "SMB / CIFS using OC login"
-msgstr ""
+msgstr "SMB / CIFS kasutades OC logimist"
#: appinfo/app.php:142
msgid "Username as share"
-msgstr ""
+msgstr "Kasutajanimi kui jagamine"
#: appinfo/app.php:152 appinfo/app.php:163
msgid "URL"
@@ -209,9 +209,9 @@ msgstr "Isiklik"
#: js/mountsfilelist.js:36
msgid "System"
-msgstr ""
+msgstr "Süsteem"
-#: js/settings.js:318 js/settings.js:325
+#: js/settings.js:320 js/settings.js:327
msgid "Saved"
msgstr "Salvestatud"
@@ -246,7 +246,7 @@ msgstr "<b>Märkus:</b> \"%s\" pole paigaldatud. Hoidla %s ühendamine pole või
#: templates/list.php:7
msgid "You don't have any external storages"
-msgstr ""
+msgstr "Sul pole ühtegi välist andmehoidlat"
#: templates/list.php:16
msgid "Name"
@@ -254,11 +254,11 @@ msgstr "Nimi"
#: templates/list.php:20
msgid "Storage type"
-msgstr ""
+msgstr "Andmehoidla tüüp"
#: templates/list.php:23
msgid "Scope"
-msgstr ""
+msgstr "Skoop"
#: templates/settings.php:2
msgid "External Storage"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index ef37cd55ac2..269c5d28687 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
@@ -21,47 +21,47 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Serverist serverisse jagamine pole antud serveris lubatud"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Ei suutnud lisada kaugjagamist"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
-msgstr ""
+msgstr "Sinuga jagatud"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
-msgstr ""
+msgstr "Teistega jagatud"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
-msgstr ""
+msgstr "Jagatud lingiga"
#: js/app.js:35
msgid "No files have been shared with you yet."
-msgstr ""
+msgstr "Sinuga pole veel ühtegi faili jagatud."
#: js/app.js:54
msgid "You haven't shared any files yet."
-msgstr ""
+msgstr "Sa pole jaganud veel ühtegi faili."
#: js/app.js:73
msgid "You haven't shared any files by link yet."
-msgstr ""
+msgstr "Sa pole lingiga jaganud veel ühtegi faili."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Lisa {name} kohast {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Ei leitud ownCloud paigaldust asukohas {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Vigane ownCloud url"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -89,7 +89,7 @@ msgstr "Nimi"
#: templates/list.php:20
msgid "Share time"
-msgstr ""
+msgstr "Jagamise aeg"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
@@ -117,15 +117,15 @@ msgstr "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole."
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Salvesta ownCloudi"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "example.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Salvesta"
#: templates/public.php:28
msgid "Download"
@@ -141,13 +141,13 @@ msgid "Direct link"
msgstr "Otsene link"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Luba teistel instantsidel ühendada sellest serverist jagatud avalikke linke"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Luba kasutajatel ühendada jagatud avalikke linke"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 08a6d1f45c6..8b6c800ea0e 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:20+0000\n"
+"Last-Translator: Pisike Sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +60,7 @@ msgstr "Ebaõnnestunud uuendus \"%s\"."
msgid ""
"App \\\"%s\\\" can't be installed because it is not compatible with this "
"version of ownCloud."
-msgstr ""
+msgstr "Rakendit \\\"%s\\\" ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga."
#: private/app.php:1147
msgid "No app name specified"
@@ -309,7 +309,7 @@ msgstr "%s jagamine ebaõnnestus, kuna %s pole grupi %s liige"
msgid ""
"You need to provide a password to create a public link, only protected links"
" are allowed"
-msgstr ""
+msgstr "Avaliku viite tekitamiseks pead sisestama parooli, ainult kaitstud viited on lubatud"
#: private/share/share.php:653
#, php-format
@@ -451,4 +451,4 @@ msgstr "Kasutajanimi on juba kasutuses"
#: public/files/locknotacquiredexception.php:39
#, php-format
msgid "Could not obtain lock type %d on \"%s\"."
-msgstr ""
+msgstr "Ei suutnud hankida %d tüüpi lukustust \"%s\"."
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index ccf2cc23d91..ea9ea3a5df6 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:50+0000\n"
+"Last-Translator: Pisike Sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -49,15 +49,15 @@ msgstr "E-kiri on saadetud"
msgid "You need to set your user email before being able to send test emails."
msgstr "Pead seadistama oma e-postienne kui on võimalik saata test-kirju."
-#: admin/controller.php:116 templates/admin.php:350
+#: admin/controller.php:116 templates/admin.php:337
msgid "Send mode"
msgstr "Saatmise viis"
-#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144
msgid "Encryption"
msgstr "Krüpteerimine"
-#: admin/controller.php:120 templates/admin.php:387
+#: admin/controller.php:120 templates/admin.php:374
msgid "Authentication method"
msgstr "Autentimise meetod"
@@ -102,17 +102,17 @@ msgstr "Ei suutnud failde dekrüpteerida, kontrolli parooli ja proovi uuesti"
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Krüpteerimisvõtmed kustutatud lõplikult"
#: ajax/deletekeys.php:16
msgid ""
"Couldn't permanently delete your encryption keys, please check your "
"owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Ei suutnud lõplikult kustutada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või pöördu oma süsteemihalduri poole."
#: ajax/installapp.php:18 ajax/uninstallapp.php:18
msgid "Couldn't remove app."
-msgstr ""
+msgstr "Ei suutnud rakendit eemaldada."
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -132,13 +132,13 @@ msgstr "Kasutaja kustutamine ebaõnnestus"
#: ajax/restorekeys.php:14
msgid "Backups restored successfully"
-msgstr ""
+msgstr "Varukoopiad taastatud edukalt."
#: ajax/restorekeys.php:23
msgid ""
"Couldn't restore your encryption keys, please check your owncloud.log or ask"
" your administrator"
-msgstr ""
+msgstr "Ei suutnud taastada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või pöördu oma süsteemihalduri poole."
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -195,7 +195,7 @@ msgstr "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuen
msgid "Unable to change password"
msgstr "Ei suuda parooli muuta"
-#: js/admin.js:126
+#: js/admin.js:127
msgid "Sending..."
msgstr "Saadan..."
@@ -213,7 +213,7 @@ msgstr "Uuenda versioonile {appversion}"
#: js/apps.js:90
msgid "Uninstall App"
-msgstr ""
+msgstr "Eemada rakend"
#: js/apps.js:96 js/apps.js:158 js/apps.js:191
msgid "Disable"
@@ -257,15 +257,15 @@ msgstr "Uuendatud"
#: js/apps.js:233
msgid "Uninstalling ...."
-msgstr ""
+msgstr "Eemaldan..."
#: js/apps.js:236
msgid "Error while uninstalling app"
-msgstr ""
+msgstr "Viga rakendi eemaldamisel"
#: js/apps.js:237 templates/apps.php:56
msgid "Uninstall"
-msgstr ""
+msgstr "Eemalda"
#: js/personal.js:256
msgid "Select a profile picture"
@@ -297,33 +297,33 @@ msgstr "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega."
#: js/personal.js:324
msgid "Delete encryption keys permanently."
-msgstr ""
+msgstr "Kustuta krüpteerimisvõtmed lõplikult"
#: js/personal.js:338
msgid "Restore encryption keys."
-msgstr ""
+msgstr "Taasta krüpteerimisvõtmed."
#: js/users/deleteHandler.js:166
msgid "Unable to delete {objName}"
-msgstr ""
+msgstr "Ei suuda kustutada {objName}"
#: js/users/groups.js:73 js/users/groups.js:178
msgid "Error creating group"
-msgstr ""
+msgstr "Viga grupi loomisel"
#: js/users/groups.js:177
msgid "A valid group name must be provided"
-msgstr ""
+msgstr "Sisesta nõuetele vastav grupi nimi"
#: js/users/groups.js:205
msgid "deleted {groupName}"
-msgstr ""
+msgstr "kustutatud {groupName}"
#: js/users/groups.js:206 js/users/users.js:255
msgid "undo"
msgstr "tagasi"
-#: js/users/users.js:37 templates/admin.php:302
+#: js/users/users.js:37 templates/admin.php:292
#: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10
#: templates/users/part.userlist.php:41
msgid "Groups"
@@ -345,7 +345,7 @@ msgstr "mitte kunagi"
#: js/users/users.js:254
msgid "deleted {userName}"
-msgstr ""
+msgstr "kustutatud {userName}"
#: js/users/users.js:371
msgid "add group"
@@ -454,24 +454,24 @@ msgstr "Palun kontrolli uuesti <a href=\"%s\">paigaldusjuhendeid</a>."
msgid ""
"PHP is apparently setup to strip inline doc blocks. This will make several "
"core apps inaccessible."
-msgstr ""
+msgstr "PHP on seadistatud eemaldama \"inline\" dokumendi blokke. See muudab mõned rakendid kasutamatuteks."
#: templates/admin.php:94
msgid ""
"This is probably caused by a cache/accelerator such as Zend OPcache or "
"eAccelerator."
-msgstr ""
+msgstr "See on tõenäoliselt põhjustatud puhver/kiirendist nagu Zend OPcache või eAccelerator."
#: templates/admin.php:105
msgid "Database Performance Info"
-msgstr ""
+msgstr "Andmebaasi toimimise info"
#: templates/admin.php:108
msgid ""
"SQLite is used as database. For larger installations we recommend to change "
"this. To migrate to another database use the command line tool: 'occ db"
":convert-type'"
-msgstr ""
+msgstr "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta. Migreerimaks teisele andmebaasile kasuta seda käsurea vahendit: 'occ db:convert-type'"
#: templates/admin.php:119
msgid "Module 'fileinfo' missing"
@@ -566,25 +566,25 @@ msgstr "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti
msgid "Sharing"
msgstr "Jagamine"
-#: templates/admin.php:240
+#: templates/admin.php:238
msgid "Allow apps to use the Share API"
msgstr "Luba rakendustel kasutada Share API-t"
-#: templates/admin.php:247
+#: templates/admin.php:243
msgid "Allow users to share via link"
-msgstr ""
+msgstr "Luba kasutajatel lingiga jagamist "
-#: templates/admin.php:251
+#: templates/admin.php:249
msgid "Enforce password protection"
-msgstr ""
+msgstr "Sunni parooliga kaitsmist"
-#: templates/admin.php:254
+#: templates/admin.php:252
msgid "Allow public uploads"
msgstr "Luba avalikud üleslaadimised"
-#: templates/admin.php:258
+#: templates/admin.php:256
msgid "Set default expiration date"
-msgstr ""
+msgstr "Määra vaikimisi aegumise kuupäev"
#: templates/admin.php:260
msgid "Expire after "
@@ -596,118 +596,118 @@ msgstr "päeva"
#: templates/admin.php:266
msgid "Enforce expiration date"
-msgstr ""
+msgstr "Sunnitud aegumise kuupäev"
-#: templates/admin.php:276
+#: templates/admin.php:271
msgid "Allow resharing"
msgstr "Luba edasijagamine"
-#: templates/admin.php:283
+#: templates/admin.php:276
msgid "Restrict users to only share with users in their groups"
-msgstr ""
+msgstr "Luba kasutajatel jagada kasutajatega ainult oma grupi piires"
-#: templates/admin.php:290
+#: templates/admin.php:281
msgid "Allow users to send mail notification for shared files"
msgstr "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta"
-#: templates/admin.php:297
+#: templates/admin.php:286
msgid "Exclude groups from sharing"
-msgstr ""
+msgstr "Eemalda grupid jagamisest"
-#: templates/admin.php:308
+#: templates/admin.php:298
msgid ""
"These groups will still be able to receive shares, but not to initiate them."
-msgstr ""
+msgstr "Need grupid saavad vastu võtta jagamisi, kuid ise jagamisi algatada ei saa."
-#: templates/admin.php:316
+#: templates/admin.php:303
msgid "Security"
msgstr "Turvalisus"
-#: templates/admin.php:327
+#: templates/admin.php:314
msgid "Enforce HTTPS"
msgstr "Sunni peale HTTPS-i kasutamine"
-#: templates/admin.php:329
+#: templates/admin.php:316
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Sunnib kliente %s ühenduma krüpteeritult."
-#: templates/admin.php:335
+#: templates/admin.php:322
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine."
-#: templates/admin.php:345
+#: templates/admin.php:332
msgid "Email Server"
msgstr "Postiserver"
-#: templates/admin.php:347
+#: templates/admin.php:334
msgid "This is used for sending out notifications."
msgstr "Seda kasutatakse teadete välja saatmiseks."
-#: templates/admin.php:378
+#: templates/admin.php:365
msgid "From address"
msgstr "Saatja aadress"
-#: templates/admin.php:379
+#: templates/admin.php:366
msgid "mail"
-msgstr ""
+msgstr "e-mail"
-#: templates/admin.php:400
+#: templates/admin.php:387
msgid "Authentication required"
msgstr "Autentimine on vajalik"
-#: templates/admin.php:404
+#: templates/admin.php:391
msgid "Server address"
msgstr "Serveri aadress"
-#: templates/admin.php:408
+#: templates/admin.php:395
msgid "Port"
msgstr "Port"
-#: templates/admin.php:413
+#: templates/admin.php:400
msgid "Credentials"
msgstr "Kasutajatunnused"
-#: templates/admin.php:414
+#: templates/admin.php:401
msgid "SMTP Username"
msgstr "SMTP kasutajatunnus"
-#: templates/admin.php:417
+#: templates/admin.php:404
msgid "SMTP Password"
msgstr "SMTP parool"
-#: templates/admin.php:421
+#: templates/admin.php:408
msgid "Test email settings"
msgstr "Testi e-posti seadeid"
-#: templates/admin.php:422
+#: templates/admin.php:409
msgid "Send email"
msgstr "Saada kiri"
-#: templates/admin.php:427
+#: templates/admin.php:414
msgid "Log"
msgstr "Logi"
-#: templates/admin.php:428
+#: templates/admin.php:415
msgid "Log level"
msgstr "Logi tase"
-#: templates/admin.php:460
+#: templates/admin.php:447
msgid "More"
msgstr "Rohkem"
-#: templates/admin.php:461
+#: templates/admin.php:448
msgid "Less"
msgstr "Vähem"
-#: templates/admin.php:467 templates/personal.php:196
+#: templates/admin.php:454 templates/personal.php:196
msgid "Version"
msgstr "Versioon"
-#: templates/admin.php:471 templates/personal.php:199
+#: templates/admin.php:458 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -747,7 +747,7 @@ msgstr "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></
#: templates/apps.php:59
msgid "Enable only for specific groups"
-msgstr ""
+msgstr "Luba ainult kindlad grupid"
#: templates/apps.php:61
msgid "All"
@@ -886,15 +886,15 @@ msgid ""
"Your encryption keys are moved to a backup location. If something went wrong"
" you can restore the keys. Only delete them permanently if you are sure that"
" all files are decrypted correctly."
-msgstr ""
+msgstr "Sinu krüpteerimisvõtmed on tõstetud varukoopiasse. Kui midagi läheb valesti, siis saad võtmed taastada. Kustuta lõplikult ainult juhul kui oled kindel, et failid on dekrüteeritud korrektselt."
#: templates/personal.php:178
msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Taasta krüpteerimisvõtmed"
#: templates/personal.php:182
msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Kustuta krüpteerimisvõtmed"
#: templates/users/part.createuser.php:4
msgid "Login Name"
@@ -917,11 +917,11 @@ msgstr "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käig
#: templates/users/part.createuser.php:32
msgid "Search Users and Groups"
-msgstr ""
+msgstr "Otsi kasutajaid ja gruppe"
#: templates/users/part.grouplist.php:5
msgid "Add Group"
-msgstr ""
+msgstr "Lisa grupp"
#: templates/users/part.grouplist.php:10
msgid "Group"
@@ -929,11 +929,11 @@ msgstr "Grupp"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
-msgstr ""
+msgstr "Igaüks"
#: templates/users/part.grouplist.php:29
msgid "Admins"
-msgstr ""
+msgstr "Haldurid"
#: templates/users/part.setquota.php:7
msgid "Default Quota"
@@ -961,11 +961,11 @@ msgstr "Mahupiir"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
-msgstr ""
+msgstr "Mahu asukoht"
#: templates/users/part.userlist.php:16
msgid "Last Login"
-msgstr ""
+msgstr "Viimane sisselogimine"
#: templates/users/part.userlist.php:30
msgid "change full name"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 4ebc823848d..9d8eca9172d 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 08:10+0000\n"
+"Last-Translator: Pisike Sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -74,7 +74,7 @@ msgstr "Säilitada seadistused?"
#: js/settings.js:93
msgid "{nthServer}. Server"
-msgstr ""
+msgstr "{nthServer}. Server"
#: js/settings.js:99
msgid "Cannot add server configuration"
@@ -476,14 +476,14 @@ msgstr "Sisse lülitamisel on toetatakse gruppe sisaldavad gruppe. (Toimib, kui
#: templates/settings.php:40
msgid "Paging chunksize"
-msgstr ""
+msgstr "Kutsungi pataka suurus"
#: templates/settings.php:40
msgid ""
"Chunksize used for paged LDAP searches that may return bulky results like "
"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
"those situations.)"
-msgstr ""
+msgstr "Pataka suurust kasutatakse LDAPi kutsungite kaupa otsingute puhul, mis võivad väljastada pikki kasutajate või gruppide loetelusid. (Määrates suuruseks 0, keelatakse LDAP patakate kaupa otsing taolistes situatsioonides)"
#: templates/settings.php:42
msgid "Special Attributes"
diff --git a/l10n/et_EE/user_webdavauth.po b/l10n/et_EE/user_webdavauth.po
index bbb7590ce51..6bb7c38cc2a 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/user_webdavauth.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013
+# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
# Rivo Zängov <eraser@eraser.ee>, 2012-2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:20+0000\n"
+"Last-Translator: Pisike Sipelgas <pisike.sipelgas@gmail.com>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +25,7 @@ msgstr "WebDAV autentimine"
#: templates/settings.php:3
msgid "Address:"
-msgstr ""
+msgstr "Aadress:"
#: templates/settings.php:5
msgid "Save"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index a6934df52e6..74ff0ec9775 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -250,75 +250,75 @@ msgstr "Berrezarri pasahitza"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Bai"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Ez"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Aukeratu"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ados"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Errorea mezu txantiloia kargatzean: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "fitxategi {count}ek konfliktua sortu du"
msgstr[1] "{count} fitxategik konfliktua sortu dute"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Fitxategi batek konfliktua sortu du"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Fitxategi Berriak"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Dagoeneko existitzen diren fitxategiak"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Ze fitxategi mantendu nahi duzu?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Bi bertsioak hautatzen badituzu, kopiatutako fitxategiaren izenean zenbaki bat atxikituko zaio."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Ezeztatu"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Jarraitu"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(denak hautatuta)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} hautatuta)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Errorea fitxategia existitzen da txantiloiak kargatzerakoan"
@@ -457,29 +457,29 @@ msgid "notify by email"
msgstr "jakinarazi eposta bidez"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "editatu dezake"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "sarrera kontrola"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "sortu"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "eguneratu"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "ezabatu"
-#: js/share.js:587
-msgid "share"
-msgstr "elkarbanatu"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Pasahitzarekin babestuta"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 8d523ca9cfc..90db0647af7 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Mikel Olasagasti Uranga <mikel@olasagasti.info>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -180,7 +180,7 @@ msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.
msgid "URL cannot be empty"
msgstr "URLa ezin da hutsik egon"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} dagoeneko existitzen da"
@@ -218,55 +218,55 @@ msgid ""
"big."
msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. "
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Zain"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Errorea fitxategia mugitzean."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Errorea fitxategia mugitzean"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Errorea"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Ezin izan da fitxategia berrizendatu"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Errorea fitxategia ezabatzerakoan."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Izena"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Tamaina"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Aldatuta"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "karpeta %n"
msgstr[1] "%n karpeta"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "fitxategi %n"
msgstr[1] "%n fitxategi"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Fitxategi %n igotzen"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 9f9b5f8339c..1ee17508c4e 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -50,7 +50,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -124,7 +124,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Gorde"
#: templates/public.php:28
msgid "Download"
@@ -140,7 +140,7 @@ msgid "Direct link"
msgstr "Lotura zuzena"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index a9ae097df5e..c0cd7118d42 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu/user_webdavauth.po b/l10n/eu/user_webdavauth.po
index 543595c9e75..3fbc6ffc1d5 100644
--- a/l10n/eu/user_webdavauth.po
+++ b/l10n/eu/user_webdavauth.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 12:00+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Alexander Gabilondo <alexgabi@openmailbox.org>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index ad95c6ea8d6..d727414c460 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Ezeztatu"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index da49e6c4d53..e7dbe139876 100644
--- a/l10n/eu_ES/files.po
+++ b/l10n/eu_ES/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:13+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr ""
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr ""
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr ""
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po
index e68f26ec64a..11a5c9526cb 100644
--- a/l10n/eu_ES/files_sharing.po
+++ b/l10n/eu_ES/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Gorde"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/eu_ES/user_ldap.po b/l10n/eu_ES/user_ldap.po
index 173b8b95f98..418a29f3dcf 100644
--- a/l10n/eu_ES/user_ldap.po
+++ b/l10n/eu_ES/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:13+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eu_ES/user_webdavauth.po b/l10n/eu_ES/user_webdavauth.po
index b587aa589ea..8dcc9edfc25 100644
--- a/l10n/eu_ES/user_webdavauth.po
+++ b/l10n/eu_ES/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 41809802488..48aebdcdf8d 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -244,74 +244,74 @@ msgstr "دوباره سازی گذرواژه"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "بله"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "نه"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "انتخاب کردن"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "قبول"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "فایل های جدید"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "منصرف شدن"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "ادامه"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -450,29 +450,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "می توان ویرایش کرد"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "کنترل دسترسی"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "ایجاد"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "به روز"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "پاک کردن"
-#: js/share.js:587
-msgid "share"
-msgstr "به اشتراک گذاشتن"
-
#: js/share.js:917
msgid "Password protected"
msgstr "نگهداری از رمز عبور"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 59cbad680f4..dfa3a4d7fdc 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -179,7 +179,7 @@ msgstr "آپلودکردن پرونده در حال پیشرفت است. در ص
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{نام _جدید} در حال حاضر وجود دارد."
@@ -217,53 +217,53 @@ msgid ""
"big."
msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "در انتظار"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "خطا"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "نام"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "اندازه"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "تاریخ"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "در حال بارگذاری %n فایل"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 257fdadc238..e7b8489a5d7 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -51,7 +51,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "ذخیره"
#: templates/public.php:28
msgid "Download"
@@ -141,7 +141,7 @@ msgid "Direct link"
msgstr "پیوند مستقیم"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 6a9e64a5daa..23f170846c8 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fa/user_webdavauth.po b/l10n/fa/user_webdavauth.po
index 76d46529083..1159820736b 100644
--- a/l10n/fa/user_webdavauth.po
+++ b/l10n/fa/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index bbccec19ca5..76b2a4ad4c8 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-16 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 09:00+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -249,75 +249,75 @@ msgstr "Palauta salasana"
msgid "Password can not be changed. Please contact your administrator."
msgstr "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Kyllä"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Ei"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Valitse"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Virhe ladatessa tiedostopohjia: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Virhe ladatessa viestipohjaa: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} tiedoston ristiriita"
msgstr[1] "{count} tiedoston ristiriita"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Yhden tiedoston ristiriita"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Uudet tiedostot"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Jo olemassa olevat tiedostot"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Mitkä tiedostot haluat säilyttää?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jos valitset kummatkin versiot, kopioidun tiedoston nimeen lisätään numero."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Peru"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Jatka"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(kaikki valittu)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} valittu)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Virhe ladatessa mallipohjaa"
@@ -456,29 +456,29 @@ msgid "notify by email"
msgstr "ilmoita sähköpostitse"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "voi muokata"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "Pääsyn hallinta"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "luo"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "päivitä"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "poista"
-#: js/share.js:587
-msgid "share"
-msgstr "jaa"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Salasanasuojattu"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 20dac8415e2..ba9338e2af5 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedos
msgid "URL cannot be empty"
msgstr "Osoite ei voi olla tyhjä"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} on jo olemassa"
@@ -219,55 +219,55 @@ msgid ""
"big."
msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Odottaa"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Virhe tiedostoa siirrettäessä."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Virhe tiedostoa siirrettäessä"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Virhe"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Tiedoston nimeäminen uudelleen epäonnistui"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Virhe tiedostoa poistaessa."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nimi"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Koko"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Muokattu"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n kansio"
msgstr[1] "%n kansiota"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n tiedosto"
msgstr[1] "%n tiedostoa"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Lähetetään %n tiedosto"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index ff415e01b40..573a02fb60f 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
@@ -20,21 +20,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Palvelimelta-palvelimelle-jakaminen ei ole käytössä tällä palvelimella"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Etäjaon liittäminen epäonnistui"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Jaettu kanssasi"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Jaettu muiden kanssa"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Jaettu linkin kautta"
@@ -50,17 +50,17 @@ msgstr "Et ole jakanut yhtäkään tiedostoa vielä."
msgid "You haven't shared any files by link yet."
msgstr "Et ole vielä jakanut yhtäkään tiedostoa linkin kautta."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Lisää {name} käyttäjältä {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "ownCloud-asennusta ei löytynyt kohteesta {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Virheellinen ownCloud-osoite"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -116,15 +116,15 @@ msgstr "Kysy lisätietoja henkilöltä, jolta sait linkin."
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Tallenna ownCloudiin"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "verkkotunnus.fi/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Tallenna"
#: templates/public.php:28
msgid "Download"
@@ -140,13 +140,13 @@ msgid "Direct link"
msgstr "Suora linkki"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Salli muiden instanssien liittää tältä palvelimelta jaettuja julkisia linkkejä"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Salli käyttäjien liittää julkisia linkkijakoja"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 2a6481a54a2..4479f940777 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/user_webdavauth.po b/l10n/fi_FI/user_webdavauth.po
index 123c1cc601d..fc3955e3c16 100644
--- a/l10n/fi_FI/user_webdavauth.po
+++ b/l10n/fi_FI/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 3d5029e06db..c47ef8e7743 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -172,7 +172,7 @@ msgstr "Image"
#: js/js.js:593
msgid "Audio"
-msgstr ""
+msgstr "Audio"
#: js/js.js:607
msgid "Saving..."
@@ -228,14 +228,14 @@ msgstr "il y a plusieurs années"
#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175
msgid "Couldn't send reset email. Please contact your administrator."
-msgstr ""
+msgstr "Impossible d'envoyer l’émail de réinitialisation. Veuillez contacter votre administrateur."
#: js/lostpassword.js:5
msgid ""
"The link to reset your password has been sent to your email. If you do not "
"receive it within a reasonable amount of time, check your spam/junk "
"folders.<br>If it is not there ask your local administrator."
-msgstr ""
+msgstr "Le lien permettant de réinitialiser votre mot de passe vous a été transmis à votre adresse email.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local."
#: js/lostpassword.js:7
msgid ""
@@ -243,11 +243,11 @@ msgid ""
"will be no way to get your data back after your password is reset.<br />If "
"you are not sure what to do, please contact your administrator before you "
"continue. <br />Do you really want to continue?"
-msgstr ""
+msgstr "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura plus aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. Voulez-vous vraiment continuer ?"
#: js/lostpassword.js:10
msgid "I know what I'm doing"
-msgstr ""
+msgstr "Je sais ce que je fais"
#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9
msgid "Reset password"
@@ -255,77 +255,77 @@ msgstr "Réinitialiser le mot de passe"
#: js/lostpassword.js:16
msgid "Password can not be changed. Please contact your administrator."
-msgstr ""
+msgstr "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Oui"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Choisir"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Erreur de chargement du modèle de sélectionneur de fichiers : {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Erreur de chargement du modèle de message : {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} fichier en conflit"
msgstr[1] "{count} fichiers en conflit"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Un conflit de fichier"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Nouveaux fichiers"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Fichiers déjà existants"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Quels fichiers désirez-vous garder ?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Annuler"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Poursuivre"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(tous sélectionnés)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} sélectionnés)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Erreur de chargement du modèle de fichier existant"
@@ -464,29 +464,29 @@ msgid "notify by email"
msgstr "Notifier par email"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "édition autorisée"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "contrôle des accès"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "créer"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "mettre à jour"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "supprimer"
-#: js/share.js:587
-msgid "share"
-msgstr "partager"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Protégé par un mot de passe"
@@ -557,17 +557,17 @@ msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud
#: lostpassword/controller/lostcontroller.php:110
msgid "Couldn't reset password because the token is invalid"
-msgstr ""
+msgstr "Impossible de réinitialiser le mot de passe car le jeton est invalide."
#: lostpassword/controller/lostcontroller.php:136
msgid "Couldn't send reset email. Please make sure your username is correct."
-msgstr ""
+msgstr "Impossible d'envoyer l’émail de réinitialisation. Veuillez vérifier que votre nom d'utilisateur est correct."
#: lostpassword/controller/lostcontroller.php:151
msgid ""
"Couldn't send reset email because there is no email address for this "
"username. Please contact your administrator."
-msgstr ""
+msgstr "Impossible d'envoyer l'email de réinitialisation car il n'y a aucune adresse email pour cet utilisateur. Veuillez contacter votre administrateur."
#: lostpassword/controller/lostcontroller.php:168
#, php-format
@@ -610,7 +610,7 @@ msgstr "Nouveau mot de passe"
#: lostpassword/templates/resetpassword.php:6
msgid "New Password"
-msgstr ""
+msgstr "Nouveau mot de passe"
#: setup/controller.php:140
#, php-format
@@ -838,7 +838,7 @@ msgstr "Veuillez contacter votre administrateur."
#: templates/login.php:50
msgid "Forgot your password? Reset it!"
-msgstr ""
+msgstr "Mot de passe perdu ? Réinitialisez-le !"
#: templates/login.php:55
msgid "remember"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index f4fe9d2e407..b1e5276ee0f 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -184,7 +184,7 @@ msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera
msgid "URL cannot be empty"
msgstr "L'URL ne peut pas être vide"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} existe déjà"
@@ -222,55 +222,55 @@ msgid ""
"big."
msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "En attente"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Erreur lors du déplacement du fichier."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Erreur lors du déplacement du fichier"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Erreur"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Impossible de renommer le fichier"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Erreur pendant la suppression du fichier."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nom"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Taille"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Modifié"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n dossier"
msgstr[1] "%n dossiers"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fichier"
msgstr[1] "%n fichiers"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Téléversement de %n fichier"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index 68c87691d2c..428d027e5e3 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-14 01:54-0400\n"
-"PO-Revision-Date: 2014-06-14 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-24 01:54-0400\n"
+"PO-Revision-Date: 2014-06-23 13:42+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\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"
@@ -112,7 +112,7 @@ msgstr "Chiffrement initial en cours... Veuillez re-essayer ultérieurement."
#: templates/invalid_private_key.php:8
#, php-format
msgid "Go directly to your %spersonal settings%s."
-msgstr ""
+msgstr "Allerz directement à vos %spersonal settings%s."
#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 50760206324..092ff58bf5a 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-24 01:54-0400\n"
+"PO-Revision-Date: 2014-06-23 13:42+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\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"
@@ -214,9 +214,9 @@ msgstr "Personnel"
#: js/mountsfilelist.js:36
msgid "System"
-msgstr ""
+msgstr "Système"
-#: js/settings.js:318 js/settings.js:325
+#: js/settings.js:320 js/settings.js:327
msgid "Saved"
msgstr "Sauvegarder"
@@ -251,7 +251,7 @@ msgstr "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est p
#: templates/list.php:7
msgid "You don't have any external storages"
-msgstr ""
+msgstr "Vous n'avez pas de support de stockage externe"
#: templates/list.php:16
msgid "Name"
@@ -259,11 +259,11 @@ msgstr "Nom"
#: templates/list.php:20
msgid "Storage type"
-msgstr ""
+msgstr "Type de support de stockage"
#: templates/list.php:23
msgid "Scope"
-msgstr ""
+msgstr "Portée"
#: templates/settings.php:2
msgid "External Storage"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index c39fec78c69..97104a520fa 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -25,21 +25,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Le partage de serveur à serveur n'est pas activé sur ce serveur"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Impossible d'ajouter un partage distant"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Partagé avec vous"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Partagé avec d'autres"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Partagé par lien"
@@ -55,17 +55,17 @@ msgstr "Vous ne partagez pas de fichier pour l'instant"
msgid "You haven't shared any files by link yet."
msgstr "Vous ne partagez aucun de fichier par lien pour l'instant."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Ajouter {name} de {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Aucune installation ownCloud n'a été trouvée sur {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "URL ownCloud invalide"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -121,15 +121,15 @@ msgstr "Pour plus d'informations, veuillez contacter la personne qui a envoyé c
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Enregistrer dans ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "example.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Sauvegarder"
#: templates/public.php:28
msgid "Download"
@@ -145,13 +145,13 @@ msgid "Direct link"
msgstr "Lien direct"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Autorise d'autres instances à monter des liens publiques partagés depuis ce serveur"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Autorise les utilisateurs à monter des liens de partages publiques"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index e2a20e60fd4..0af543dd4a6 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-24 01:54-0400\n"
+"PO-Revision-Date: 2014-06-23 13:32+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\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"
@@ -24,50 +24,50 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: base.php:678
+#: base.php:673
msgid "You are accessing the server from an untrusted domain."
msgstr "Vous accédez au serveur à partir d'un domaine non-approuvé."
-#: base.php:679
+#: base.php:674
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
"example configuration is provided in config/config.sample.php."
msgstr "Veuillez contacter votre administrateur. Si vous être l'administrateur de cette instance, il faut configurer la variable \"trusted_domain\" dans le fichier config/config.php. Un exemple de configuration est fournit dans le fichier config/config.sample.php."
-#: private/app.php:361
+#: private/app.php:366
msgid "Help"
msgstr "Aide"
-#: private/app.php:374
+#: private/app.php:379
msgid "Personal"
msgstr "Personnel"
-#: private/app.php:385
+#: private/app.php:390
msgid "Settings"
msgstr "Paramètres"
-#: private/app.php:397
+#: private/app.php:402
msgid "Users"
msgstr "Utilisateurs"
-#: private/app.php:410
+#: private/app.php:415
msgid "Admin"
msgstr "Administration"
-#: private/app.php:978
+#: private/app.php:983
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Echec de la mise à niveau \"%s\"."
-#: private/app.php:1135
+#: private/app.php:1140
#, php-format
msgid ""
"App \\\"%s\\\" can't be installed because it is not compatible with this "
"version of ownCloud."
-msgstr ""
+msgstr "L'application \\\"%s\\\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud."
-#: private/app.php:1147
+#: private/app.php:1152
msgid "No app name specified"
msgstr "Aucun nom d'application spécifié"
@@ -92,48 +92,48 @@ msgstr "Le dossier de l'application existe déjà"
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s"
-#: private/installer.php:231
+#: private/installer.php:235
msgid "No source specified when installing app"
msgstr "Aucune source spécifiée pour installer l'application"
-#: private/installer.php:238
+#: private/installer.php:242
msgid "No href specified when installing app from http"
msgstr "Aucun href spécifié pour installer l'application par http"
-#: private/installer.php:243
+#: private/installer.php:247
msgid "No path specified when installing app from local file"
msgstr "Aucun chemin spécifié pour installer l'application depuis un fichier local"
-#: private/installer.php:257
+#: private/installer.php:261
#, php-format
msgid "Archives of type %s are not supported"
msgstr "Les archives de type %s ne sont pas supportées"
-#: private/installer.php:271
+#: private/installer.php:275
msgid "Failed to open archive when installing app"
msgstr "Échec de l'ouverture de l'archive lors de l'installation de l'application"
-#: private/installer.php:309
+#: private/installer.php:313
msgid "App does not provide an info.xml file"
msgstr "L'application ne fournit pas de fichier info.xml"
-#: private/installer.php:315
+#: private/installer.php:319
msgid "App can't be installed because of not allowed code in the App"
msgstr "L'application ne peut être installée car elle contient du code non-autorisé"
-#: private/installer.php:321
+#: private/installer.php:325
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud"
-#: private/installer.php:327
+#: private/installer.php:331
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "L'application ne peut être installée car elle contient la balise <shipped>true</shipped> qui n'est pas autorisée pour les applications non-diffusées"
-#: private/installer.php:340
+#: private/installer.php:344
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
@@ -251,13 +251,13 @@ msgstr "Spécifiez un nom d'utilisateur pour l'administrateur."
msgid "Set an admin password."
msgstr "Spécifiez un mot de passe administrateur."
-#: private/setup.php:164
+#: private/setup.php:170
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut."
-#: private/setup.php:165
+#: private/setup.php:171
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Veuillez vous référer au <a href='%s'>guide d'installation</a>."
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 8b7c8a4408c..400fddbe4c8 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -22,9 +22,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-24 01:54-0400\n"
+"PO-Revision-Date: 2014-06-23 13:32+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\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"
@@ -62,15 +62,15 @@ msgstr "Email envoyé"
msgid "You need to set your user email before being able to send test emails."
msgstr "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test."
-#: admin/controller.php:116 templates/admin.php:350
+#: admin/controller.php:116 templates/admin.php:337
msgid "Send mode"
msgstr "Mode d'envoi"
-#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144
msgid "Encryption"
msgstr "Chiffrement"
-#: admin/controller.php:120 templates/admin.php:387
+#: admin/controller.php:120 templates/admin.php:374
msgid "Authentication method"
msgstr "Méthode d'authentification"
@@ -125,7 +125,7 @@ msgstr "Impossible de supprimer définitivement vos clés de chiffrement, merci
#: ajax/installapp.php:18 ajax/uninstallapp.php:18
msgid "Couldn't remove app."
-msgstr ""
+msgstr "Impossible de supprimer l'application."
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -208,7 +208,7 @@ msgstr "L'infrastructure d'arrière-plan ne supporte pas la modification de mot
msgid "Unable to change password"
msgstr "Impossible de modifier le mot de passe"
-#: js/admin.js:126
+#: js/admin.js:127
msgid "Sending..."
msgstr "Envoi en cours..."
@@ -226,7 +226,7 @@ msgstr "Mettre à jour vers {appversion}"
#: js/apps.js:90
msgid "Uninstall App"
-msgstr ""
+msgstr "Désinstaller l'application"
#: js/apps.js:96 js/apps.js:158 js/apps.js:191
msgid "Disable"
@@ -270,15 +270,15 @@ msgstr "Mise à jour effectuée avec succès"
#: js/apps.js:233
msgid "Uninstalling ...."
-msgstr ""
+msgstr "Désintallation..."
#: js/apps.js:236
msgid "Error while uninstalling app"
-msgstr ""
+msgstr "Erreur lors de la désinstallation de l'application"
#: js/apps.js:237 templates/apps.php:56
msgid "Uninstall"
-msgstr ""
+msgstr "Désinstaller"
#: js/personal.js:256
msgid "Select a profile picture"
@@ -318,7 +318,7 @@ msgstr "Restaurer les clés de chiffrement"
#: js/users/deleteHandler.js:166
msgid "Unable to delete {objName}"
-msgstr ""
+msgstr "Impossible de supprimer {objName}"
#: js/users/groups.js:73 js/users/groups.js:178
msgid "Error creating group"
@@ -330,13 +330,13 @@ msgstr "Vous devez spécifier un nom de groupe valide"
#: js/users/groups.js:205
msgid "deleted {groupName}"
-msgstr ""
+msgstr "{groupName} supprimé"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "annuler"
-#: js/users/users.js:37 templates/admin.php:302
+#: js/users/users.js:37 templates/admin.php:292
#: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10
#: templates/users/part.userlist.php:41
msgid "Groups"
@@ -352,31 +352,31 @@ msgstr "Admin Groupe"
msgid "Delete"
msgstr "Supprimer"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "jamais"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
-msgstr ""
+msgstr "{userName} supprimé"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "ajouter un groupe"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Un nom d'utilisateur valide doit être saisi"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Erreur lors de la création de l'utilisateur"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Un mot de passe valide doit être saisi"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà"
@@ -579,23 +579,23 @@ msgstr "Utilise le service cron du système pour appeler le fichier cron.php tou
msgid "Sharing"
msgstr "Partage"
-#: templates/admin.php:240
+#: templates/admin.php:238
msgid "Allow apps to use the Share API"
msgstr "Autoriser les applications à utiliser l'API de partage"
-#: templates/admin.php:247
+#: templates/admin.php:243
msgid "Allow users to share via link"
msgstr "Autoriser les utilisateurs à partager via des liens"
-#: templates/admin.php:251
+#: templates/admin.php:249
msgid "Enforce password protection"
msgstr "Appliquer la protection par mot de passe"
-#: templates/admin.php:254
+#: templates/admin.php:252
msgid "Allow public uploads"
msgstr "Autoriser les téléversements publics"
-#: templates/admin.php:258
+#: templates/admin.php:256
msgid "Set default expiration date"
msgstr "Spécifier la date d'expiration par défaut"
@@ -611,116 +611,116 @@ msgstr "jours"
msgid "Enforce expiration date"
msgstr "Impose la date d'expiration"
-#: templates/admin.php:276
+#: templates/admin.php:271
msgid "Allow resharing"
msgstr "Autoriser le repartage"
-#: templates/admin.php:283
+#: templates/admin.php:276
msgid "Restrict users to only share with users in their groups"
msgstr "Autoriser les utilisateurs à ne partager qu'avec les utilisateurs de leurs groupes"
-#: templates/admin.php:290
+#: templates/admin.php:281
msgid "Allow users to send mail notification for shared files"
msgstr "Autoriser les utilisateurs à envoyer une notification par courriel concernant les fichiers partagés"
-#: templates/admin.php:297
+#: templates/admin.php:286
msgid "Exclude groups from sharing"
msgstr "Exclure les groupes du partage"
-#: templates/admin.php:308
+#: templates/admin.php:298
msgid ""
"These groups will still be able to receive shares, but not to initiate them."
msgstr "Ces groupes restent autorisés à partager, mais ne peuvent pas les initier"
-#: templates/admin.php:316
+#: templates/admin.php:303
msgid "Security"
msgstr "Sécurité"
-#: templates/admin.php:327
+#: templates/admin.php:314
msgid "Enforce HTTPS"
msgstr "Forcer HTTPS"
-#: templates/admin.php:329
+#: templates/admin.php:316
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forcer les clients à se connecter à %s via une connexion chiffrée."
-#: templates/admin.php:335
+#: templates/admin.php:322
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL."
-#: templates/admin.php:345
+#: templates/admin.php:332
msgid "Email Server"
msgstr "Serveur mail"
-#: templates/admin.php:347
+#: templates/admin.php:334
msgid "This is used for sending out notifications."
msgstr "Ceci est utilisé pour l'envoi des notifications."
-#: templates/admin.php:378
+#: templates/admin.php:365
msgid "From address"
msgstr "Adresse source"
-#: templates/admin.php:379
+#: templates/admin.php:366
msgid "mail"
msgstr "courriel"
-#: templates/admin.php:400
+#: templates/admin.php:387
msgid "Authentication required"
msgstr "Authentification requise"
-#: templates/admin.php:404
+#: templates/admin.php:391
msgid "Server address"
msgstr "Adresse du serveur"
-#: templates/admin.php:408
+#: templates/admin.php:395
msgid "Port"
msgstr "Port"
-#: templates/admin.php:413
+#: templates/admin.php:400
msgid "Credentials"
msgstr "Informations d'identification"
-#: templates/admin.php:414
+#: templates/admin.php:401
msgid "SMTP Username"
msgstr "Nom d'utilisateur SMTP"
-#: templates/admin.php:417
+#: templates/admin.php:404
msgid "SMTP Password"
msgstr "Mot de passe SMTP"
-#: templates/admin.php:421
+#: templates/admin.php:408
msgid "Test email settings"
msgstr "Paramètres de test d'e-mail"
-#: templates/admin.php:422
+#: templates/admin.php:409
msgid "Send email"
msgstr "Envoyer un e-mail"
-#: templates/admin.php:427
+#: templates/admin.php:414
msgid "Log"
msgstr "Log"
-#: templates/admin.php:428
+#: templates/admin.php:415
msgid "Log level"
msgstr "Niveau de log"
-#: templates/admin.php:460
+#: templates/admin.php:447
msgid "More"
msgstr "Plus"
-#: templates/admin.php:461
+#: templates/admin.php:448
msgid "Less"
msgstr "Moins"
-#: templates/admin.php:467 templates/personal.php:196
+#: templates/admin.php:454 templates/personal.php:196
msgid "Version"
msgstr "Version"
-#: templates/admin.php:471 templates/personal.php:199
+#: templates/admin.php:458 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 5c2b41490cf..29b92cf0f1e 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: themen <themen2004@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po
index 601ed425b8e..8c1c7e3fbbd 100644
--- a/l10n/fr/user_webdavauth.po
+++ b/l10n/fr/user_webdavauth.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 16:51+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: themen <themen2004@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr_CA/core.po b/l10n/fr_CA/core.po
index 56335144f04..8d38800b23a 100644
--- a/l10n/fr_CA/core.po
+++ b/l10n/fr_CA/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/fr_CA/files_sharing.po b/l10n/fr_CA/files_sharing.po
index dddb67a4168..fb8e3464d8d 100644
--- a/l10n/fr_CA/files_sharing.po
+++ b/l10n/fr_CA/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 9314ceac9c0..7c3296820fd 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-16 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 17:10+0000\n"
-"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -248,75 +248,75 @@ msgstr "Restabelecer o contrasinal"
msgid "Password can not be changed. Please contact your administrator."
msgstr "Non é posíbel cambiar o contrasinal. Póñase en contacto co administrador."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Si"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Escoller"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Produciuse un erro ao cargar o modelo do selector: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Aceptar"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Produciuse un erro ao cargar o modelo da mensaxe: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflito de ficheiro"
msgstr[1] "{count} conflitos de ficheiros"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Un conflito de ficheiro"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Ficheiros novos"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Ficheiros xa existentes"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Que ficheiros quere conservar?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(todo o seleccionado)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Produciuse un erro ao cargar o modelo de ficheiro existente"
@@ -455,29 +455,29 @@ msgid "notify by email"
msgstr "notificar por correo"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "control de acceso"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "crear"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "actualizar"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "eliminar"
-#: js/share.js:587
-msgid "share"
-msgstr "compartir"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Protexido con contrasinal"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index f7df7d1bb0a..f10e92ccb63 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -179,7 +179,7 @@ msgstr "O envío do ficheiro está en proceso. Saír agora da páxina cancelará
msgid "URL cannot be empty"
msgstr "O URL non pode quedar en branco."
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "Xa existe un {new_name}"
@@ -217,55 +217,55 @@ msgid ""
"big."
msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Pendentes"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Produciuse un erro ao mover o ficheiro."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Produciuse un erro ao mover o ficheiro"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Erro"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Non foi posíbel renomear o ficheiro"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Produciuse un erro ao eliminar o ficheiro."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nome"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Tamaño"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Modificado"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n cartafol"
msgstr[1] "%n cartafoles"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n ficheiro"
msgstr[1] "%n ficheiros"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Cargando %n ficheiro"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index df0662d536f..96d9b396914 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -21,21 +21,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Neste servidor non está activada a compartición de servidor a servidor"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Non foi posíbel engadir a compartición remota"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Compartido con vostede"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Compartido con outros"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Compartido por ligazón"
@@ -51,17 +51,17 @@ msgstr "Aínda non compartiu ningún ficheiro."
msgid "You haven't shared any files by link yet."
msgstr "Aínda non compartiu ningún ficheiro por ligazón."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Engadir {name} desde {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Non se atopou unha instalación do ownCloud en {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "URL incorrecta do ownCloud"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -117,15 +117,15 @@ msgstr "Para obter máis información, pregúntelle á persoa que lle enviou a l
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Gardar no ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "exemplo.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Gardar"
#: templates/public.php:28
msgid "Download"
@@ -141,13 +141,13 @@ msgid "Direct link"
msgstr "Ligazón directa"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Permitir que outras instancias monten ligazóns públicas compartidas desde este servidor"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Permitirlle aos usuarios montar ligazóns públicas compartidas"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index dee4beb08f4..c33b56526b2 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/gl/user_webdavauth.po b/l10n/gl/user_webdavauth.po
index 9a10cdc9927..789d32095e2 100644
--- a/l10n/gl/user_webdavauth.po
+++ b/l10n/gl/user_webdavauth.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Miguel Anxo Bouzada <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 0c2141fb6ab..67b0bf6c94e 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -248,75 +248,75 @@ msgstr "איפוס ססמה"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "כן"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "לא"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "בחירה"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "בסדר"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "קבצים חדשים"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "ביטול"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -455,29 +455,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "ניתן לערוך"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "בקרת גישה"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "יצירה"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "עדכון"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "מחיקה"
-#: js/share.js:587
-msgid "share"
-msgstr "שיתוף"
-
#: js/share.js:917
msgid "Password protected"
msgstr "מוגן בססמה"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index aee0ca6ab21..7a172dc7db5 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -179,7 +179,7 @@ msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד ת
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} כבר קיים"
@@ -217,55 +217,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "ממתין"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "שגיאה"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "שם"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "גודל"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "זמן שינוי"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index ad01e220118..b06e43998b5 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "שמירה"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index f8796cd7781..a064ba6382b 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/he/user_webdavauth.po b/l10n/he/user_webdavauth.po
index 86f4e2d45d2..f3e77bb61b9 100644
--- a/l10n/he/user_webdavauth.po
+++ b/l10n/he/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 419eae3774b..bb87fb9c880 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -248,75 +248,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -455,27 +455,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 1aad72faa5f..b5e7126a2b2 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "त्रुटि"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr ""
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr ""
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index ba3ce9cc773..9ba970d3642 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "सहेजें"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index cea0e22a905..b1e0eda14ef 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi/user_webdavauth.po b/l10n/hi/user_webdavauth.po
index 9bdb03b1ec1..b0e448ba4b7 100644
--- a/l10n/hi/user_webdavauth.po
+++ b/l10n/hi/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hi_IN/core.po b/l10n/hi_IN/core.po
index a6cfc6b8468..3ae7e2ac2cc 100644
--- a/l10n/hi_IN/core.po
+++ b/l10n/hi_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/hi_IN/files_sharing.po b/l10n/hi_IN/files_sharing.po
index 39dd01c530c..3e2f4879138 100644
--- a/l10n/hi_IN/files_sharing.po
+++ b/l10n/hi_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index ac58b8645e4..d934cd02707 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -250,76 +250,76 @@ msgstr "Poništavanje lozinke"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Izaberi"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "U redu"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Odustani"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -458,29 +458,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "može mjenjat"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "kontrola pristupa"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "kreiraj"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "ažuriraj"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "izbriši"
-#: js/share.js:587
-msgid "share"
-msgstr "djeli"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Zaštita lozinkom"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 896882d91b8..c4010cea93e 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje."
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,57 +215,57 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "U tijeku"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Greška"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Ime"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Veličina"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Zadnja promjena"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 72be9f46783..5b9a0d826f4 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Snimi"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 73de71e981d..7c3a0108b1a 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hr/user_webdavauth.po b/l10n/hr/user_webdavauth.po
index 437c01829ad..4b9431c3d73 100644
--- a/l10n/hr/user_webdavauth.po
+++ b/l10n/hr/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 1868aedd6f4..54ccc79da19 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -250,75 +250,75 @@ msgstr "Jelszó-visszaállítás"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Igen"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nem"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Válasszon"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Nem sikerült betölteni a fájlkiválasztó sablont: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Nem sikerült betölteni az üzenet sablont: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} fájl ütközik"
msgstr[1] "{count} fájl ütközik"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Egy file ütközik"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Új fájlok"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "A fájlok már léteznek"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Melyik fájlokat akarja megtartani?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Ha mindkét verziót kiválasztja, a másolt fájlok neve sorszámozva lesz."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Mégsem"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Folytatás"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(az összes ki lett választva)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} lett kiválasztva)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Hiba a létezőfájl-sablon betöltésekor"
@@ -457,29 +457,29 @@ msgid "notify by email"
msgstr "email értesítés"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "módosíthat"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "jogosultság"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "létrehoz"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "szerkeszt"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "töröl"
-#: js/share.js:587
-msgid "share"
-msgstr "megoszt"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Jelszóval van védve"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index b742ae7940a..3724dab47ba 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-13 01:54-0400\n"
-"PO-Revision-Date: 2014-06-12 20:00+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+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"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 39a09515a60..b5e493efc59 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -50,7 +50,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -124,7 +124,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Mentés"
#: templates/public.php:28
msgid "Download"
@@ -140,7 +140,7 @@ msgid "Direct link"
msgstr "Közvetlen link"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index e336dc87332..c7c6e588f80 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/user_webdavauth.po b/l10n/hu_HU/user_webdavauth.po
index 104a40fa933..e6c20f3b220 100644
--- a/l10n/hu_HU/user_webdavauth.po
+++ b/l10n/hu_HU/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 7dc7b09da30..34cb098680b 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index ba0bbd9e035..bffb46ace1e 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:13+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr ""
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr ""
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr ""
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index 5425ff7d08b..38182441fd5 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Պահպանել"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 5d215656ebb..1a5ddd7d0a6 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:13+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/hy/user_webdavauth.po b/l10n/hy/user_webdavauth.po
index 5044446bfca..6f7fe1f29cf 100644
--- a/l10n/hy/user_webdavauth.po
+++ b/l10n/hy/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 8f9e2a9b21d..edcfc1ad6d0 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -247,75 +247,75 @@ msgstr "Reinitialisar contrasigno"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Si"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Seliger"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflicto de file"
msgstr[1] "{count} conflictos de file"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Un conflicto de file"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Nove files"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Files jam existente"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Qual files tu vole mantener?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Cancellar"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Error quando on incargava patrono de file existente"
@@ -454,29 +454,29 @@ msgid "notify by email"
msgstr "notificar per message de e-posta"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "pote modificar"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "controlo de accesso"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "crear"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "actualisar"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "deler"
-#: js/share.js:587
-msgid "share"
-msgstr "compartir"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Proteger con contrasigno"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 6ec1037b75d..aa7367ce5a3 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Error"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nomine"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Dimension"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Modificate"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 64afc1e184e..b8b2ea88039 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Salveguardar"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index c3cd25bbfc7..f8a45d3194a 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ia/user_webdavauth.po b/l10n/ia/user_webdavauth.po
index 1657b003403..7705dd086d8 100644
--- a/l10n/ia/user_webdavauth.po
+++ b/l10n/ia/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 89c14d67968..a4cacebfe8f 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -243,74 +243,74 @@ msgstr "Atur ulang sandi"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Tidak"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Pilih"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Galat memuat templat berkas pemilih: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Oke"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Galat memuat templat pesan: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} berkas konflik"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Satu berkas konflik"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Berkas Baru"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Berkas sudah ada"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Berkas mana yang ingin anda pertahankan?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jika anda memilih kedua versi, berkas yang disalin akan memiliki nomor yang ditambahkan sesuai namanya."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Batal"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Lanjutkan"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(semua terpilih)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} terpilih)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Galat memuat templat berkas yang sudah ada"
@@ -449,29 +449,29 @@ msgid "notify by email"
msgstr "notifikasi via email"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "dapat sunting"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "kontrol akses"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "buat"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "perbarui"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "hapus"
-#: js/share.js:587
-msgid "share"
-msgstr "bagikan"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Sandi dilindungi"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 158f1068eef..f70a993a8d4 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -178,7 +178,7 @@ msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses
msgid "URL cannot be empty"
msgstr "URL tidak boleh kosong"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} sudah ada"
@@ -216,53 +216,53 @@ msgid ""
"big."
msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Menunggu"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Galat saat memindahkan berkas"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Galat"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Tidak dapat mengubah nama berkas"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Galat saat menghapus berkas."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nama"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Ukuran"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n folder"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n berkas"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Mengunggah %n berkas"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 59c7167aa34..a2a99ced31c 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -50,7 +50,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -124,7 +124,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Simpan"
#: templates/public.php:28
msgid "Download"
@@ -140,7 +140,7 @@ msgid "Direct link"
msgstr "Tautan langsung"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 635e3f40f49..37fa6fe1b42 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/id/user_webdavauth.po b/l10n/id/user_webdavauth.po
index 593119b079d..f1eb7060919 100644
--- a/l10n/id/user_webdavauth.po
+++ b/l10n/id/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 61e0d2588b7..dba2dc8ca74 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -247,75 +247,75 @@ msgstr "Endursetja lykilorð"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Já"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Veldu"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Í lagi"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Hætta við"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -454,29 +454,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "getur breytt"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "aðgangsstýring"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "mynda"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "uppfæra"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "eyða"
-#: js/share.js:587
-msgid "share"
-msgstr "deila"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Verja með lykilorði"
diff --git a/l10n/is/files.po b/l10n/is/files.po
index fe5e38090ec..8ba6cfb47b9 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending mis
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} er þegar til"
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Bíður"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Villa"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nafn"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Stærð"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Breytt"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index e1bad4f14df..9a5a4567f6d 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Vista"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 7562df21944..8d5c35dbc3c 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/is/user_webdavauth.po b/l10n/is/user_webdavauth.po
index 1890c27b88e..20ff2cbe1ec 100644
--- a/l10n/is/user_webdavauth.po
+++ b/l10n/is/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 9eb8151373d..32be86c304e 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-16 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 08:40+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -250,75 +250,75 @@ msgstr "Ripristina la password"
msgid "Password can not be changed. Please contact your administrator."
msgstr "La password non può essere cambiata. Contatta il tuo amministratore."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Sì"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Scegli"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Errore durante il caricamento del modello del selettore file: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Errore durante il caricamento del modello di messaggio: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} file in conflitto"
msgstr[1] "{count} file in conflitto"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Un file in conflitto"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "File nuovi"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "File già esistenti"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Quali file vuoi mantenere?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se selezioni entrambe le versioni, sarà aggiunto un numero al nome del file copiato."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Annulla"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Continua"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(tutti i selezionati)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} selezionati)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Errore durante il caricamento del modello del file esistente"
@@ -457,29 +457,29 @@ msgid "notify by email"
msgstr "notifica tramite email"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "può modificare"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "controllo d'accesso"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "creare"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "aggiornare"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "elimina"
-#: js/share.js:587
-msgid "share"
-msgstr "condividi"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Protetta da password"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index ad52d3f1ce2..2e957f0e2b8 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -180,7 +180,7 @@ msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il ca
msgid "URL cannot be empty"
msgstr "L'URL non può essere vuoto."
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} esiste già"
@@ -218,55 +218,55 @@ msgid ""
"big."
msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "In corso"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Errore durante lo spostamento del file."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Errore durante lo spostamento del file"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Errore"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Impossibile rinominare il file"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Errore durante l'eliminazione del file."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nome"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Dimensione"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Modificato"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n cartella"
msgstr[1] "%n cartelle"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n file"
msgstr[1] "%n file"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Caricamento di %n file in corso"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index d1b1455c10c..660a0b0a3af 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Nicolas North, 2014
# Paolo Velati <paolo.velati@gmail.com>, 2013-2014
# Vincenzo Reale <vinx.reale@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -21,21 +22,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "La condivisione tra server non è abilitata su questo server"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Impossibile aggiungere la condivisione remota"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Condiviso con te"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Condiviso con altri"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Condiviso tramite collegamento"
@@ -51,17 +52,17 @@ msgstr "Non hai ancora condiviso alcun file."
msgid "You haven't shared any files by link yet."
msgstr "Non hai ancora condiviso alcun file tramite collegamento."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Aggiungi {name} da {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Nessuna installazione di ownCloud trovata su {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "URL di ownCloud non valido"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -117,15 +118,15 @@ msgstr "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il col
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Salva su ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "esempio.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Salva"
#: templates/public.php:28
msgid "Download"
@@ -141,13 +142,13 @@ msgid "Direct link"
msgstr "Collegamento diretto"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Permetti ad altre istanze di montare collegamenti pubblici condivisi da questo server"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Permetti agli utenti di montare condivisioni con collegamento pubblico"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 8e13054be88..2efc30509e7 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 08:55+0000\n"
-"Last-Translator: Paolo Velati <paolo.velati@gmail.com>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 17:46+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,50 +21,50 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:678
+#: base.php:673
msgid "You are accessing the server from an untrusted domain."
msgstr "Stai accedendo al server da un dominio non affidabile."
-#: base.php:679
+#: base.php:674
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
"example configuration is provided in config/config.sample.php."
msgstr "Contatta il tuo amministratore di sistema. Se sei un amministratore, configura l'impostazione \"trusted_domain\" in config/config.php. Un esempio di configurazione è disponibile in config/config.sample.php."
-#: private/app.php:361
+#: private/app.php:366
msgid "Help"
msgstr "Aiuto"
-#: private/app.php:374
+#: private/app.php:379
msgid "Personal"
msgstr "Personale"
-#: private/app.php:385
+#: private/app.php:390
msgid "Settings"
msgstr "Impostazioni"
-#: private/app.php:397
+#: private/app.php:402
msgid "Users"
msgstr "Utenti"
-#: private/app.php:410
+#: private/app.php:415
msgid "Admin"
msgstr "Admin"
-#: private/app.php:978
+#: private/app.php:987
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Aggiornamento non riuscito \"%s\"."
-#: private/app.php:1135
+#: private/app.php:1144
#, php-format
msgid ""
"App \\\"%s\\\" can't be installed because it is not compatible with this "
"version of ownCloud."
msgstr "L'applicazione \\\"%s\\\" non può essere installata poiché non è compatibile con questa versione di ownCloud."
-#: private/app.php:1147
+#: private/app.php:1156
msgid "No app name specified"
msgstr "Il nome dell'applicazione non è specificato"
@@ -89,48 +89,48 @@ msgstr "La cartella dell'applicazione esiste già"
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s"
-#: private/installer.php:231
+#: private/installer.php:235
msgid "No source specified when installing app"
msgstr "Nessuna fonte specificata durante l'installazione dell'applicazione"
-#: private/installer.php:238
+#: private/installer.php:242
msgid "No href specified when installing app from http"
msgstr "Nessun href specificato durante l'installazione dell'applicazione da http"
-#: private/installer.php:243
+#: private/installer.php:247
msgid "No path specified when installing app from local file"
msgstr "Nessun percorso specificato durante l'installazione dell'applicazione da file locale"
-#: private/installer.php:257
+#: private/installer.php:261
#, php-format
msgid "Archives of type %s are not supported"
msgstr "Gli archivi di tipo %s non sono supportati"
-#: private/installer.php:271
+#: private/installer.php:275
msgid "Failed to open archive when installing app"
msgstr "Apertura archivio non riuscita durante l'installazione dell'applicazione"
-#: private/installer.php:309
+#: private/installer.php:313
msgid "App does not provide an info.xml file"
msgstr "L'applicazione non fornisce un file info.xml"
-#: private/installer.php:315
+#: private/installer.php:319
msgid "App can't be installed because of not allowed code in the App"
msgstr "L'applicazione non può essere installata a causa di codice non consentito al suo interno"
-#: private/installer.php:321
+#: private/installer.php:325
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud"
-#: private/installer.php:327
+#: private/installer.php:331
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "L'applicazione non può essere installata poiché contiene il tag <shipped>true<shipped> che è consentito per le applicazioni native"
-#: private/installer.php:340
+#: private/installer.php:344
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
@@ -248,13 +248,13 @@ msgstr "Imposta un nome utente di amministrazione."
msgid "Set an admin password."
msgstr "Imposta una password di amministrazione."
-#: private/setup.php:164
+#: private/setup.php:170
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata."
-#: private/setup.php:165
+#: private/setup.php:171
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
@@ -323,57 +323,57 @@ msgstr "Condivisione di %s non riuscita, poiché i collegamenti non sono consent
msgid "Share type %s is not valid for %s"
msgstr "Il tipo di condivisione %s non è valido per %s"
-#: private/share/share.php:820
+#: private/share/share.php:860
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Impostazione permessi per %s non riuscita, poiché i permessi superano i permessi accordati a %s"
-#: private/share/share.php:881
+#: private/share/share.php:921
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Impostazione permessi per %s non riuscita, poiché l'elemento non è stato trovato"
-#: private/share/share.php:1002
+#: private/share/share.php:1046
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr "Il motore di condivisione %s deve implementare l'interfaccia OCP\\Share_Backend"
-#: private/share/share.php:1009
+#: private/share/share.php:1053
#, php-format
msgid "Sharing backend %s not found"
msgstr "Motore di condivisione %s non trovato"
-#: private/share/share.php:1015
+#: private/share/share.php:1059
#, php-format
msgid "Sharing backend for %s not found"
msgstr "Motore di condivisione di %s non trovato"
-#: private/share/share.php:1432
+#: private/share/share.php:1476
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr "Condivisione di %s non riuscita, poiché l'utente %s l'ha condiviso precedentemente"
-#: private/share/share.php:1441
+#: private/share/share.php:1485
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr "Condivisione di %s non riuscita, poiché i permessi superano quelli accordati a %s"
-#: private/share/share.php:1457
+#: private/share/share.php:1501
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr "Condivisione di %s non riuscita, poiché la ri-condivisione non è consentita"
-#: private/share/share.php:1469
+#: private/share/share.php:1513
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr "Condivisione di %s non riuscita, poiché il motore di condivisione per %s non riesce a trovare la sua fonte"
-#: private/share/share.php:1483
+#: private/share/share.php:1527
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index f2779a407e4..e32a4e034cb 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 08:55+0000\n"
-"Last-Translator: Paolo Velati <paolo.velati@gmail.com>\n"
+"POT-Creation-Date: 2014-06-22 01:54-0400\n"
+"PO-Revision-Date: 2014-06-21 09:38+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -259,7 +259,7 @@ msgstr "Aggiornato"
#: js/apps.js:233
msgid "Uninstalling ...."
-msgstr "Disinstallazione ..."
+msgstr "Disinstallazione..."
#: js/apps.js:236
msgid "Error while uninstalling app"
@@ -321,7 +321,7 @@ msgstr "Deve essere fornito un nome valido per il gruppo"
msgid "deleted {groupName}"
msgstr "{groupName} eliminato"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "annulla"
@@ -341,31 +341,31 @@ msgstr "Gruppi amministrati"
msgid "Delete"
msgstr "Elimina"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "mai"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
msgstr "{userName} eliminato"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "aggiungi gruppo"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Deve essere fornito un nome utente valido"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Errore durante la creazione dell'utente"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Deve essere fornita una password valida"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Avviso: la cartella home dell'utente \"{user}\" esiste già"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index beaf94b1280..1c8c01b9cb9 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po
index df1cfe917ad..ea332719b03 100644
--- a/l10n/it/user_webdavauth.po
+++ b/l10n/it/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja/core.po b/l10n/ja/core.po
index f44f9c25c33..1d486b8aa63 100644
--- a/l10n/ja/core.po
+++ b/l10n/ja/core.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-16 01:54-0400\n"
-"PO-Revision-Date: 2014-06-16 04:10+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -227,7 +227,7 @@ msgid ""
"The link to reset your password has been sent to your email. If you do not "
"receive it within a reasonable amount of time, check your spam/junk "
"folders.<br>If it is not there ask your local administrator."
-msgstr ""
+msgstr "パスワードをリセットする、このリンクをクリックするとメールを送信します。しばらく経ってもメールが届かなかった場合は、スパム/ジャンクフォルダを確認してください。<br>それでも見つからなかった場合は、管理者に問合せてください。"
#: js/lostpassword.js:7
msgid ""
@@ -235,11 +235,11 @@ msgid ""
"will be no way to get your data back after your password is reset.<br />If "
"you are not sure what to do, please contact your administrator before you "
"continue. <br />Do you really want to continue?"
-msgstr ""
+msgstr "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?"
#: js/lostpassword.js:10
msgid "I know what I'm doing"
-msgstr ""
+msgstr "どういう操作をしているか理解しています"
#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9
msgid "Reset password"
@@ -249,74 +249,74 @@ msgstr "パスワードをリセット"
msgid "Password can not be changed. Please contact your administrator."
msgstr "パスワードは変更できません。管理者に問い合わせてください。"
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "はい"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "いいえ"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "選択"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "ファイル選択テンプレートの読み込みエラー: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "メッセージテンプレートの読み込みエラー: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} ファイルが競合"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "1ファイルが競合"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "新しいファイル"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "既存のファイル"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "どちらのファイルを保持しますか?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "キャンセル"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "続ける"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(すべて選択)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} 選択)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "既存ファイルのテンプレートの読み込みエラー"
@@ -392,19 +392,19 @@ msgstr "URLで共有"
#: js/share.js:340
msgid ""
"The public link will expire no later than {days} days after it is created"
-msgstr "公開用リンクは、作成してから {days} 日以内に有効期限切れになります"
+msgstr "URLによる共有は、作成してから {days} 日以内に有効期限切れになります"
#: js/share.js:342
msgid "By default the public link will expire after {days} days"
-msgstr "デフォルトの設定では、公開用リンクは {days} 日後に有効期限切れになります"
+msgstr "デフォルトの設定では、URLによる共有は {days} 日後に有効期限切れになります"
#: js/share.js:347
msgid "Password protect"
-msgstr "パスワード保護"
+msgstr "パスワード保護を有効化"
#: js/share.js:349
msgid "Choose a password for the public link"
-msgstr "公開用リンクのパスワードを選択"
+msgstr "URLによる共有のパスワードを入力"
#: js/share.js:355
msgid "Allow Public Upload"
@@ -455,29 +455,29 @@ msgid "notify by email"
msgstr "メールで通知"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "編集を許可"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "アクセス権限"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "作成"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "アップデート"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "削除"
-#: js/share.js:587
-msgid "share"
-msgstr "共有"
-
#: js/share.js:917
msgid "Password protected"
msgstr "パスワード保護"
@@ -829,7 +829,7 @@ msgstr "管理者に問い合わせてください。"
#: templates/login.php:50
msgid "Forgot your password? Reset it!"
-msgstr ""
+msgstr "パスワードを忘れましたか?リセットします!"
#: templates/login.php:55
msgid "remember"
diff --git a/l10n/ja/files.po b/l10n/ja/files.po
index 96b47972b96..487baac1e26 100644
--- a/l10n/ja/files.po
+++ b/l10n/ja/files.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: kuromabo <md81bird@hitaki.net>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -185,7 +185,7 @@ msgstr "ファイル転送を実行中です。今このページから移動す
msgid "URL cannot be empty"
msgstr "URL は空にできません"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} はすでに存在します"
@@ -223,53 +223,53 @@ msgid ""
"big."
msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。"
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "中断"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "ファイル移動でエラー"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "ファイルの移動エラー"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "エラー"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "ファイルの名前変更ができませんでした"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "ファイルの削除エラー。"
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "名前"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "サイズ"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "更新日時"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n 個のフォルダー"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n 個のファイル"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n 個のファイルをアップロード中"
diff --git a/l10n/ja/files_external.po b/l10n/ja/files_external.po
index 80509fc24f2..727dfac8300 100644
--- a/l10n/ja/files_external.po
+++ b/l10n/ja/files_external.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:20+0000\n"
+"POT-Creation-Date: 2014-06-25 06:33-0400\n"
+"PO-Revision-Date: 2014-06-24 13:54+0000\n"
"Last-Translator: YANO Tetsu <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -212,7 +212,7 @@ msgstr "個人"
msgid "System"
msgstr "システム"
-#: js/settings.js:318 js/settings.js:325
+#: js/settings.js:320 js/settings.js:327
msgid "Saved"
msgstr "保存されました"
diff --git a/l10n/ja/files_sharing.po b/l10n/ja/files_sharing.po
index c4cf8dfb9b2..85122e5c967 100644
--- a/l10n/ja/files_sharing.po
+++ b/l10n/ja/files_sharing.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013-2014
# タカハシ <gomidori@live.jp>, 2014
# kuromabo <md81bird@hitaki.net>, 2014
# Mika Kobayashi, 2014
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
@@ -24,47 +24,47 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "このサーバーでは、サーバー間の共有が有効ではありません"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "リモート共有を追加できませんでした"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
-msgstr "あなたと共有"
+msgstr "他ユーザーがあなたと共有中"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
-msgstr "他人と共有"
+msgstr "他ユーザーと共有中"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
-msgstr "URLリンクで共有済"
+msgstr "URLリンクで共有中"
#: js/app.js:35
msgid "No files have been shared with you yet."
-msgstr "まだ共有を行なっているファイルはありません。"
+msgstr "他のユーザーがあなたと共有しているファイルはありません。"
#: js/app.js:54
msgid "You haven't shared any files yet."
-msgstr "まだ共有を行なっているファイルはありません。"
+msgstr "他のユーザーと共有しているファイルはありません。"
#: js/app.js:73
msgid "You haven't shared any files by link yet."
-msgstr "まだURLリンクで共有を行なっているファイルはありません。"
+msgstr "URLリンクで共有しているファイルはありません。"
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "{owner}@{remote} から {name} を追加"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "{remote} には ownCloud がインストールされていません"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "無効な ownCloud URL です"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -112,7 +112,7 @@ msgstr "リンクの期限が切れています"
#: templates/part.404.php:8
msgid "sharing is disabled"
-msgstr "共有が無効になっています"
+msgstr "共有は無効になっています"
#: templates/part.404.php:10
msgid "For more info, please ask the person who sent this link."
@@ -120,15 +120,15 @@ msgstr "不明な点は、こちらのリンクの提供者に確認をお願い
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "ownCloud に保存"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "example.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "保存"
#: templates/public.php:28
msgid "Download"
@@ -144,13 +144,13 @@ msgid "Direct link"
msgstr "リンク"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "このサーバにおけるURLでの共有を他のインスタンスからマウントできるようにする"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "ユーザーがURLでの共有をマウントできるようにする"
diff --git a/l10n/ja/lib.po b/l10n/ja/lib.po
index df9876dc5ee..b4ee28f9180 100644
--- a/l10n/ja/lib.po
+++ b/l10n/ja/lib.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 10:31+0000\n"
+"Last-Translator: YANO Tetsu <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -64,7 +64,7 @@ msgstr "\"%s\" へのアップグレードに失敗しました。"
msgid ""
"App \\\"%s\\\" can't be installed because it is not compatible with this "
"version of ownCloud."
-msgstr ""
+msgstr "アプリ \\\"%s\\\" をインストールできません。現在の owncloud のバージョンと互換性がありません。"
#: private/app.php:1147
msgid "No app name specified"
diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po
index 2fe28f281d8..c21eaeb4117 100644
--- a/l10n/ja/settings.po
+++ b/l10n/ja/settings.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-25 06:33-0400\n"
+"PO-Revision-Date: 2014-06-24 13:54+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -53,15 +53,15 @@ msgstr "メールを送信しました"
msgid "You need to set your user email before being able to send test emails."
msgstr "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。"
-#: admin/controller.php:116 templates/admin.php:350
+#: admin/controller.php:116 templates/admin.php:337
msgid "Send mode"
msgstr "送信モード"
-#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144
msgid "Encryption"
msgstr "暗号化"
-#: admin/controller.php:120 templates/admin.php:387
+#: admin/controller.php:120 templates/admin.php:374
msgid "Authentication method"
msgstr "認証方法"
@@ -116,7 +116,7 @@ msgstr "暗号化キーを完全に削除できませんでした。owncloud.log
#: ajax/installapp.php:18 ajax/uninstallapp.php:18
msgid "Couldn't remove app."
-msgstr ""
+msgstr "アプリが削除できませんでした。"
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -199,7 +199,7 @@ msgstr "バックエンドはパスワード変更をサポートしていませ
msgid "Unable to change password"
msgstr "パスワードを変更できません"
-#: js/admin.js:126
+#: js/admin.js:127
msgid "Sending..."
msgstr "送信中…"
@@ -217,7 +217,7 @@ msgstr "{appversion} にアップデート"
#: js/apps.js:90
msgid "Uninstall App"
-msgstr ""
+msgstr "アプリをアンインストール"
#: js/apps.js:96 js/apps.js:158 js/apps.js:191
msgid "Disable"
@@ -261,15 +261,15 @@ msgstr "アップデート済み"
#: js/apps.js:233
msgid "Uninstalling ...."
-msgstr ""
+msgstr "アンインストール中 ...."
#: js/apps.js:236
msgid "Error while uninstalling app"
-msgstr ""
+msgstr "アプリをアンインストール中にエラーが発生"
#: js/apps.js:237 templates/apps.php:56
msgid "Uninstall"
-msgstr ""
+msgstr "アンインストール"
#: js/personal.js:256
msgid "Select a profile picture"
@@ -323,11 +323,11 @@ msgstr "有効なグループ名を指定する必要があります"
msgid "deleted {groupName}"
msgstr "{groupName} を削除しました"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "元に戻す"
-#: js/users/users.js:37 templates/admin.php:302
+#: js/users/users.js:37 templates/admin.php:292
#: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10
#: templates/users/part.userlist.php:41
msgid "Groups"
@@ -338,36 +338,36 @@ msgstr "グループ"
msgid "Group Admin"
msgstr "グループ管理者"
-#: js/users/users.js:63 templates/users/part.grouplist.php:44
+#: js/users/users.js:63 templates/users/part.grouplist.php:46
#: templates/users/part.userlist.php:108
msgid "Delete"
msgstr "削除"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "無し"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
msgstr "{userName} を削除しました"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "グループを追加"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "有効なユーザー名を指定する必要があります"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "ユーザー作成エラー"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "有効なパスワードを指定する必要があります"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します"
@@ -570,23 +570,23 @@ msgstr "システムのcronサービスを利用して15分ごとにcron.phpフ
msgid "Sharing"
msgstr "共有"
-#: templates/admin.php:240
+#: templates/admin.php:238
msgid "Allow apps to use the Share API"
msgstr "アプリからの共有APIの利用を許可する"
-#: templates/admin.php:247
+#: templates/admin.php:243
msgid "Allow users to share via link"
msgstr "URLリンクで共有を許可する"
-#: templates/admin.php:251
+#: templates/admin.php:249
msgid "Enforce password protection"
msgstr "常にパスワード保護を有効にする"
-#: templates/admin.php:254
+#: templates/admin.php:252
msgid "Allow public uploads"
msgstr "パブリックなアップロードを許可する"
-#: templates/admin.php:258
+#: templates/admin.php:256
msgid "Set default expiration date"
msgstr "有効期限の既定値を設定"
@@ -602,116 +602,116 @@ msgstr "日"
msgid "Enforce expiration date"
msgstr "有効期限を反映させる"
-#: templates/admin.php:276
+#: templates/admin.php:271
msgid "Allow resharing"
msgstr "再共有を許可する"
-#: templates/admin.php:283
+#: templates/admin.php:276
msgid "Restrict users to only share with users in their groups"
msgstr "グループ内のユーザーでのみ共有するように制限する"
-#: templates/admin.php:290
+#: templates/admin.php:281
msgid "Allow users to send mail notification for shared files"
msgstr "共有ファイルに関するメール通知の送信をユーザーに許可する"
-#: templates/admin.php:297
+#: templates/admin.php:286
msgid "Exclude groups from sharing"
msgstr "共有可能なグループから除外"
-#: templates/admin.php:308
+#: templates/admin.php:298
msgid ""
"These groups will still be able to receive shares, but not to initiate them."
msgstr "このグループでは、フォルダ共有を開始することはできませんが、共有されたフォルダを参照することはできます。"
-#: templates/admin.php:316
+#: templates/admin.php:303
msgid "Security"
msgstr "セキュリティ"
-#: templates/admin.php:327
+#: templates/admin.php:314
msgid "Enforce HTTPS"
msgstr "常にHTTPSを使用する"
-#: templates/admin.php:329
+#: templates/admin.php:316
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "クライアントから %sへの接続を常に暗号化します。"
-#: templates/admin.php:335
+#: templates/admin.php:322
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。"
-#: templates/admin.php:345
+#: templates/admin.php:332
msgid "Email Server"
msgstr "メールサーバー"
-#: templates/admin.php:347
+#: templates/admin.php:334
msgid "This is used for sending out notifications."
msgstr "これは通知の送信に使われます。"
-#: templates/admin.php:378
+#: templates/admin.php:365
msgid "From address"
msgstr "アドレスから"
-#: templates/admin.php:379
+#: templates/admin.php:366
msgid "mail"
msgstr "メール"
-#: templates/admin.php:400
+#: templates/admin.php:387
msgid "Authentication required"
msgstr "要求される認証"
-#: templates/admin.php:404
+#: templates/admin.php:391
msgid "Server address"
msgstr "サーバーアドレス"
-#: templates/admin.php:408
+#: templates/admin.php:395
msgid "Port"
msgstr "ポート"
-#: templates/admin.php:413
+#: templates/admin.php:400
msgid "Credentials"
msgstr "資格情報"
-#: templates/admin.php:414
+#: templates/admin.php:401
msgid "SMTP Username"
msgstr "SMTP ユーザー名"
-#: templates/admin.php:417
+#: templates/admin.php:404
msgid "SMTP Password"
msgstr "SMTP パスワード"
-#: templates/admin.php:421
+#: templates/admin.php:408
msgid "Test email settings"
msgstr "メール設定をテスト"
-#: templates/admin.php:422
+#: templates/admin.php:409
msgid "Send email"
msgstr "メールを送信"
-#: templates/admin.php:427
+#: templates/admin.php:414
msgid "Log"
msgstr "ログ"
-#: templates/admin.php:428
+#: templates/admin.php:415
msgid "Log level"
msgstr "ログレベル"
-#: templates/admin.php:460
+#: templates/admin.php:447
msgid "More"
msgstr "もっと見る"
-#: templates/admin.php:461
+#: templates/admin.php:448
msgid "Less"
msgstr "閉じる"
-#: templates/admin.php:467 templates/personal.php:196
+#: templates/admin.php:454 templates/personal.php:196
msgid "Version"
msgstr "バージョン"
-#: templates/admin.php:471 templates/personal.php:199
+#: templates/admin.php:458 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -933,9 +933,9 @@ msgstr "グループ"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
-msgstr "全ての人"
+msgstr "すべてのユーザー"
-#: templates/users/part.grouplist.php:29
+#: templates/users/part.grouplist.php:31
msgid "Admins"
msgstr "管理者"
@@ -945,7 +945,7 @@ msgstr "デフォルトのクォータサイズ"
#: templates/users/part.setquota.php:9 templates/users/part.userlist.php:66
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
-msgstr "ストレージの割り当てを入力してください (例: \"512MB\" や \"12 GB\")"
+msgstr "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")"
#: templates/users/part.setquota.php:11 templates/users/part.userlist.php:75
msgid "Unlimited"
@@ -957,7 +957,7 @@ msgstr "その他"
#: templates/users/part.userlist.php:7
msgid "Username"
-msgstr "ユーザー名"
+msgstr "ユーザーID"
#: templates/users/part.userlist.php:14
msgid "Quota"
@@ -965,7 +965,7 @@ msgstr "クオータ"
#: templates/users/part.userlist.php:15
msgid "Storage Location"
-msgstr "ストレージの場所"
+msgstr "データの保存場所"
#: templates/users/part.userlist.php:16
msgid "Last Login"
diff --git a/l10n/ja/user_ldap.po b/l10n/ja/user_ldap.po
index ff1b62f53f6..a656a99660a 100644
--- a/l10n/ja/user_ldap.po
+++ b/l10n/ja/user_ldap.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: YANO Tetsu <tetuyano+transi@gmail.com>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ja/user_webdavauth.po b/l10n/ja/user_webdavauth.po
index 3c9b114ca53..1f58988fa5f 100644
--- a/l10n/ja/user_webdavauth.po
+++ b/l10n/ja/user_webdavauth.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 21:30+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Mika Kobayashi\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/jv/core.po b/l10n/jv/core.po
index bdf16c2929c..054d9ec0a37 100644
--- a/l10n/jv/core.po
+++ b/l10n/jv/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/jv/files_sharing.po b/l10n/jv/files_sharing.po
index 113c5a52fc2..3ed96a829a6 100644
--- a/l10n/jv/files_sharing.po
+++ b/l10n/jv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 11a19926e28..2f6171c5ba9 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -242,74 +242,74 @@ msgstr "პაროლის შეცვლა"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "კი"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "არა"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "არჩევა"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "დიახ"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "ახალი ფაილები"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "უარყოფა"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -448,29 +448,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "შეგიძლია შეცვლა"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "დაშვების კონტროლი"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "შექმნა"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "განახლება"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "წაშლა"
-#: js/share.js:587
-msgid "share"
-msgstr "გაზიარება"
-
#: js/share.js:917
msgid "Password protected"
msgstr "პაროლით დაცული"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 2c11ea8182c..d74985df533 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "მიმდინარეობს ფაილის ატვირ
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} უკვე არსებობს"
@@ -215,53 +215,53 @@ msgid ""
"big."
msgstr "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "მოცდის რეჟიმში"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "შეცდომა"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "სახელი"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "ზომა"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "შეცვლილია"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 9bdd1ea8302..27e0f2bb3f4 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "შენახვა"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index 5819b78388e..57ae87540d9 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/user_webdavauth.po b/l10n/ka_GE/user_webdavauth.po
index 6270eae282e..c5c7239a7d2 100644
--- a/l10n/ka_GE/user_webdavauth.po
+++ b/l10n/ka_GE/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/km/core.po b/l10n/km/core.po
index 0dcaaa89b3a..c6968584136 100644
--- a/l10n/km/core.po
+++ b/l10n/km/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -243,74 +243,74 @@ msgstr "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "ព្រម"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "ទេ"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "ជ្រើស"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "ព្រម"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "ឯកសារ​ថ្មី"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "មាន​ឯកសារ​នេះ​រួច​ហើយ"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "លើកលែង"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "បន្ត"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(បាន​ជ្រើស​ទាំង​អស់)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "(បាន​ជ្រើស {count})"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -449,29 +449,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "អាច​កែប្រែ"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "សិទ្ធិ​បញ្ជា"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "បង្កើត"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "ធ្វើ​បច្ចុប្បន្នភាព"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "លុប"
-#: js/share.js:587
-msgid "share"
-msgstr "ចែក​រំលែក"
-
#: js/share.js:917
msgid "Password protected"
msgstr "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់"
diff --git a/l10n/km/files.po b/l10n/km/files.po
index a60c5791241..3ed5ed92e39 100644
--- a/l10n/km/files.po
+++ b/l10n/km/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -178,7 +178,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "មាន​ឈ្មោះ {new_name} រួច​ហើយ"
@@ -216,53 +216,53 @@ msgid ""
"big."
msgstr "ការ​ទាញយក​របស់​អ្នក​កំពុង​ត្រូវ​បាន​រៀបចំ​ហើយ។ នេះ​អាច​ចំណាយ​ពេល​មួយ​សំទុះ ប្រសិន​បើ​ឯកសារ​ធំ។"
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "កំពុង​រង់ចាំ"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "កំហុស"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "ឈ្មោះ"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "ទំហំ"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "បាន​កែ​ប្រែ"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/km/files_sharing.po b/l10n/km/files_sharing.po
index f146a41e845..f80d137fbc6 100644
--- a/l10n/km/files_sharing.po
+++ b/l10n/km/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -51,7 +51,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "រក្សាទុក"
#: templates/public.php:28
msgid "Download"
@@ -141,7 +141,7 @@ msgid "Direct link"
msgstr "តំណ​ផ្ទាល់"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/km/user_ldap.po b/l10n/km/user_ldap.po
index 0f65f581ad7..f28b84a7aa0 100644
--- a/l10n/km/user_ldap.po
+++ b/l10n/km/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: beth borin <borovin38@gmail.com>\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/km/user_webdavauth.po b/l10n/km/user_webdavauth.po
index 6e1034ec9f9..38c34dbc036 100644
--- a/l10n/km/user_webdavauth.po
+++ b/l10n/km/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index 1b831ef0ed9..5db475ed3b4 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -242,74 +242,74 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -448,27 +448,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/kn/files_sharing.po b/l10n/kn/files_sharing.po
index f7d24066b63..9b60f9f8984 100644
--- a/l10n/kn/files_sharing.po
+++ b/l10n/kn/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index a430b71f5fe..7fb3d095159 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -249,74 +249,74 @@ msgstr "암호 재설정"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "예"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "아니요"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "선택"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "파일 선택 템플릿을 불러오는 중 오류 발생: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "확인"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "메시지 템플릿을 불러오는 중 오류 발생: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "파일 {count}개 충돌"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "파일 1개 충돌"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "어느 파일을 유지하시겠습니까?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "두 버전을 모두 선택하면, 파일 이름에 번호가 추가될 것입니다."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "취소"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "계속"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(모두 선택됨)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count}개 선택됨)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "파일 존재함 템플릿을 불러오는 중 오류 발생"
@@ -455,29 +455,29 @@ msgid "notify by email"
msgstr "이메일로 알림"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "편집 가능"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "접근 제어"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "생성"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "업데이트"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "삭제"
-#: js/share.js:587
-msgid "share"
-msgstr "공유"
-
#: js/share.js:917
msgid "Password protected"
msgstr "암호로 보호됨"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 1ac099b48d3..1d63a66df5a 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -183,7 +183,7 @@ msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면
msgid "URL cannot be empty"
msgstr "URL이 비어있을 수 없음"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name}이(가) 이미 존재함"
@@ -221,53 +221,53 @@ msgid ""
"big."
msgstr "다운로드 준비 중입니다. 파일 크기가 크면 시간이 오래 걸릴 수도 있습니다."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "대기 중"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "파일 이동 오류"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "오류"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "이름을 변경할 수 없음"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "파일 삭제 오류."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "이름"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "크기"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "수정됨"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "폴더 %n개"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "파일 %n개"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "파일 %n개 업로드 중"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index d735e3faa1d..426ea510c33 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -28,15 +28,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -52,7 +52,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -126,7 +126,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "저장"
#: templates/public.php:28
msgid "Download"
@@ -142,7 +142,7 @@ msgid "Direct link"
msgstr "직접 링크"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index c78e8ad027f..fc8bd4762b7 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ko/user_webdavauth.po b/l10n/ko/user_webdavauth.po
index 89ba1ae47be..e7633f2bee6 100644
--- a/l10n/ko/user_webdavauth.po
+++ b/l10n/ko/user_webdavauth.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 149d70fb07a..1f2b529ae7f 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "بەڵێ"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "نەخێر"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "لابردن"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 47af98fb240..d11929b9a85 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "هه‌ڵه"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "ناو"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr ""
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr ""
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 90f06a7c74c..55a51e33ffa 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "پاشکه‌وتکردن"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 6b7134c3bf2..6b63417a157 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/user_webdavauth.po b/l10n/ku_IQ/user_webdavauth.po
index eb86c7e05bb..d6cfdb82d35 100644
--- a/l10n/ku_IQ/user_webdavauth.po
+++ b/l10n/ku_IQ/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index c00a8294a2a..0fd841a370a 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -248,75 +248,75 @@ msgstr "Passwuert zréck setzen"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Jo"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Auswielen"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Weieng Fichieren wëlls de gär behalen?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Ofbriechen"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Weider"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(all ausgewielt)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} ausgewielt)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -455,29 +455,29 @@ msgid "notify by email"
msgstr "via e-mail Bescheed ginn"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "kann änneren"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "Zougrëffskontroll"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "erstellen"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "aktualiséieren"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "läschen"
-#: js/share.js:587
-msgid "share"
-msgstr "deelen"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Passwuertgeschützt"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index cb146f3e11c..19cdcfe310a 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofg
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Fehler"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Numm"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Gréisst"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Geännert"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index 0c2220a37db..e0fcceeeb5c 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -50,7 +50,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -124,7 +124,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Späicheren"
#: templates/public.php:28
msgid "Download"
@@ -140,7 +140,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 903e1c3edf4..db299ceaee8 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lb/user_webdavauth.po b/l10n/lb/user_webdavauth.po
index 3497ec15645..6b3f93da8ba 100644
--- a/l10n/lb/user_webdavauth.po
+++ b/l10n/lb/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 251a6402ce8..78943c3fb9f 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -255,76 +255,76 @@ msgstr "Atkurti slaptažodį"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Taip"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Pasirinkite"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Klaida įkeliant failo parinkimo ruošinį: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Gerai"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Klaida įkeliant žinutės ruošinį: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} failas konfliktuoja"
msgstr[1] "{count} failai konfliktuoja"
msgstr[2] "{count} failų konfliktų"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Vienas failo konfliktas"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Kuriuos failus norite laikyti?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jei pasirenkate abi versijas, nukopijuotas failas turės pridėtą numerį pavadinime."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Atšaukti"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Tęsti"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(visi pažymėti)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} pažymėtų)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Klaida įkeliant esančių failų ruošinį"
@@ -463,29 +463,29 @@ msgid "notify by email"
msgstr "pranešti el. paštu"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "gali redaguoti"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "priėjimo kontrolė"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "sukurti"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "atnaujinti"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "ištrinti"
-#: js/share.js:587
-msgid "share"
-msgstr "dalintis"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Apsaugota slaptažodžiu"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index e47b3bcd796..6da85a6975b 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -180,7 +180,7 @@ msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutr
msgid "URL cannot be empty"
msgstr "URL negali būti tuščias."
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} jau egzistuoja"
@@ -218,57 +218,57 @@ msgid ""
"big."
msgstr "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Laukiantis"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Klaida perkeliant failą"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Klaida"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Neįmanoma pervadinti failo"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Klaida trinant failą."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Pavadinimas"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Dydis"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Pakeista"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n aplankas"
msgstr[1] "%n aplankai"
msgstr[2] "%n aplankų"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n failas"
msgstr[1] "%n failai"
msgstr[2] "%n failų"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Įkeliamas %n failas"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 84f2bf7c6fa..ecf13fb50bc 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
@@ -28,15 +28,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -52,7 +52,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -126,7 +126,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Išsaugoti"
#: templates/public.php:28
msgid "Download"
@@ -142,7 +142,7 @@ msgid "Direct link"
msgstr "Tiesioginė nuoroda"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index c6c8c47ef10..1f7a27e60c8 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/user_webdavauth.po b/l10n/lt_LT/user_webdavauth.po
index 1eac1682645..7958ab9b4a1 100644
--- a/l10n/lt_LT/user_webdavauth.po
+++ b/l10n/lt_LT/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 8f718160194..6ee7aafb88c 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -251,76 +251,76 @@ msgstr "Mainīt paroli"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Jā"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nē"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Izvēlieties"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Labi"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Jaunās datnes"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Atcelt"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -459,29 +459,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "var rediģēt"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "piekļuves vadība"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "izveidot"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "atjaunināt"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "dzēst"
-#: js/share.js:587
-msgid "share"
-msgstr "dalīties"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Aizsargāts ar paroli"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index fcc515622d1..c2046e211e9 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -178,7 +178,7 @@ msgstr "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde."
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} jau eksistē"
@@ -216,57 +216,57 @@ msgid ""
"big."
msgstr "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Gaida savu kārtu"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Kļūda"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nosaukums"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Izmērs"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Mainīts"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mapes"
msgstr[1] "%n mape"
msgstr[2] "%n mapes"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n faili"
msgstr[1] "%n fails"
msgstr[2] "%n faili"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index a438557beb4..0a7a9ce28d2 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Saglabāt"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 03f8f4c3acb..aae245278e1 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/lv/user_webdavauth.po b/l10n/lv/user_webdavauth.po
index a602d80ea7b..7f59a3fd807 100644
--- a/l10n/lv/user_webdavauth.po
+++ b/l10n/lv/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 84ee45d6928..abf40bfb6c0 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -247,75 +247,75 @@ msgstr "Ресетирај лозинка"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Избери"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Во ред"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Конфликт со една датотека"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Откажи"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Продолжи"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(сите одбрани)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} одбраните)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Грешка при вчитување на датотеката, шаблонот постои "
@@ -454,29 +454,29 @@ msgid "notify by email"
msgstr "извести преку електронска пошта"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "може да се измени"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "контрола на пристап"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "креирај"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "ажурирај"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "избриши"
-#: js/share.js:587
-msgid "share"
-msgstr "сподели"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Заштитено со лозинка"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 9d500afe001..3cae14bc6d3 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-09 01:54-0400\n"
-"PO-Revision-Date: 2014-06-08 20:20+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -178,7 +178,7 @@ msgstr "Подигање на датотека е во тек. Напуштењ
msgid "URL cannot be empty"
msgstr "URL-то не може да биде празно"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} веќе постои"
@@ -216,55 +216,55 @@ msgid ""
"big."
msgstr "Вашето преземање се подготвува. Ова може да потрае до колку датотеките се големи."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Чека"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Грешка при префрлање на датотека"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Грешка"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Не можам да ја преименувам датотеката"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Име"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Големина"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Променето"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 4baccd84c03..9954135e103 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Споделено со тебе"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Сподели со останатите"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Споделено со врска"
@@ -50,7 +50,7 @@ msgstr "Вие досега немате споделено ниту една д
msgid "You haven't shared any files by link yet."
msgstr "Сеуште немате споделено датотека со врска."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -124,7 +124,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Сними"
#: templates/public.php:28
msgid "Download"
@@ -140,7 +140,7 @@ msgid "Direct link"
msgstr "Директна врска"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index b051fed9648..9eeca7de501 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/mk/user_webdavauth.po b/l10n/mk/user_webdavauth.po
index 4d4993e7530..a13c2062c48 100644
--- a/l10n/mk/user_webdavauth.po
+++ b/l10n/mk/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ml/core.po b/l10n/ml/core.po
index 3e11516e52e..6b7388a6ff2 100644
--- a/l10n/ml/core.po
+++ b/l10n/ml/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/ml/files_sharing.po b/l10n/ml/files_sharing.po
index b1f78329afa..43dd67f09f1 100644
--- a/l10n/ml/files_sharing.po
+++ b/l10n/ml/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index 8b4a95bd1cc..7cd137d43cc 100644
--- a/l10n/ml_IN/core.po
+++ b/l10n/ml_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po
index db6c7389b7c..d4ab6029ea9 100644
--- a/l10n/ml_IN/files.po
+++ b/l10n/ml_IN/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-04 01:54-0400\n"
-"PO-Revision-Date: 2014-06-04 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 18:31+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:159
#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
@@ -88,62 +88,62 @@ msgstr ""
msgid "Invalid Token"
msgstr ""
-#: ajax/upload.php:75
+#: ajax/upload.php:77
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:84
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:83
+#: ajax/upload.php:85
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:85
+#: ajax/upload.php:87
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:86
+#: ajax/upload.php:88
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:87
+#: ajax/upload.php:89
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:88
+#: ajax/upload.php:90
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:89
+#: ajax/upload.php:91
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:109
+#: ajax/upload.php:111
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:171
+#: ajax/upload.php:173
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:181
+#: ajax/upload.php:183
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:196
+#: ajax/upload.php:198
msgid "Invalid directory."
msgstr ""
#: appinfo/app.php:11 js/filelist.js:25
msgid "Files"
-msgstr ""
+msgstr "ഫയലുകൾ"
-#: appinfo/app.php:29
+#: appinfo/app.php:27
msgid "All files"
msgstr ""
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1192
msgid "{new_name} already exists"
msgstr ""
@@ -193,19 +193,19 @@ msgstr ""
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:211
+#: js/fileactions.js:213
msgid "Share"
msgstr ""
-#: js/fileactions.js:224
+#: js/fileactions.js:226
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:226 templates/list.php:78 templates/list.php:79
+#: js/fileactions.js:228 templates/list.php:78 templates/list.php:79
msgid "Delete"
msgstr ""
-#: js/fileactions.js:262
+#: js/fileactions.js:264
msgid "Rename"
msgstr ""
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:623 js/filelist.js:1713
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1143
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1151
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1151
msgid "Error"
msgstr ""
-#: js/filelist.js:1225
+#: js/filelist.js:1240
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1358
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1461 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1462 templates/list.php:73
msgid "Size"
msgstr ""
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1463 templates/list.php:76
msgid "Modified"
msgstr ""
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1473 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1479 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1606 js/filelist.js:1645
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/ml_IN/files_sharing.po b/l10n/ml_IN/files_sharing.po
index 5643288266a..cee3a82698d 100644
--- a/l10n/ml_IN/files_sharing.po
+++ b/l10n/ml_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/mn/core.po b/l10n/mn/core.po
index b3a403fc4f6..a8c45bf91b8 100644
--- a/l10n/mn/core.po
+++ b/l10n/mn/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/mn/files_sharing.po b/l10n/mn/files_sharing.po
index b92414afdff..ca4fa352f37 100644
--- a/l10n/mn/files_sharing.po
+++ b/l10n/mn/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 918f82ade1e..3c8a4aa4fa0 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -242,74 +242,74 @@ msgstr "Penetapan semula kata laluan"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Ya"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Tidak"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Batal"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -448,27 +448,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 04d7751c774..b3ae8150b56 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,53 +215,53 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Dalam proses"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Ralat"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nama"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Saiz"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Dimodifikasi"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 1247d33ee27..0396f1e2d1b 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Simpan"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 07ca5961439..c818aa40c35 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/user_webdavauth.po b/l10n/ms_MY/user_webdavauth.po
index 57453dd8f85..584149e3656 100644
--- a/l10n/ms_MY/user_webdavauth.po
+++ b/l10n/ms_MY/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 5f583b879a8..9969a4f94ae 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -242,74 +242,74 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "ဟုတ်"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "မဟုတ်ဘူး"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "ရွေးချယ်"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "အိုကေ"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "ပယ်ဖျက်မည်"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -448,29 +448,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "ပြင်ဆင်နိုင်"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr ""
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "ဖန်တီးမည်"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr ""
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "ဖျက်မည်"
-#: js/share.js:587
-msgid "share"
-msgstr "ဝေမျှမည်"
-
#: js/share.js:917
msgid "Password protected"
msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်"
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index f6fc7f5ef8f..613aaa71f0d 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 2a1c726373e..be53e02e9ab 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 23:30+0000\n"
-"Last-Translator: vidaren <news@vidartysse.net>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -250,75 +250,75 @@ msgstr "Tilbakestill passord"
msgid "Password can not be changed. Please contact your administrator."
msgstr "Passordet kan ikke endres. Kontakt administratoren din."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Velg"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Feil ved lasting av filvelger-mal: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Feil ved lasting av meldingsmal: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} filkonflikt"
msgstr[1] "{count} filkonflikter"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "En filkonflikt"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Nye filer"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Allerede eksisterende filer"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Hvilke filer vil du beholde?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Fortsett"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(alle valgt)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} valgt)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Feil ved lasting av \"filen eksisterer\"-mal"
@@ -457,29 +457,29 @@ msgid "notify by email"
msgstr "Varsle på email"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "kan endre"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "tilgangskontroll"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "opprett"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "oppdater"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "slett"
-#: js/share.js:587
-msgid "share"
-msgstr "del"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Passordbeskyttet"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 3170bbd59e6..1091fac62df 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 23:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: vidaren <news@vidartysse.net>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index 8c6121ca87f..2602450c2d4 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -21,21 +21,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Server til server-deling er ikke aktivert på denne serveren"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Klarte ikke å legge til ekstern deling"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Delt med deg"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Delt med andre"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Delt med lenke"
@@ -51,17 +51,17 @@ msgstr "Du har ikke delt noen filer ennå."
msgid "You haven't shared any files by link yet."
msgstr "Du har ikke delt noen filer med lenke ennå."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Legg til {name} fra {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Ingen ownCloud-installasjon funnet på {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Ugyldig ownCloud-url"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -117,15 +117,15 @@ msgstr "For mer informasjon, spør personen som sendte lenken."
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Lagre til ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "example.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Lagre"
#: templates/public.php:28
msgid "Download"
@@ -141,13 +141,13 @@ msgid "Direct link"
msgstr "Direkte lenke"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Tillat at andre instanser monterer offentlige lenker som er delt fra denne serveren"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Tillat at brukere monterer offentlige lenke-delinger"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index e6f5cdda407..b44693d16d0 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 23:40+0000\n"
+"POT-Creation-Date: 2014-06-22 01:54-0400\n"
+"PO-Revision-Date: 2014-06-21 13:55+0000\n"
"Last-Translator: vidaren <news@vidartysse.net>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
@@ -321,7 +321,7 @@ msgstr "Et gyldig gruppenavn må oppgis"
msgid "deleted {groupName}"
msgstr "slettet {groupName}"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "angre"
@@ -341,31 +341,31 @@ msgstr "Gruppeadministrator"
msgid "Delete"
msgstr "Slett"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "aldri"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
msgstr "slettet {userName}"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "legg til gruppe"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Oppgi et gyldig brukernavn"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Feil ved oppretting av bruker"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Oppgi et gyldig passord"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Advarsel: Hjemmemappe for bruker \"{user}\" eksisterer allerede"
@@ -466,7 +466,7 @@ msgstr "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zen
#: templates/admin.php:105
msgid "Database Performance Info"
-msgstr "Info om databaseytelse"
+msgstr "Info om database-ytelse"
#: templates/admin.php:108
msgid ""
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 8c73f455aee..21406fef4af 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-11 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 13:02+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: vidaren <news@vidartysse.net>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/user_webdavauth.po b/l10n/nb_NO/user_webdavauth.po
index 1031e71db4c..05d26e305a3 100644
--- a/l10n/nb_NO/user_webdavauth.po
+++ b/l10n/nb_NO/user_webdavauth.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 07:20+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: vidaren <news@vidartysse.net>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nds/core.po b/l10n/nds/core.po
index c4c9132f5d7..054122a81a4 100644
--- a/l10n/nds/core.po
+++ b/l10n/nds/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/nds/files_sharing.po b/l10n/nds/files_sharing.po
index e2f01d5ee21..029a6464734 100644
--- a/l10n/nds/files_sharing.po
+++ b/l10n/nds/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index 124264237f9..12408cdee65 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/ne/files_sharing.po b/l10n/ne/files_sharing.po
index f3603a5a1a4..a153e707c63 100644
--- a/l10n/ne/files_sharing.po
+++ b/l10n/ne/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index be837b24021..3866ca5b813 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -220,14 +220,14 @@ msgstr "jaar geleden"
#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175
msgid "Couldn't send reset email. Please contact your administrator."
-msgstr ""
+msgstr "Kon herstel e-mail niet versturen. Neem contact op met uw beheerder."
#: js/lostpassword.js:5
msgid ""
"The link to reset your password has been sent to your email. If you do not "
"receive it within a reasonable amount of time, check your spam/junk "
"folders.<br>If it is not there ask your local administrator."
-msgstr ""
+msgstr "De link om uw wachtwoord te herstellen is per e-mail naar u verstuurd. Als u dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan uw spammapje. <br>Als het daar niet in zit, neem dan contact op met uw beheerder."
#: js/lostpassword.js:7
msgid ""
@@ -235,11 +235,11 @@ msgid ""
"will be no way to get your data back after your password is reset.<br />If "
"you are not sure what to do, please contact your administrator before you "
"continue. <br />Do you really want to continue?"
-msgstr ""
+msgstr "Uw bestanden zijn versleuteld. Als u de herstelsleutel niet hebt geactiveerd, dan is er geen mogelijk om uw gegevens terug te krijgen nadat uw wachtwoord is hersteld. <br>Als u niet weet wat u moet doen, neem dan eerst contact op met uw beheerder. <br>Wilt u echt verder gaan?"
#: js/lostpassword.js:10
msgid "I know what I'm doing"
-msgstr ""
+msgstr "Ik weet wat ik doe"
#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9
msgid "Reset password"
@@ -247,77 +247,77 @@ msgstr "Reset wachtwoord"
#: js/lostpassword.js:16
msgid "Password can not be changed. Please contact your administrator."
-msgstr ""
+msgstr "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nee"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Kies"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Fout bij laden bestandenselecteur sjabloon: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Fout bij laden berichtensjabloon: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} bestandsconflict"
msgstr[1] "{count} bestandsconflicten"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Een bestandsconflict"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Nieuwe bestanden"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Al aanwezige bestanden"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Welke bestanden wilt u bewaren?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Annuleer"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Verder"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(alles geselecteerd)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} geselecteerd)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Fout bij laden bestand bestaat al sjabloon"
@@ -456,29 +456,29 @@ msgid "notify by email"
msgstr "melden per e-mail"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "kan wijzigen"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "toegangscontrole"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "creëer"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "bijwerken"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "verwijderen"
-#: js/share.js:587
-msgid "share"
-msgstr "deel"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Wachtwoord beveiligd"
@@ -549,17 +549,17 @@ msgstr "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud."
#: lostpassword/controller/lostcontroller.php:110
msgid "Couldn't reset password because the token is invalid"
-msgstr ""
+msgstr "Kon het wachtwoord niet herstellen omdat het token ongeldig is"
#: lostpassword/controller/lostcontroller.php:136
msgid "Couldn't send reset email. Please make sure your username is correct."
-msgstr ""
+msgstr "Kon e-mail niet versturen. Verifieer of uw gebruikersnaam correct is."
#: lostpassword/controller/lostcontroller.php:151
msgid ""
"Couldn't send reset email because there is no email address for this "
"username. Please contact your administrator."
-msgstr ""
+msgstr "Kon wachtwoordherstel e-mailbericht niet versturen, omdat er geen e-mailadres bekend is voor deze gebruikersnaam. Neem contact op met uw beheerder."
#: lostpassword/controller/lostcontroller.php:168
#, php-format
@@ -602,7 +602,7 @@ msgstr "Nieuw wachtwoord"
#: lostpassword/templates/resetpassword.php:6
msgid "New Password"
-msgstr ""
+msgstr "Nieuw wachtwoord"
#: setup/controller.php:140
#, php-format
@@ -830,7 +830,7 @@ msgstr "Neem contact op met uw systeembeheerder."
#: templates/login.php:50
msgid "Forgot your password? Reset it!"
-msgstr ""
+msgstr "Wachtwoord vergeten? Herstel het!"
#: templates/login.php:55
msgid "remember"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 861a5927f26..a398a064925 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -179,7 +179,7 @@ msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de u
msgid "URL cannot be empty"
msgstr "URL mag niet leeg zijn"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} bestaat al"
@@ -217,55 +217,55 @@ msgid ""
"big."
msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "In behandeling"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Fout bij verplaatsen bestand"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Fout bij verplaatsen bestand"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Fout"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Kon niet hernoemen bestand"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Fout bij verwijderen bestand."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Naam"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Grootte"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Aangepast"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] "%n mappen"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] "%n bestanden"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n bestand aan het uploaden"
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index 412b3571c4a..4c6faf53768 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-14 01:54-0400\n"
-"PO-Revision-Date: 2014-06-14 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-24 01:54-0400\n"
+"PO-Revision-Date: 2014-06-23 15:12+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -108,7 +108,7 @@ msgstr "Initiële versleuteling bezig... Probeer het later opnieuw."
#: templates/invalid_private_key.php:8
#, php-format
msgid "Go directly to your %spersonal settings%s."
-msgstr ""
+msgstr "Ga direct naar uw %spersoonlijke instellingen%s."
#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index d4ce176f8e4..14d526a63a5 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -21,21 +21,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Server met server delen is niet geactiveerd op deze server"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Kon geen externe share toevoegen"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Deelde met u"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Deelde met anderen"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Gedeeld via een link"
@@ -51,17 +51,17 @@ msgstr "U hebt nog geen bestanden gedeeld."
msgid "You haven't shared any files by link yet."
msgstr "U hebt nog geen bestanden via een link gedeeld."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Toevoegen {name} van {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Geen ownCloud installatie gevonden op {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Ongeldige ownCloud url"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -117,15 +117,15 @@ msgstr "Voor meer informatie, neem contact op met de persoon die u deze link hee
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Bewaren in ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "example.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Bewaren"
#: templates/public.php:28
msgid "Download"
@@ -141,13 +141,13 @@ msgid "Direct link"
msgstr "Directe link"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Toestaan dat andere oanClouds openbaar gedeelde links mounten vanaf deze server"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Toestaan dat gebruikers openbaar gedeelde links mounten"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 40fe76fd843..2bb585d88f7 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-25 06:33-0400\n"
+"PO-Revision-Date: 2014-06-24 13:11+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,50 +20,50 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: base.php:678
+#: base.php:673
msgid "You are accessing the server from an untrusted domain."
msgstr "U benadert de server vanaf een niet vertrouwd domein."
-#: base.php:679
+#: base.php:674
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
"example configuration is provided in config/config.sample.php."
msgstr "Neem contact op met uw beheerder. Als u de beheerder van deze service bent, configureer dan de \"trusted_domain\" instelling in config/config.php. Een voorbeeldconfiguratie is gegeven in config/config.sample.php."
-#: private/app.php:361
+#: private/app.php:366
msgid "Help"
msgstr "Help"
-#: private/app.php:374
+#: private/app.php:379
msgid "Personal"
msgstr "Persoonlijk"
-#: private/app.php:385
+#: private/app.php:390
msgid "Settings"
msgstr "Instellingen"
-#: private/app.php:397
+#: private/app.php:402
msgid "Users"
msgstr "Gebruikers"
-#: private/app.php:410
+#: private/app.php:415
msgid "Admin"
msgstr "Beheerder"
-#: private/app.php:978
+#: private/app.php:983
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Upgrade \"%s\" mislukt."
-#: private/app.php:1135
+#: private/app.php:1140
#, php-format
msgid ""
"App \\\"%s\\\" can't be installed because it is not compatible with this "
"version of ownCloud."
-msgstr ""
+msgstr "App \\\"%s\\\" kan niet worden geïnstalleerd omdat de app niet compatible is met deze versie van ownCloud."
-#: private/app.php:1147
+#: private/app.php:1152
msgid "No app name specified"
msgstr "De app naam is niet gespecificeerd."
@@ -88,48 +88,48 @@ msgstr "App directory bestaat al"
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Kan de app map niet aanmaken, Herstel de permissies. %s"
-#: private/installer.php:231
+#: private/installer.php:235
msgid "No source specified when installing app"
msgstr "Geen bron opgegeven bij installatie van de app"
-#: private/installer.php:238
+#: private/installer.php:242
msgid "No href specified when installing app from http"
msgstr "Geen href opgegeven bij installeren van de app vanaf http"
-#: private/installer.php:243
+#: private/installer.php:247
msgid "No path specified when installing app from local file"
msgstr "Geen pad opgegeven bij installeren van de app vanaf een lokaal bestand"
-#: private/installer.php:257
+#: private/installer.php:261
#, php-format
msgid "Archives of type %s are not supported"
msgstr "Archiefbestanden van type %s niet ondersteund"
-#: private/installer.php:271
+#: private/installer.php:275
msgid "Failed to open archive when installing app"
msgstr "Kon archiefbestand bij installatie van de app niet openen"
-#: private/installer.php:309
+#: private/installer.php:313
msgid "App does not provide an info.xml file"
msgstr "De app heeft geen info.xml bestand"
-#: private/installer.php:315
+#: private/installer.php:319
msgid "App can't be installed because of not allowed code in the App"
msgstr "De app kan niet worden geïnstalleerd wegens onjuiste code in de app"
-#: private/installer.php:321
+#: private/installer.php:325
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud"
-#: private/installer.php:327
+#: private/installer.php:331
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "De app kan niet worden geïnstallerd omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps"
-#: private/installer.php:340
+#: private/installer.php:344
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
@@ -247,13 +247,13 @@ msgstr "Stel de gebruikersnaam van de beheerder in."
msgid "Set an admin password."
msgstr "Stel een beheerderswachtwoord in."
-#: private/setup.php:164
+#: private/setup.php:170
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt."
-#: private/setup.php:165
+#: private/setup.php:171
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index de7cd696ac5..8d2104a06c3 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-25 06:33-0400\n"
+"PO-Revision-Date: 2014-06-24 13:11+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -51,15 +51,15 @@ msgstr "E-mail verzonden"
msgid "You need to set your user email before being able to send test emails."
msgstr "U moet uw e-mailadres instellen voordat u testberichten kunt versturen."
-#: admin/controller.php:116 templates/admin.php:350
+#: admin/controller.php:116 templates/admin.php:337
msgid "Send mode"
msgstr "Verstuurmodus"
-#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144
msgid "Encryption"
msgstr "Versleuteling"
-#: admin/controller.php:120 templates/admin.php:387
+#: admin/controller.php:120 templates/admin.php:374
msgid "Authentication method"
msgstr "Authenticatiemethode"
@@ -114,7 +114,7 @@ msgstr "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud
#: ajax/installapp.php:18 ajax/uninstallapp.php:18
msgid "Couldn't remove app."
-msgstr ""
+msgstr "Kon app niet verwijderen."
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -197,7 +197,7 @@ msgstr "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleute
msgid "Unable to change password"
msgstr "Kan wachtwoord niet wijzigen"
-#: js/admin.js:126
+#: js/admin.js:127
msgid "Sending..."
msgstr "Versturen..."
@@ -215,7 +215,7 @@ msgstr "Bijwerken naar {appversion}"
#: js/apps.js:90
msgid "Uninstall App"
-msgstr ""
+msgstr "De-installeren app"
#: js/apps.js:96 js/apps.js:158 js/apps.js:191
msgid "Disable"
@@ -259,15 +259,15 @@ msgstr "Bijgewerkt"
#: js/apps.js:233
msgid "Uninstalling ...."
-msgstr ""
+msgstr "De-installeren ..."
#: js/apps.js:236
msgid "Error while uninstalling app"
-msgstr ""
+msgstr "Fout bij de-installeren app"
#: js/apps.js:237 templates/apps.php:56
msgid "Uninstall"
-msgstr ""
+msgstr "De-installeren"
#: js/personal.js:256
msgid "Select a profile picture"
@@ -321,11 +321,11 @@ msgstr "Er moet een geldige groepsnaam worden opgegeven"
msgid "deleted {groupName}"
msgstr "verwijderd {groupName}"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "ongedaan maken"
-#: js/users/users.js:37 templates/admin.php:302
+#: js/users/users.js:37 templates/admin.php:292
#: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10
#: templates/users/part.userlist.php:41
msgid "Groups"
@@ -336,36 +336,36 @@ msgstr "Groepen"
msgid "Group Admin"
msgstr "Groep beheerder"
-#: js/users/users.js:63 templates/users/part.grouplist.php:44
+#: js/users/users.js:63 templates/users/part.grouplist.php:46
#: templates/users/part.userlist.php:108
msgid "Delete"
msgstr "Verwijder"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "geen"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
msgstr "verwijderd {userName}"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "toevoegen groep"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Er moet een geldige gebruikersnaam worden opgegeven"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Fout bij aanmaken gebruiker"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Er moet een geldig wachtwoord worden opgegeven"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al"
@@ -568,23 +568,23 @@ msgstr "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepe
msgid "Sharing"
msgstr "Delen"
-#: templates/admin.php:240
+#: templates/admin.php:238
msgid "Allow apps to use the Share API"
msgstr "Apps toestaan de Share API te gebruiken"
-#: templates/admin.php:247
+#: templates/admin.php:243
msgid "Allow users to share via link"
msgstr "Sta gebruikers toe om te delen via een link"
-#: templates/admin.php:251
+#: templates/admin.php:249
msgid "Enforce password protection"
msgstr "Dwing wachtwoordbeveiliging af"
-#: templates/admin.php:254
+#: templates/admin.php:252
msgid "Allow public uploads"
msgstr "Sta publieke uploads toe"
-#: templates/admin.php:258
+#: templates/admin.php:256
msgid "Set default expiration date"
msgstr "Stel standaard vervaldatum in"
@@ -600,116 +600,116 @@ msgstr "dagen"
msgid "Enforce expiration date"
msgstr "Verplicht de vervaldatum"
-#: templates/admin.php:276
+#: templates/admin.php:271
msgid "Allow resharing"
msgstr "Toestaan opnieuw delen"
-#: templates/admin.php:283
+#: templates/admin.php:276
msgid "Restrict users to only share with users in their groups"
msgstr "Laat gebruikers alleen delen met andere gebruikers in hun groepen"
-#: templates/admin.php:290
+#: templates/admin.php:281
msgid "Allow users to send mail notification for shared files"
msgstr "Sta gebruikers toe om e-mailnotificaties te versturen voor gedeelde bestanden"
-#: templates/admin.php:297
+#: templates/admin.php:286
msgid "Exclude groups from sharing"
msgstr "Sluit groepen uit van delen"
-#: templates/admin.php:308
+#: templates/admin.php:298
msgid ""
"These groups will still be able to receive shares, but not to initiate them."
msgstr "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten."
-#: templates/admin.php:316
+#: templates/admin.php:303
msgid "Security"
msgstr "Beveiliging"
-#: templates/admin.php:327
+#: templates/admin.php:314
msgid "Enforce HTTPS"
msgstr "Afdwingen HTTPS"
-#: templates/admin.php:329
+#: templates/admin.php:316
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Dwingt de clients om een versleutelde verbinding te maken met %s"
-#: templates/admin.php:335
+#: templates/admin.php:322
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen."
-#: templates/admin.php:345
+#: templates/admin.php:332
msgid "Email Server"
msgstr "E-mailserver"
-#: templates/admin.php:347
+#: templates/admin.php:334
msgid "This is used for sending out notifications."
msgstr "Dit wordt gestuurd voor het verzenden van meldingen."
-#: templates/admin.php:378
+#: templates/admin.php:365
msgid "From address"
msgstr "Afzenderadres"
-#: templates/admin.php:379
+#: templates/admin.php:366
msgid "mail"
msgstr "e-mail"
-#: templates/admin.php:400
+#: templates/admin.php:387
msgid "Authentication required"
msgstr "Authenticatie vereist"
-#: templates/admin.php:404
+#: templates/admin.php:391
msgid "Server address"
msgstr "Server adres"
-#: templates/admin.php:408
+#: templates/admin.php:395
msgid "Port"
msgstr "Poort"
-#: templates/admin.php:413
+#: templates/admin.php:400
msgid "Credentials"
msgstr "Inloggegevens"
-#: templates/admin.php:414
+#: templates/admin.php:401
msgid "SMTP Username"
msgstr "SMTP gebruikersnaam"
-#: templates/admin.php:417
+#: templates/admin.php:404
msgid "SMTP Password"
msgstr "SMTP wachtwoord"
-#: templates/admin.php:421
+#: templates/admin.php:408
msgid "Test email settings"
msgstr "Test e-mailinstellingen"
-#: templates/admin.php:422
+#: templates/admin.php:409
msgid "Send email"
msgstr "Versturen e-mail"
-#: templates/admin.php:427
+#: templates/admin.php:414
msgid "Log"
msgstr "Log"
-#: templates/admin.php:428
+#: templates/admin.php:415
msgid "Log level"
msgstr "Log niveau"
-#: templates/admin.php:460
+#: templates/admin.php:447
msgid "More"
msgstr "Meer"
-#: templates/admin.php:461
+#: templates/admin.php:448
msgid "Less"
msgstr "Minder"
-#: templates/admin.php:467 templates/personal.php:196
+#: templates/admin.php:454 templates/personal.php:196
msgid "Version"
msgstr "Versie"
-#: templates/admin.php:471 templates/personal.php:199
+#: templates/admin.php:458 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -933,7 +933,7 @@ msgstr "Groep"
msgid "Everyone"
msgstr "Iedereen"
-#: templates/users/part.grouplist.php:29
+#: templates/users/part.grouplist.php:31
msgid "Admins"
msgstr "Beheerders"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 71de06b9ffd..4db7116c0fd 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+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"
diff --git a/l10n/nl/user_webdavauth.po b/l10n/nl/user_webdavauth.po
index 56dce313736..07b26c5ffcf 100644
--- a/l10n/nl/user_webdavauth.po
+++ b/l10n/nl/user_webdavauth.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 08:02+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+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"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index b5caf7f9090..111e45d9314 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -250,75 +250,75 @@ msgstr "Nullstill passord"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nei"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Vel"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Klarte ikkje å lasta filplukkarmal: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Greitt"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Klarte ikkje å lasta meldingsmal: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} filkonflikt"
msgstr[1] "{count} filkonfliktar"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Éin filkonflikt"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Kva filer vil du spara?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Gå vidare"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(alle valte)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} valte)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Klarte ikkje å lasta fil-finst-mal"
@@ -457,29 +457,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "kan endra"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "tilgangskontroll"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "lag"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "oppdater"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "slett"
-#: js/share.js:587
-msgid "share"
-msgstr "del"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Passordverna"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 53d013bdca7..28bb961b204 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -180,7 +180,7 @@ msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbrot
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} finst allereie"
@@ -218,55 +218,55 @@ msgid ""
"big."
msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Under vegs"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Feil ved flytting av fil"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Feil"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Namn"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Storleik"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Endra"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mappe"
msgstr[1] "%n mapper"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fil"
msgstr[1] "%n filer"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Lastar opp %n fil"
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 0d21e0b614a..0aff457628d 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -50,7 +50,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -124,7 +124,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Lagra"
#: templates/public.php:28
msgid "Download"
@@ -140,7 +140,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 0c53a0c6c72..542df0140eb 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/user_webdavauth.po b/l10n/nn_NO/user_webdavauth.po
index a21773654f9..026e5e093b9 100644
--- a/l10n/nn_NO/user_webdavauth.po
+++ b/l10n/nn_NO/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po
index ba40e97261f..7e0923edeb9 100644
--- a/l10n/nqo/core.po
+++ b/l10n/nqo/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -242,74 +242,74 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -448,27 +448,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/nqo/files_sharing.po b/l10n/nqo/files_sharing.po
index 735198a3440..81de54dbd15 100644
--- a/l10n/nqo/files_sharing.po
+++ b/l10n/nqo/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 42084607918..1ad5166415c 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr "Senhal tornat botar"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Òc"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Non"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Causís"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "D'accòrdi"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Annula"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,29 +453,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "pòt modificar"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "Contraròtle d'acces"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "crea"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "met a jorn"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "escafa"
-#: js/share.js:587
-msgid "share"
-msgstr "parteja"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Parat per senhal"
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 5318ccebe16..a4caa056fbc 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo carga
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Al esperar"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Error"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nom"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Talha"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Modificat"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index 4c013a99dd8..229cc98bfd9 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Enregistra"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index dc4d6b4021b..ccf7734c482 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/oc/user_webdavauth.po b/l10n/oc/user_webdavauth.po
index b5e977216af..25a9e988935 100644
--- a/l10n/oc/user_webdavauth.po
+++ b/l10n/oc/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/or_IN/core.po b/l10n/or_IN/core.po
index 6eed65c554d..66b99d21f0c 100644
--- a/l10n/or_IN/core.po
+++ b/l10n/or_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/or_IN/files_sharing.po b/l10n/or_IN/files_sharing.po
index 54108a75c60..41d7fa38f90 100644
--- a/l10n/or_IN/files_sharing.po
+++ b/l10n/or_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/pa/core.po b/l10n/pa/core.po
index 138b1d3d8b5..1d2e92d802a 100644
--- a/l10n/pa/core.po
+++ b/l10n/pa/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -247,75 +247,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "ਹਾਂ"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "ਨਹੀਂ"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "ਚੁਣੋ"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "ਠੀਕ ਹੈ"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "ਰੱਦ ਕਰੋ"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -454,27 +454,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/pa/files_sharing.po b/l10n/pa/files_sharing.po
index e6a7cf22a11..6353dd753cb 100644
--- a/l10n/pa/files_sharing.po
+++ b/l10n/pa/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 7b5fb92531a..3b50a31f055 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013-2014
# Krzysztof Łojowski <maxxxrally@gmail.com>, 2014
# Maciej Przybecki <maciej.przybecki@gmail.com>, 2013-2014
# Piotr Kwiecinski <pkwiecin@adbrand.pl>, 2013
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -225,7 +225,7 @@ msgstr "lat temu"
#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175
msgid "Couldn't send reset email. Please contact your administrator."
-msgstr ""
+msgstr "Nie mogę wysłać maila resetującego. Skontaktuj się z administratorem."
#: js/lostpassword.js:5
msgid ""
@@ -244,7 +244,7 @@ msgstr ""
#: js/lostpassword.js:10
msgid "I know what I'm doing"
-msgstr ""
+msgstr "Wiem co robię"
#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9
msgid "Reset password"
@@ -252,78 +252,78 @@ msgstr "Zresetuj hasło"
#: js/lostpassword.js:16
msgid "Password can not be changed. Please contact your administrator."
-msgstr ""
+msgstr "Hasło nie może zostać zmienione. Skontaktuj się z administratorem."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Tak"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nie"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Wybierz"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Błąd podczas ładowania pliku wybranego szablonu: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Błąd podczas ładowania szablonu wiadomości: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} konfliktów plików"
msgstr[1] "{count} konfliktów plików"
msgstr[2] "{count} konfliktów plików"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Konflikt pliku"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Nowe pliki"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Już istniejące pliki"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Które pliki chcesz zachować?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Jeśli wybierzesz obie wersje, skopiowany plik będzie miał dodany numerek w nazwie"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Anuluj"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Kontynuuj "
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(wszystkie zaznaczone)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} zaznaczonych)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Błąd podczas ładowania szablonu istniejącego pliku"
@@ -462,29 +462,29 @@ msgid "notify by email"
msgstr "powiadom przez emaila"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "może edytować"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "kontrola dostępu"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "utwórz"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "uaktualnij"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "usuń"
-#: js/share.js:587
-msgid "share"
-msgstr "współdziel"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Zabezpieczone hasłem"
@@ -555,17 +555,17 @@ msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud."
#: lostpassword/controller/lostcontroller.php:110
msgid "Couldn't reset password because the token is invalid"
-msgstr ""
+msgstr "Nie można zresetować hasła, ponieważ token jest niepoprawny"
#: lostpassword/controller/lostcontroller.php:136
msgid "Couldn't send reset email. Please make sure your username is correct."
-msgstr ""
+msgstr "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika jest poprawna."
#: lostpassword/controller/lostcontroller.php:151
msgid ""
"Couldn't send reset email because there is no email address for this "
"username. Please contact your administrator."
-msgstr ""
+msgstr "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika lub adres email jest poprawny. Skontaktuj się z administratorem."
#: lostpassword/controller/lostcontroller.php:168
#, php-format
@@ -608,7 +608,7 @@ msgstr "Nowe hasło"
#: lostpassword/templates/resetpassword.php:6
msgid "New Password"
-msgstr ""
+msgstr "Nowe hasło"
#: setup/controller.php:140
#, php-format
@@ -836,7 +836,7 @@ msgstr "Skontaktuj się z administratorem"
#: templates/login.php:50
msgid "Forgot your password? Reset it!"
-msgstr ""
+msgstr "Nie pamiętasz hasła? Zresetuj je!"
#: templates/login.php:55
msgid "remember"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 054862987d2..5e47702a62a 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -183,7 +183,7 @@ msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie z
msgid "URL cannot be empty"
msgstr "URL nie może być pusty"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} już istnieje"
@@ -221,57 +221,57 @@ msgid ""
"big."
msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Oczekujące"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Błąd podczas przenoszenia pliku."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Błąd prz przenoszeniu pliku"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Błąd"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Nie można zmienić nazwy pliku"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Błąd podczas usuwania pliku"
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nazwa"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Rozmiar"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Modyfikacja"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n katalog"
msgstr[1] "%n katalogi"
msgstr[2] "%n katalogów"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n plik"
msgstr[1] "%n pliki"
msgstr[2] "%n plików"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Wysyłanie %n pliku"
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index 9bd504c7f5f..22cbbde7d3f 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013-2014
# Krzysztof Łojowski <maxxxrally@gmail.com>, 2014
# Maciej Przybecki <maciej.przybecki@gmail.com>, 2013-2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-14 01:54-0400\n"
-"PO-Revision-Date: 2014-06-14 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-26 01:54-0400\n"
+"PO-Revision-Date: 2014-06-25 10:51+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -109,7 +109,7 @@ msgstr "Trwa szyfrowanie początkowe...Spróbuj ponownie."
#: templates/invalid_private_key.php:8
#, php-format
msgid "Go directly to your %spersonal settings%s."
-msgstr ""
+msgstr "Przejdź bezpośrednio do %spersonal settings%s."
#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 510679510a0..9dc4d9d92d5 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013-2014
# Maciej Przybecki <maciej.przybecki@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -25,17 +25,17 @@ msgstr ""
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Nie można dodać zdalnego folderu"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Współdzielony z Tobą"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Współdzielony z innymi"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Współdzielony linkiem"
@@ -51,17 +51,17 @@ msgstr "Nie współdzielisz jeszcze żadnych plików."
msgid "You haven't shared any files by link yet."
msgstr "Nie współdzielisz jeszcze żadnych plików linkiem"
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Dodaj {name} z {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Nie znaleziono instalacji ownCloud na {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Błędny adres URL"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -117,15 +117,15 @@ msgstr "Aby uzyskać więcej informacji proszę poprosić osobę, która wysła
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Zapis do ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "mojastrona.pl/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Zapisz"
#: templates/public.php:28
msgid "Download"
@@ -141,7 +141,7 @@ msgid "Direct link"
msgstr "Bezpośredni link"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
@@ -150,4 +150,4 @@ msgstr ""
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Zezwalaj użytkownikom na montowanie publicznych linków"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 18b29de111a..b5aa745b96d 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-26 01:54-0400\n"
+"PO-Revision-Date: 2014-06-25 10:41+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -51,15 +51,15 @@ msgstr "E-mail wysłany"
msgid "You need to set your user email before being able to send test emails."
msgstr "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe."
-#: admin/controller.php:116 templates/admin.php:350
+#: admin/controller.php:116 templates/admin.php:337
msgid "Send mode"
msgstr "Tryb wysyłki"
-#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144
msgid "Encryption"
msgstr "Szyfrowanie"
-#: admin/controller.php:120 templates/admin.php:387
+#: admin/controller.php:120 templates/admin.php:374
msgid "Authentication method"
msgstr "Metoda autentykacji"
@@ -114,7 +114,7 @@ msgstr "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź
#: ajax/installapp.php:18 ajax/uninstallapp.php:18
msgid "Couldn't remove app."
-msgstr ""
+msgstr "Nie można usunąć aplikacji."
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -197,7 +197,7 @@ msgstr "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownik
msgid "Unable to change password"
msgstr "Nie można zmienić hasła"
-#: js/admin.js:126
+#: js/admin.js:127
msgid "Sending..."
msgstr "Wysyłam..."
@@ -215,7 +215,7 @@ msgstr "Aktualizacja do {appversion}"
#: js/apps.js:90
msgid "Uninstall App"
-msgstr ""
+msgstr "Odinstaluj aplikację"
#: js/apps.js:96 js/apps.js:158 js/apps.js:191
msgid "Disable"
@@ -259,15 +259,15 @@ msgstr "Zaktualizowano"
#: js/apps.js:233
msgid "Uninstalling ...."
-msgstr ""
+msgstr "Odinstalowywanie...."
#: js/apps.js:236
msgid "Error while uninstalling app"
-msgstr ""
+msgstr "Błąd przy odinstalowywaniu aplikacji"
#: js/apps.js:237 templates/apps.php:56
msgid "Uninstall"
-msgstr ""
+msgstr "Odinstaluj"
#: js/personal.js:256
msgid "Select a profile picture"
@@ -321,11 +321,11 @@ msgstr "Należy podać prawidłową nazwę grupy"
msgid "deleted {groupName}"
msgstr "usunięto {groupName}"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "cofnij"
-#: js/users/users.js:37 templates/admin.php:302
+#: js/users/users.js:37 templates/admin.php:292
#: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10
#: templates/users/part.userlist.php:41
msgid "Groups"
@@ -336,36 +336,36 @@ msgstr "Grupy"
msgid "Group Admin"
msgstr "Administrator grupy"
-#: js/users/users.js:63 templates/users/part.grouplist.php:44
+#: js/users/users.js:63 templates/users/part.grouplist.php:46
#: templates/users/part.userlist.php:108
msgid "Delete"
msgstr "Usuń"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "nigdy"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
msgstr "usunięto {userName}"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "dodaj grupę"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Należy podać prawidłową nazwę użytkownika"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Błąd podczas tworzenia użytkownika"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Należy podać prawidłowe hasło"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje"
@@ -568,23 +568,23 @@ msgstr "Użyj systemowego cron-a do uruchamiania cron.php raz na 15 minut."
msgid "Sharing"
msgstr "Udostępnianie"
-#: templates/admin.php:240
+#: templates/admin.php:238
msgid "Allow apps to use the Share API"
msgstr "Zezwalaj aplikacjom na korzystanie z API udostępniania"
-#: templates/admin.php:247
+#: templates/admin.php:243
msgid "Allow users to share via link"
msgstr "Pozwól użytkownikom współdzielić przez link"
-#: templates/admin.php:251
+#: templates/admin.php:249
msgid "Enforce password protection"
msgstr "Wymuś zabezpieczenie hasłem"
-#: templates/admin.php:254
+#: templates/admin.php:252
msgid "Allow public uploads"
msgstr "Pozwól na publiczne wczytywanie"
-#: templates/admin.php:258
+#: templates/admin.php:256
msgid "Set default expiration date"
msgstr "Ustaw domyślną datę wygaśnięcia"
@@ -600,116 +600,116 @@ msgstr "dniach"
msgid "Enforce expiration date"
msgstr "Wymuś datę wygaśnięcia"
-#: templates/admin.php:276
+#: templates/admin.php:271
msgid "Allow resharing"
msgstr "Zezwalaj na ponowne udostępnianie"
-#: templates/admin.php:283
+#: templates/admin.php:276
msgid "Restrict users to only share with users in their groups"
msgstr "Ogranicz użytkowników do współdzielenia wyłącznie pomiędzy użytkownikami swoich grup"
-#: templates/admin.php:290
+#: templates/admin.php:281
msgid "Allow users to send mail notification for shared files"
msgstr "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików"
-#: templates/admin.php:297
+#: templates/admin.php:286
msgid "Exclude groups from sharing"
msgstr "Wyklucz grupy z udostępniania"
-#: templates/admin.php:308
+#: templates/admin.php:298
msgid ""
"These groups will still be able to receive shares, but not to initiate them."
msgstr "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania."
-#: templates/admin.php:316
+#: templates/admin.php:303
msgid "Security"
msgstr "Bezpieczeństwo"
-#: templates/admin.php:327
+#: templates/admin.php:314
msgid "Enforce HTTPS"
msgstr "Wymuś HTTPS"
-#: templates/admin.php:329
+#: templates/admin.php:316
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego."
-#: templates/admin.php:335
+#: templates/admin.php:322
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL."
-#: templates/admin.php:345
+#: templates/admin.php:332
msgid "Email Server"
msgstr "Serwer pocztowy"
-#: templates/admin.php:347
+#: templates/admin.php:334
msgid "This is used for sending out notifications."
msgstr "To jest używane do wysyłania powiadomień"
-#: templates/admin.php:378
+#: templates/admin.php:365
msgid "From address"
msgstr "Z adresu"
-#: templates/admin.php:379
+#: templates/admin.php:366
msgid "mail"
msgstr "mail"
-#: templates/admin.php:400
+#: templates/admin.php:387
msgid "Authentication required"
msgstr "Wymagana autoryzacja"
-#: templates/admin.php:404
+#: templates/admin.php:391
msgid "Server address"
msgstr "Adres Serwera"
-#: templates/admin.php:408
+#: templates/admin.php:395
msgid "Port"
msgstr "Port"
-#: templates/admin.php:413
+#: templates/admin.php:400
msgid "Credentials"
msgstr "Poświadczenia"
-#: templates/admin.php:414
+#: templates/admin.php:401
msgid "SMTP Username"
msgstr "Użytkownik SMTP"
-#: templates/admin.php:417
+#: templates/admin.php:404
msgid "SMTP Password"
msgstr "Hasło SMTP"
-#: templates/admin.php:421
+#: templates/admin.php:408
msgid "Test email settings"
msgstr "Ustawienia testowej wiadomości"
-#: templates/admin.php:422
+#: templates/admin.php:409
msgid "Send email"
msgstr "Wyślij email"
-#: templates/admin.php:427
+#: templates/admin.php:414
msgid "Log"
msgstr "Logi"
-#: templates/admin.php:428
+#: templates/admin.php:415
msgid "Log level"
msgstr "Poziom logów"
-#: templates/admin.php:460
+#: templates/admin.php:447
msgid "More"
msgstr "Więcej"
-#: templates/admin.php:461
+#: templates/admin.php:448
msgid "Less"
msgstr "Mniej"
-#: templates/admin.php:467 templates/personal.php:196
+#: templates/admin.php:454 templates/personal.php:196
msgid "Version"
msgstr "Wersja"
-#: templates/admin.php:471 templates/personal.php:199
+#: templates/admin.php:458 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -933,7 +933,7 @@ msgstr "Grupa"
msgid "Everyone"
msgstr "Wszyscy"
-#: templates/users/part.grouplist.php:29
+#: templates/users/part.grouplist.php:31
msgid "Admins"
msgstr "Administratorzy"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 0ba0f01c756..a23aefb0315 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Maciej Przybecki <maciej.przybecki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pl/user_webdavauth.po b/l10n/pl/user_webdavauth.po
index 5425308d943..ee25a206f54 100644
--- a/l10n/pl/user_webdavauth.po
+++ b/l10n/pl/user_webdavauth.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 07:20+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Maciej Przybecki <maciej.przybecki@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 9d7d074110d..cad61f2b119 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-16 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 14:00+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -248,75 +248,75 @@ msgstr "Redefinir senha"
msgid "Password can not be changed. Please contact your administrator."
msgstr "A senha não pode ser alterada. Por favor, contate o administrador."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Não"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Escolha"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Erro no seletor de carregamento modelo de arquivos: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Erro no carregamento de modelo de mensagem: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflito de arquivo"
msgstr[1] "{count} conflitos de arquivos"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Conflito em um arquivo"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Novos Arquivos"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Arquivos já existentes"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Qual arquivo você quer manter?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(todos os selecionados)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} selecionados)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Erro ao carregar arquivo existe modelo"
@@ -455,29 +455,29 @@ msgid "notify by email"
msgstr "notificar por e-mail"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "controle de acesso"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "criar"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "atualizar"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "remover"
-#: js/share.js:587
-msgid "share"
-msgstr "compartilhar"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Protegido com senha"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index dc6130fa683..6c1890c0248 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-16 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 14:40+0000\n"
+"POT-Creation-Date: 2014-06-26 01:54-0400\n"
+"PO-Revision-Date: 2014-06-25 15:21+0000\n"
"Last-Translator: I Robot\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 @@ msgid ""
"allowed."
msgstr "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:159
#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "A pasta de destino foi movida ou excluída."
@@ -92,54 +92,54 @@ msgstr "Impossível configurar o diretório de upload"
msgid "Invalid Token"
msgstr "Token inválido"
-#: ajax/upload.php:75
+#: ajax/upload.php:77
msgid "No file was uploaded. Unknown error"
msgstr "Nenhum arquivo foi enviado. Erro desconhecido"
-#: ajax/upload.php:82
+#: ajax/upload.php:84
msgid "There is no error, the file uploaded with success"
msgstr "Sem erros, o arquivo foi enviado com sucesso"
-#: ajax/upload.php:83
+#: ajax/upload.php:85
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: "
-#: ajax/upload.php:85
+#: ajax/upload.php:87
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML"
-#: ajax/upload.php:86
+#: ajax/upload.php:88
msgid "The uploaded file was only partially uploaded"
msgstr "O arquivo foi parcialmente enviado"
-#: ajax/upload.php:87
+#: ajax/upload.php:89
msgid "No file was uploaded"
msgstr "Nenhum arquivo enviado"
-#: ajax/upload.php:88
+#: ajax/upload.php:90
msgid "Missing a temporary folder"
msgstr "Pasta temporária não encontrada"
-#: ajax/upload.php:89
+#: ajax/upload.php:91
msgid "Failed to write to disk"
msgstr "Falha ao escrever no disco"
-#: ajax/upload.php:109
+#: ajax/upload.php:111
msgid "Not enough storage available"
msgstr "Espaço de armazenamento insuficiente"
-#: ajax/upload.php:171
+#: ajax/upload.php:173
msgid "Upload failed. Could not find uploaded file"
msgstr "Falha no envio. Não foi possível encontrar o arquivo enviado"
-#: ajax/upload.php:181
+#: ajax/upload.php:183
msgid "Upload failed. Could not get file info."
msgstr "Falha no envio. Não foi possível obter informações do arquivo."
-#: ajax/upload.php:196
+#: ajax/upload.php:198
msgid "Invalid directory."
msgstr "Diretório inválido."
@@ -181,7 +181,7 @@ msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do
msgid "URL cannot be empty"
msgstr "URL não pode estar vazia"
-#: js/file-upload.js:559 js/filelist.js:1190
+#: js/file-upload.js:559 js/filelist.js:1192
msgid "{new_name} already exists"
msgstr "{new_name} já existe"
@@ -197,19 +197,19 @@ msgstr "Não foi possível criar a pasta"
msgid "Error fetching URL"
msgstr "Erro ao buscar URL"
-#: js/fileactions.js:211
+#: js/fileactions.js:213
msgid "Share"
msgstr "Compartilhar"
-#: js/fileactions.js:224
+#: js/fileactions.js:226
msgid "Delete permanently"
msgstr "Excluir permanentemente"
-#: js/fileactions.js:226 templates/list.php:78 templates/list.php:79
+#: js/fileactions.js:228 templates/list.php:78 templates/list.php:79
msgid "Delete"
msgstr "Excluir"
-#: js/fileactions.js:262
+#: js/fileactions.js:264
msgid "Rename"
msgstr "Renomear"
@@ -219,55 +219,55 @@ msgid ""
"big."
msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes."
-#: js/filelist.js:621 js/filelist.js:1693
+#: js/filelist.js:623 js/filelist.js:1713
msgid "Pending"
msgstr "Pendente"
-#: js/filelist.js:1141
+#: js/filelist.js:1143
msgid "Error moving file."
msgstr "Erro movendo o arquivo."
-#: js/filelist.js:1149
+#: js/filelist.js:1151
msgid "Error moving file"
msgstr "Erro movendo o arquivo"
-#: js/filelist.js:1149
+#: js/filelist.js:1151
msgid "Error"
msgstr "Erro"
-#: js/filelist.js:1227
+#: js/filelist.js:1240
msgid "Could not rename file"
msgstr "Não foi possível renomear o arquivo"
-#: js/filelist.js:1348
+#: js/filelist.js:1358
msgid "Error deleting file."
msgstr "Erro eliminando o arquivo."
-#: js/filelist.js:1451 templates/list.php:62
+#: js/filelist.js:1461 templates/list.php:62
msgid "Name"
msgstr "Nome"
-#: js/filelist.js:1452 templates/list.php:73
+#: js/filelist.js:1462 templates/list.php:73
msgid "Size"
msgstr "Tamanho"
-#: js/filelist.js:1453 templates/list.php:76
+#: js/filelist.js:1463 templates/list.php:76
msgid "Modified"
msgstr "Modificado"
-#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1473 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n pasta"
msgstr[1] "%n pastas"
-#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1479 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n arquivo"
msgstr[1] "%n arquivos"
-#: js/filelist.js:1601 js/filelist.js:1640
+#: js/filelist.js:1606 js/filelist.js:1645
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Enviando %n arquivo"
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index 290d177366e..617cffeae37 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 15:50+0000\n"
+"POT-Creation-Date: 2014-06-26 01:54-0400\n"
+"PO-Revision-Date: 2014-06-25 15:01+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -210,7 +210,7 @@ msgstr "Pessoal"
msgid "System"
msgstr "Sistema"
-#: js/settings.js:318 js/settings.js:325
+#: js/settings.js:320 js/settings.js:327
msgid "Saved"
msgstr "Salvo"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index d70ef0d12f0..3e3e6acda04 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -20,21 +20,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Compartilhamento de servidor para servidor não está habilitado no servidor"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Não foi possível adicionar compartilhamento remoto"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Compartilhado com você"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Compartilhados com outros"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Compartilhado por link"
@@ -50,17 +50,17 @@ msgstr "Você ainda não compartilhou nenhum arquivo."
msgid "You haven't shared any files by link yet."
msgstr "Você ainda não compartilhou nenhum arquivo por link."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Adicionar {name} de {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Nenhuma instalação ownCloud encontrada em {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Url invalida para ownCloud"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -116,15 +116,15 @@ msgstr "Para mais informações, por favor, pergunte a pessoa que enviou este li
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Salvar em ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "example.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Salvar"
#: templates/public.php:28
msgid "Download"
@@ -140,13 +140,13 @@ msgid "Direct link"
msgstr "Link direto"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Permitir que outras instâncias montem links de compartilhamentos públicos a partir desde servidor"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Permitir aos usuários montar links públicos de compartilhamentos"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index f8d7a6fd615..a1f813e8e3f 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 10:10+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +40,7 @@ msgstr "Restaurar"
msgid "Error"
msgstr "Erro"
-#: lib/trashbin.php:857 lib/trashbin.php:859
+#: lib/trashbin.php:891 lib/trashbin.php:893
msgid "restored"
msgstr "restaurado"
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index a766e6df990..815fc3eb1be 100644
--- a/l10n/pt_BR/files_versions.po
+++ b/l10n/pt_BR/files_versions.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# tuliouel, 2013
+# Tulio Simoes Martins Padilha, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 11:40+0000\n"
-"Last-Translator: tuliouel\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 09:30+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,22 +23,22 @@ msgstr ""
msgid "Could not revert: %s"
msgstr "Impossível reverter: %s"
-#: js/versions.js:7
+#: js/versions.js:48
msgid "Versions"
msgstr "Versões"
-#: js/versions.js:53
+#: js/versions.js:70
msgid "Failed to revert {file} to revision {timestamp}."
msgstr "Falha ao reverter {file} para a revisão {timestamp}."
-#: js/versions.js:79
+#: js/versions.js:97
msgid "More versions..."
msgstr "Mais versões..."
-#: js/versions.js:116
+#: js/versions.js:135
msgid "No other versions available"
msgstr "Nenhuma outra versão disponível"
-#: js/versions.js:149
+#: js/versions.js:165
msgid "Restore"
msgstr "Restaurar"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index 40ce94c98cc..969dd3068af 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 15:11+0000\n"
+"POT-Creation-Date: 2014-06-26 01:54-0400\n"
+"PO-Revision-Date: 2014-06-25 15:01+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -19,50 +19,50 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: base.php:678
+#: base.php:673
msgid "You are accessing the server from an untrusted domain."
msgstr "Você está acessando o servidor a partir de um domínio não confiável."
-#: base.php:679
+#: base.php:674
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
"example configuration is provided in config/config.sample.php."
msgstr "Por favor, contate o administrador. Se você é um administrador desta instância, configurre o \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php."
-#: private/app.php:361
+#: private/app.php:366
msgid "Help"
msgstr "Ajuda"
-#: private/app.php:374
+#: private/app.php:379
msgid "Personal"
msgstr "Pessoal"
-#: private/app.php:385
+#: private/app.php:390
msgid "Settings"
-msgstr "Ajustes"
+msgstr "Configurações"
-#: private/app.php:397
+#: private/app.php:402
msgid "Users"
msgstr "Usuários"
-#: private/app.php:410
+#: private/app.php:415
msgid "Admin"
msgstr "Admin"
-#: private/app.php:978
+#: private/app.php:983
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Falha na atualização de \"%s\"."
-#: private/app.php:1135
+#: private/app.php:1140
#, php-format
msgid ""
"App \\\"%s\\\" can't be installed because it is not compatible with this "
"version of ownCloud."
msgstr "Aplicação \\\"%s\\\" não pode ser instalada porque não é compatível com esta versão do ownCloud."
-#: private/app.php:1147
+#: private/app.php:1152
msgid "No app name specified"
msgstr "O nome do aplicativo não foi especificado."
@@ -87,52 +87,52 @@ msgstr "Diretório App já existe"
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Não é possível criar pasta app. Corrija as permissões. %s"
-#: private/installer.php:231
+#: private/installer.php:235
msgid "No source specified when installing app"
msgstr "Nenhuma fonte foi especificada enquanto instalava o aplicativo"
-#: private/installer.php:238
+#: private/installer.php:242
msgid "No href specified when installing app from http"
-msgstr "Nenhuma href foi especificada enquanto instalava o aplicativo de httml"
+msgstr "Nenhuma href foi especificada enquanto instalava o aplicativo de http"
-#: private/installer.php:243
+#: private/installer.php:247
msgid "No path specified when installing app from local file"
msgstr "Nenhum caminho foi especificado enquanto instalava o aplicativo do arquivo local"
-#: private/installer.php:257
+#: private/installer.php:261
#, php-format
msgid "Archives of type %s are not supported"
msgstr "Arquivos do tipo %s não são suportados"
-#: private/installer.php:271
+#: private/installer.php:275
msgid "Failed to open archive when installing app"
msgstr "Falha para abrir o arquivo enquanto instalava o aplicativo"
-#: private/installer.php:309
+#: private/installer.php:313
msgid "App does not provide an info.xml file"
msgstr "O aplicativo não fornece um arquivo info.xml"
-#: private/installer.php:315
+#: private/installer.php:319
msgid "App can't be installed because of not allowed code in the App"
msgstr "O aplicativo não pode ser instalado por causa do código não permitido no Aplivativo"
-#: private/installer.php:321
+#: private/installer.php:325
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "O aplicativo não pode ser instalado porque não é compatível com esta versão do ownCloud"
-#: private/installer.php:327
+#: private/installer.php:331
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "O aplicativo não pode ser instalado porque ele contém a marca <shipped>verdadeiro</shipped> que não é permitido para aplicações não embarcadas"
-#: private/installer.php:340
+#: private/installer.php:344
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
-msgstr "O aplicativo não pode ser instalado porque a versão em info.xml /versão não é a mesma que a versão relatada na App Store"
+msgstr "O aplicativo não pode ser instalado porque a versão em info.xml/versão não é a mesma que a versão relatada na App Store"
#: private/json.php:29
msgid "Application is not enabled"
@@ -174,7 +174,7 @@ msgstr "Nome de usuário e/ou senha MS SQL inválido(s): %s"
#: private/setup/oci.php:114 private/setup/postgresql.php:31
#: private/setup/postgresql.php:84
msgid "You need to enter either an existing account or the administrator."
-msgstr "Você precisa inserir uma conta existente ou o administrador."
+msgstr "Você precisa inserir uma conta existente ou a do administrador."
#: private/setup/mysql.php:12
msgid "MySQL/MariaDB username and/or password not valid"
@@ -240,19 +240,19 @@ msgstr "Nome de usuário e/ou senha PostgreSQL inválido(s)"
#: private/setup.php:28
msgid "Set an admin username."
-msgstr "Defina um nome de usuário de administrador."
+msgstr "Defina um nome do usuário administrador."
#: private/setup.php:31
msgid "Set an admin password."
msgstr "Defina uma senha de administrador."
-#: private/setup.php:164
+#: private/setup.php:170
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
-msgstr "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada."
+msgstr "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando."
-#: private/setup.php:165
+#: private/setup.php:171
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Por favor, confira os <a href='%s'>guias de instalação</a>."
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 91033420641..b148c485bd5 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 15:21+0000\n"
+"POT-Creation-Date: 2014-06-21 01:54-0400\n"
+"PO-Revision-Date: 2014-06-20 23:50+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr "Não é possível alterar o nome completo"
#: ajax/creategroup.php:11
msgid "Group already exists"
-msgstr "Grupo já existe"
+msgstr "O Grupo já existe"
#: ajax/creategroup.php:20
msgid "Unable to add group"
@@ -151,7 +151,7 @@ msgstr "Pedido inválido"
#: ajax/togglegroups.php:12
msgid "Admins can't remove themself from the admin group"
-msgstr "Admins não podem ser removidos do grupo admin"
+msgstr "Administradores não pode remover a si mesmos do grupo de administração"
#: ajax/togglegroups.php:30
#, php-format
@@ -282,7 +282,7 @@ msgstr "Senha fraca"
#: js/personal.js:289
msgid "So-so password"
-msgstr "So-so senha"
+msgstr "Senha mais ou menos"
#: js/personal.js:290
msgid "Good password"
@@ -320,7 +320,7 @@ msgstr "Um nome de grupo válido deve ser fornecido"
msgid "deleted {groupName}"
msgstr "eliminado {groupName}"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "desfazer"
@@ -340,37 +340,37 @@ msgstr "Grupo Administrativo"
msgid "Delete"
msgstr "Excluir"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "nunca"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
msgstr "eliminado {userName}"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "adicionar grupo"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Forneça um nome de usuário válido"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Erro ao criar usuário"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Forneça uma senha válida"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Aviso: O diretório home para o usuário \"{user}\" já existe"
#: personal.php:50 personal.php:51
msgid "__language_name__"
-msgstr "Português (Brasil)"
+msgstr "__language_name__"
#: templates/admin.php:8
msgid "Everything (fatal issues, errors, warnings, info, debug)"
@@ -472,7 +472,7 @@ msgid ""
"SQLite is used as database. For larger installations we recommend to change "
"this. To migrate to another database use the command line tool: 'occ db"
":convert-type'"
-msgstr "SQLite é usada como base de dados. Para instalações grandes instalações recomendamos mudar isso. Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'occ db: converter-type'"
+msgstr "SQLite é usada como base de dados. Para grandes instalações recomendamos mudar isso. Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'occ db: converter-type'"
#: templates/admin.php:119
msgid "Module 'fileinfo' missing"
@@ -514,7 +514,7 @@ msgstr "Isso significa que pode haver problemas com certos caracteres nos nomes
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
-msgstr "Nós sugerimos para instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s."
+msgstr "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s."
#: templates/admin.php:172
msgid "Internet connection not working"
@@ -543,7 +543,7 @@ msgstr "Último cron foi executado em %s."
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
-msgstr "Última cron foi executado em %s. Isso é, mais do que uma hora atrás, algo parece errado."
+msgstr "Última cron foi executado em %s. Isso é, mais de uma hora atrás, algo parece errado."
#: templates/admin.php:203
msgid "Cron was not executed yet!"
@@ -776,11 +776,11 @@ msgstr "Suporte Comercial"
#: templates/personal.php:8
msgid "Get the apps to sync your files"
-msgstr "Faça com que os apps sincronize seus arquivos"
+msgstr "Faça com que os apps sincronizem seus arquivos"
#: templates/personal.php:19
msgid "Show First Run Wizard again"
-msgstr "Mostrar este Assistente de novo"
+msgstr "Mostrar Assistente de Primeira Execução novamente"
#: templates/personal.php:27
#, php-format
@@ -880,7 +880,7 @@ msgstr "Senha de login"
#: templates/personal.php:161
msgid "Decrypt all Files"
-msgstr "Decripti todos os Arquivos"
+msgstr "Descriptografar todos os Arquivos"
#: templates/personal.php:174
msgid ""
@@ -922,7 +922,7 @@ msgstr "Pesquisar Usuários e Grupos"
#: templates/users/part.grouplist.php:5
msgid "Add Group"
-msgstr "Adicionar grupo"
+msgstr "Adicionar Grupo"
#: templates/users/part.grouplist.php:10
msgid "Group"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index ec9a329371e..4d6af9e24e5 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-16 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 14:40+0000\n"
+"POT-Creation-Date: 2014-06-26 01:54-0400\n"
+"PO-Revision-Date: 2014-06-25 15:21+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -70,7 +70,7 @@ msgstr "Tomar parámetros de recente configuração de servidor?"
#: js/settings.js:84
msgid "Keep settings?"
-msgstr "Manter ajustes?"
+msgstr "Manter configurações?"
#: js/settings.js:93
msgid "{nthServer}. Server"
@@ -144,28 +144,28 @@ msgstr "Você quer realmente deletar as atuais Configurações de Servidor?"
msgid "Confirm Deletion"
msgstr "Confirmar Exclusão"
-#: lib/wizard.php:83 lib/wizard.php:97
+#: lib/wizard.php:97 lib/wizard.php:112
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "grupo% s encontrado"
msgstr[1] "grupos% s encontrado"
-#: lib/wizard.php:130
+#: lib/wizard.php:126
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "usuário %s encontrado"
msgstr[1] "usuários %s encontrados"
-#: lib/wizard.php:825 lib/wizard.php:837
-msgid "Invalid Host"
-msgstr "Host inválido"
-
-#: lib/wizard.php:1025
+#: lib/wizard.php:317 lib/wizard.php:1051
msgid "Could not find the desired feature"
msgstr "Não foi possível encontrar a função desejada"
+#: lib/wizard.php:858 lib/wizard.php:870
+msgid "Invalid Host"
+msgstr "Host Inválido"
+
#: settings.php:52
msgid "Server"
msgstr "Servidor"
@@ -184,7 +184,7 @@ msgstr "Filtro de Grupo"
#: templates/part.settingcontrols.php:2
msgid "Save"
-msgstr "Guardar"
+msgstr "Salvar"
#: templates/part.settingcontrols.php:4
msgid "Test Configuration"
@@ -207,7 +207,7 @@ msgstr "apenas essas classes de objetos:"
#: templates/part.wizard-groupfilter.php:17
#: templates/part.wizard-userfilter.php:17
msgid "only from those groups:"
-msgstr "apenas a partir dos grupos:"
+msgstr "apenas desses grupos:"
#: templates/part.wizard-groupfilter.php:25
#: templates/part.wizard-loginfilter.php:32
@@ -245,14 +245,14 @@ msgstr "LDAP Endereço de E-mail:"
#: templates/part.wizard-loginfilter.php:24
msgid "Other Attributes:"
-msgstr "Outros atributos:"
+msgstr "Outros Atributos:"
#: templates/part.wizard-loginfilter.php:38
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action. Example: \"uid=%%uid\""
-msgstr "Define o filtro a ser aplicado, o login é feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\""
+msgstr "Define o filtro a ser aplicado, quando o login for feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\""
#: templates/part.wizard-server.php:6
msgid "1. Server"
@@ -273,7 +273,7 @@ msgstr "Excluir Configuração"
#: templates/part.wizard-server.php:30
msgid "Host"
-msgstr "Servidor"
+msgstr "Host"
#: templates/part.wizard-server.php:31
msgid ""
@@ -361,7 +361,7 @@ msgstr "Configurações de Conexão"
#: templates/settings.php:22
msgid "Configuration Active"
-msgstr "Configuração ativa"
+msgstr "Configuração Ativa"
#: templates/settings.php:22
msgid "When unchecked, this configuration will be skipped."
@@ -369,7 +369,7 @@ msgstr "Quando não marcada, esta configuração será ignorada."
#: templates/settings.php:23
msgid "Backup (Replica) Host"
-msgstr "Servidor de Backup (Réplica)"
+msgstr "Host de Backup (Réplica)"
#: templates/settings.php:23
msgid ""
diff --git a/l10n/pt_BR/user_webdavauth.po b/l10n/pt_BR/user_webdavauth.po
index a4e8d5c8b0f..f0bbdf1f424 100644
--- a/l10n/pt_BR/user_webdavauth.po
+++ b/l10n/pt_BR/user_webdavauth.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-16 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 14:40+0000\n"
+"POT-Creation-Date: 2014-06-26 01:54-0400\n"
+"PO-Revision-Date: 2014-06-25 15:21+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index d5bf0abb725..f4fce5235d9 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -10,6 +10,7 @@
# zedascouves <duartegrilo@gmail.com>, 2013
# Fernando Moura <moura232@gmail.com>, 2014
# Goncalo Baiao <goncalo.baiao@gmail.com>, 2013
+# Gonçalo Ferreira <goncalo.ferreira@semcabo.pt>, 2014
# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
# Manuela Silva <manuela.silva@sky.com>, 2014
# Nelson Rosado <nelsontrosado@gmail.com>, 2014
@@ -18,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-16 19:03+0000\n"
-"Last-Translator: Manuela Silva <manuela.silva@sky.com>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -51,7 +52,7 @@ msgstr "Base de dados actualizada"
#: ajax/update.php:19
msgid "Checked database schema update"
-msgstr ""
+msgstr "Atualização do esquema da base de dados verificada."
#: ajax/update.php:27
#, php-format
@@ -228,14 +229,14 @@ msgstr "anos atrás"
#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175
msgid "Couldn't send reset email. Please contact your administrator."
-msgstr ""
+msgstr "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador."
#: js/lostpassword.js:5
msgid ""
"The link to reset your password has been sent to your email. If you do not "
"receive it within a reasonable amount of time, check your spam/junk "
"folders.<br>If it is not there ask your local administrator."
-msgstr ""
+msgstr "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador."
#: js/lostpassword.js:7
msgid ""
@@ -243,11 +244,11 @@ msgid ""
"will be no way to get your data back after your password is reset.<br />If "
"you are not sure what to do, please contact your administrator before you "
"continue. <br />Do you really want to continue?"
-msgstr ""
+msgstr "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?"
#: js/lostpassword.js:10
msgid "I know what I'm doing"
-msgstr ""
+msgstr "Tenho a certeza"
#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9
msgid "Reset password"
@@ -255,77 +256,77 @@ msgstr "Repor password"
#: js/lostpassword.js:16
msgid "Password can not be changed. Please contact your administrator."
-msgstr ""
+msgstr "A password não pode ser alterada. Contacte o seu administrador."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Sim"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Não"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Escolha"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Erro ao carregar o modelo de selecionador de ficheiro: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Erro ao carregar o template: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} conflicto de ficheiro"
msgstr[1] "{count} conflitos de ficheiro"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Um conflito no ficheiro"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Ficheiros Novos"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Ficheiro já existente"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Quais os ficheiros que pretende manter?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(todos seleccionados)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Erro ao carregar o modelo de existências do ficheiro"
@@ -359,7 +360,7 @@ msgstr "Partilhado por {owner}"
#: js/share.js:205
msgid "Shared with {recipients}"
-msgstr ""
+msgstr "Partilhado com {recipients}"
#: js/share.js:211
msgid "Share"
@@ -464,29 +465,29 @@ msgid "notify by email"
msgstr "Notificar por email"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "pode editar"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "Controlo de acesso"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "criar"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "actualizar"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "apagar"
-#: js/share.js:587
-msgid "share"
-msgstr "partilhar"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Protegido com palavra-passe"
@@ -557,17 +558,17 @@ msgstr "A actualização foi concluída com sucesso. Vai ser redireccionado para
#: lostpassword/controller/lostcontroller.php:110
msgid "Couldn't reset password because the token is invalid"
-msgstr ""
+msgstr "É impossível efetuar reset à password. "
#: lostpassword/controller/lostcontroller.php:136
msgid "Couldn't send reset email. Please make sure your username is correct."
-msgstr ""
+msgstr "Ocorreu um problema com o envio do e-mail, por favor confirme o seu utilizador."
#: lostpassword/controller/lostcontroller.php:151
msgid ""
"Couldn't send reset email because there is no email address for this "
"username. Please contact your administrator."
-msgstr ""
+msgstr "Ocorreu um problema com o envio do e-mail, por favor contacte o administrador."
#: lostpassword/controller/lostcontroller.php:168
#, php-format
@@ -610,7 +611,7 @@ msgstr "Nova palavra-chave"
#: lostpassword/templates/resetpassword.php:6
msgid "New Password"
-msgstr ""
+msgstr "Nova password"
#: setup/controller.php:140
#, php-format
@@ -762,7 +763,7 @@ msgstr "Configure a base de dados"
#: templates/installation.php:96
#, php-format
msgid "Only %s is available."
-msgstr ""
+msgstr "Apenas %s está disponível."
#: templates/installation.php:111 templates/installation.php:113
msgid "Database user"
@@ -788,7 +789,7 @@ msgstr "Anfitrião da base de dados"
msgid ""
"SQLite will be used as database. For larger installations we recommend to "
"change this."
-msgstr ""
+msgstr "Será usado SQLite como base de dados. Para instalações maiores é recomendável a sua alteração."
#: templates/installation.php:159
msgid "Finish setup"
@@ -838,7 +839,7 @@ msgstr "Por favor contacte o administrador."
#: templates/login.php:50
msgid "Forgot your password? Reset it!"
-msgstr ""
+msgstr "Esqueceu-se da password? Recupere-a!"
#: templates/login.php:55
msgid "remember"
@@ -895,11 +896,11 @@ msgstr "O tema %s foi desativado."
msgid ""
"Please make sure that the database, the config folder and the data folder "
"have been backed up before proceeding."
-msgstr ""
+msgstr "Por favor garanta a cópia de segurança da base de dados e das pastas 'config' e 'data' antes de prosseguir."
#: templates/update.admin.php:23
msgid "Start update"
-msgstr ""
+msgstr "Iniciar atualização"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 67255bcbda6..6f6da907029 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: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-16 18:40+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 21:01+0000\n"
"Last-Translator: Manuela Silva <manuela.silva@sky.com>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid ""
"allowed."
msgstr "Nome Inválido, Não são permitidos os carateres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*'."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:159
#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "A pasta de destino foi movida ou eliminada."
@@ -96,54 +96,54 @@ msgstr "Não foi possível criar o diretório de upload"
msgid "Invalid Token"
msgstr "Token inválido"
-#: ajax/upload.php:75
+#: ajax/upload.php:77
msgid "No file was uploaded. Unknown error"
msgstr "Não foi enviado nenhum ficheiro. Erro desconhecido"
-#: ajax/upload.php:82
+#: ajax/upload.php:84
msgid "There is no error, the file uploaded with success"
msgstr "Não ocorreram erros, o ficheiro foi enviado com sucesso"
-#: ajax/upload.php:83
+#: ajax/upload.php:85
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "O ficheiro enviado excede a diretiva php.ini upload_max_filesize no php.ini"
-#: ajax/upload.php:85
+#: ajax/upload.php:87
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "O tamanho do ficheiro enviado excede a diretiva MAX_FILE_SIZE definida no formulário HTML"
-#: ajax/upload.php:86
+#: ajax/upload.php:88
msgid "The uploaded file was only partially uploaded"
msgstr "O ficheiro submetido só foi parcialmente enviado"
-#: ajax/upload.php:87
+#: ajax/upload.php:89
msgid "No file was uploaded"
msgstr "Não foi enviado nenhum ficheiro"
-#: ajax/upload.php:88
+#: ajax/upload.php:90
msgid "Missing a temporary folder"
msgstr "A pasta temporária está em falta"
-#: ajax/upload.php:89
+#: ajax/upload.php:91
msgid "Failed to write to disk"
msgstr "Não foi possível gravar no disco"
-#: ajax/upload.php:109
+#: ajax/upload.php:111
msgid "Not enough storage available"
msgstr "Não há espaço suficiente em disco"
-#: ajax/upload.php:171
+#: ajax/upload.php:173
msgid "Upload failed. Could not find uploaded file"
msgstr "Falhou o envio. Não conseguiu encontrar o ficheiro enviado"
-#: ajax/upload.php:181
+#: ajax/upload.php:183
msgid "Upload failed. Could not get file info."
msgstr "O carregamento falhou. Não foi possível obter a informação do ficheiro."
-#: ajax/upload.php:196
+#: ajax/upload.php:198
msgid "Invalid directory."
msgstr "Diretoria inválida."
@@ -185,7 +185,7 @@ msgstr "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar
msgid "URL cannot be empty"
msgstr "URL não pode estar vazio"
-#: js/file-upload.js:559 js/filelist.js:1190
+#: js/file-upload.js:559 js/filelist.js:1192
msgid "{new_name} already exists"
msgstr "O nome {new_name} já existe"
@@ -201,19 +201,19 @@ msgstr "Não pôde criar pasta"
msgid "Error fetching URL"
msgstr "Erro ao obter URL"
-#: js/fileactions.js:211
+#: js/fileactions.js:213
msgid "Share"
msgstr "Compartilhar"
-#: js/fileactions.js:224
+#: js/fileactions.js:226
msgid "Delete permanently"
msgstr "Apagar Para Sempre"
-#: js/fileactions.js:226 templates/list.php:78 templates/list.php:79
+#: js/fileactions.js:228 templates/list.php:78 templates/list.php:79
msgid "Delete"
msgstr "Apagar"
-#: js/fileactions.js:262
+#: js/fileactions.js:264
msgid "Rename"
msgstr "Renomear"
@@ -223,55 +223,55 @@ msgid ""
"big."
msgstr "A sua transferência está a ser preparada. Isto poderá demorar algum tempo, se os seus ficheiros forem grandes."
-#: js/filelist.js:621 js/filelist.js:1693
+#: js/filelist.js:623 js/filelist.js:1713
msgid "Pending"
msgstr "Pendente"
-#: js/filelist.js:1141
+#: js/filelist.js:1143
msgid "Error moving file."
msgstr "Erro a mover o ficheiro."
-#: js/filelist.js:1149
+#: js/filelist.js:1151
msgid "Error moving file"
msgstr "Erro ao mover o ficheiro"
-#: js/filelist.js:1149
+#: js/filelist.js:1151
msgid "Error"
msgstr "Erro"
-#: js/filelist.js:1227
+#: js/filelist.js:1240
msgid "Could not rename file"
msgstr "Não pôde renomear o ficheiro"
-#: js/filelist.js:1348
+#: js/filelist.js:1358
msgid "Error deleting file."
msgstr "Erro ao apagar o ficheiro."
-#: js/filelist.js:1451 templates/list.php:62
+#: js/filelist.js:1461 templates/list.php:62
msgid "Name"
msgstr "Nome"
-#: js/filelist.js:1452 templates/list.php:73
+#: js/filelist.js:1462 templates/list.php:73
msgid "Size"
msgstr "Tamanho"
-#: js/filelist.js:1453 templates/list.php:76
+#: js/filelist.js:1463 templates/list.php:76
msgid "Modified"
msgstr "Modificado"
-#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1473 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n pasta"
msgstr[1] "%n pastas"
-#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1479 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n ficheiro"
msgstr[1] "%n ficheiros"
-#: js/filelist.js:1601 js/filelist.js:1640
+#: js/filelist.js:1606 js/filelist.js:1645
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "A carregar %n ficheiro"
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 1687ea5846a..c48a54d5bc8 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-14 01:54-0400\n"
-"PO-Revision-Date: 2014-06-14 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 17:41+0000\n"
+"Last-Translator: Fernando Moura <moura232@gmail.com>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -111,7 +111,7 @@ msgstr "Criptografia inicial em execução ... Por favor, tente novamente mais t
#: templates/invalid_private_key.php:8
#, php-format
msgid "Go directly to your %spersonal settings%s."
-msgstr ""
+msgstr "Ir directo para %sdefinições pessoais%s."
#: templates/settings-admin.php:2 templates/settings-personal.php:2
msgid "Encryption"
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 858d9e5fd66..04bdf9c0963 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-16 19:03+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 21:01+0000\n"
"Last-Translator: Manuela Silva <manuela.silva@sky.com>\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/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 0275125a2ef..c1c7c496c66 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -4,6 +4,7 @@
#
# Translators:
# zedascouves <duartegrilo@gmail.com>, 2013
+# Gonçalo Ferreira <goncalo.ferreira@semcabo.pt>, 2014
# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
# Manuela Silva <manuela.silva@sky.com>, 2014
# Manuel Oliveira <manuel.oliveira@gmail.com>, 2013
@@ -13,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -25,21 +26,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "A partilha entre servidores não se encontra disponível"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Ocorreu um erro ao adicionar a partilha remota"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Partilhado consigo "
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Partilhado com outros"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Partilhado pela hiperligação"
@@ -55,17 +56,17 @@ msgstr "Ainda não partilhou quaisquer ficheiros."
msgid "You haven't shared any files by link yet."
msgstr "Ainda não partilhou quaisquer ficheiros por hiperligação."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Adicionar {name} de {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Não foi encontrada uma instalação em {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Endereço errado"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -121,15 +122,15 @@ msgstr "Para mais informação, por favor, pergunte à pessoa que lhe enviou est
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Guardar na ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "exemplo.pt/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Guardar"
#: templates/public.php:28
msgid "Download"
@@ -145,13 +146,13 @@ msgid "Direct link"
msgstr "Hiperligação direta"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Permitir que outras instâncias mapeiem endereços partilhados deste servidor"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Permitir mapeamentos de endereços partilhados aos utilizadores"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index c1054db40f5..d1158af0496 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 21:01+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -57,15 +57,15 @@ msgstr "E-mail enviado"
msgid "You need to set your user email before being able to send test emails."
msgstr "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste"
-#: admin/controller.php:116 templates/admin.php:350
+#: admin/controller.php:116 templates/admin.php:337
msgid "Send mode"
msgstr "Modo de envio"
-#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144
msgid "Encryption"
msgstr "Encriptação"
-#: admin/controller.php:120 templates/admin.php:387
+#: admin/controller.php:120 templates/admin.php:374
msgid "Authentication method"
msgstr "Método de autenticação"
@@ -203,7 +203,7 @@ msgstr "Não foi possível alterar a sua palavra-passe, mas a chave de encripta
msgid "Unable to change password"
msgstr "Não foi possível alterar a sua password"
-#: js/admin.js:126
+#: js/admin.js:127
msgid "Sending..."
msgstr "A enviar..."
@@ -327,11 +327,11 @@ msgstr "Um nome válido do grupo tem de ser fornecido"
msgid "deleted {groupName}"
msgstr "apagar {Nome do grupo}"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "desfazer"
-#: js/users/users.js:37 templates/admin.php:302
+#: js/users/users.js:37 templates/admin.php:292
#: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10
#: templates/users/part.userlist.php:41
msgid "Groups"
@@ -342,36 +342,36 @@ msgstr "Grupos"
msgid "Group Admin"
msgstr "Grupo Administrador"
-#: js/users/users.js:63 templates/users/part.grouplist.php:44
+#: js/users/users.js:63 templates/users/part.grouplist.php:46
#: templates/users/part.userlist.php:108
msgid "Delete"
msgstr "Eliminar"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "nunca"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
msgstr "apagar{utilizador}"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "Adicionar grupo"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Um nome de utilizador válido deve ser fornecido"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Erro a criar utilizador"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Uma password válida deve ser fornecida"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Atenção: a pasta pessoal do utilizador \"{user}\" já existe"
@@ -574,23 +574,23 @@ msgstr "Use o serviço cron do sistema para chamar o ficheiro cron.php a cada 15
msgid "Sharing"
msgstr "Partilha"
-#: templates/admin.php:240
+#: templates/admin.php:238
msgid "Allow apps to use the Share API"
msgstr "Permitir que os utilizadores usem a API de partilha"
-#: templates/admin.php:247
+#: templates/admin.php:243
msgid "Allow users to share via link"
msgstr "Permitir que os utilizadores partilhem através do link"
-#: templates/admin.php:251
+#: templates/admin.php:249
msgid "Enforce password protection"
msgstr "Forçar protecção da palavra passe"
-#: templates/admin.php:254
+#: templates/admin.php:252
msgid "Allow public uploads"
msgstr "Permitir Envios Públicos"
-#: templates/admin.php:258
+#: templates/admin.php:256
msgid "Set default expiration date"
msgstr "Especificar a data padrão de expiração"
@@ -606,116 +606,116 @@ msgstr "dias"
msgid "Enforce expiration date"
msgstr "Forçar a data de expiração"
-#: templates/admin.php:276
+#: templates/admin.php:271
msgid "Allow resharing"
msgstr "Permitir repartilha"
-#: templates/admin.php:283
+#: templates/admin.php:276
msgid "Restrict users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:290
+#: templates/admin.php:281
msgid "Allow users to send mail notification for shared files"
msgstr "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados"
-#: templates/admin.php:297
+#: templates/admin.php:286
msgid "Exclude groups from sharing"
msgstr "Excluir grupos das partilhas"
-#: templates/admin.php:308
+#: templates/admin.php:298
msgid ""
"These groups will still be able to receive shares, but not to initiate them."
msgstr "Estes grupos poderão receber partilhas, mas não poderão iniciá-las."
-#: templates/admin.php:316
+#: templates/admin.php:303
msgid "Security"
msgstr "Segurança"
-#: templates/admin.php:327
+#: templates/admin.php:314
msgid "Enforce HTTPS"
msgstr "Forçar HTTPS"
-#: templates/admin.php:329
+#: templates/admin.php:316
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Forçar os clientes a ligar a %s através de uma ligação encriptada"
-#: templates/admin.php:335
+#: templates/admin.php:322
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL"
-#: templates/admin.php:345
+#: templates/admin.php:332
msgid "Email Server"
msgstr "Servidor de email"
-#: templates/admin.php:347
+#: templates/admin.php:334
msgid "This is used for sending out notifications."
msgstr "Isto é utilizado para enviar notificações"
-#: templates/admin.php:378
+#: templates/admin.php:365
msgid "From address"
msgstr "Do endereço"
-#: templates/admin.php:379
+#: templates/admin.php:366
msgid "mail"
msgstr "Correio"
-#: templates/admin.php:400
+#: templates/admin.php:387
msgid "Authentication required"
msgstr "Autenticação necessária"
-#: templates/admin.php:404
+#: templates/admin.php:391
msgid "Server address"
msgstr "Endereço do servidor"
-#: templates/admin.php:408
+#: templates/admin.php:395
msgid "Port"
msgstr "Porto"
-#: templates/admin.php:413
+#: templates/admin.php:400
msgid "Credentials"
msgstr "Credenciais"
-#: templates/admin.php:414
+#: templates/admin.php:401
msgid "SMTP Username"
msgstr "Nome de utilizador SMTP"
-#: templates/admin.php:417
+#: templates/admin.php:404
msgid "SMTP Password"
msgstr "Password SMTP"
-#: templates/admin.php:421
+#: templates/admin.php:408
msgid "Test email settings"
msgstr "Testar configurações de email"
-#: templates/admin.php:422
+#: templates/admin.php:409
msgid "Send email"
msgstr "Enviar email"
-#: templates/admin.php:427
+#: templates/admin.php:414
msgid "Log"
msgstr "Registo"
-#: templates/admin.php:428
+#: templates/admin.php:415
msgid "Log level"
msgstr "Nível do registo"
-#: templates/admin.php:460
+#: templates/admin.php:447
msgid "More"
msgstr "Mais"
-#: templates/admin.php:461
+#: templates/admin.php:448
msgid "Less"
msgstr "Menos"
-#: templates/admin.php:467 templates/personal.php:196
+#: templates/admin.php:454 templates/personal.php:196
msgid "Version"
msgstr "Versão"
-#: templates/admin.php:471 templates/personal.php:199
+#: templates/admin.php:458 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -939,7 +939,7 @@ msgstr "Grupo"
msgid "Everyone"
msgstr "Para todos"
-#: templates/users/part.grouplist.php:29
+#: templates/users/part.grouplist.php:31
msgid "Admins"
msgstr "Administrador"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 9721df52bda..52c2bd0cc25 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -6,15 +6,16 @@
# Bruno Martins <inactive+skorzen@transifex.com>, 2013
# Carlos Moreira <crolidge@gmail.com>, 2014
# Daniel Pinto <daniel@mouxy.net>, 2013
+# Fernando Moura <moura232@gmail.com>, 2014
# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
# Andrew_Melim <nokostya.translation@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-16 19:03+0000\n"
-"Last-Translator: Andrew_Melim <nokostya.translation@gmail.com>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 21:01+0000\n"
+"Last-Translator: Fernando Moura <moura232@gmail.com>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -133,11 +134,11 @@ msgstr "Selecionar atributos"
#: js/settings.js:848
msgid "Connection test succeeded"
-msgstr "Teste de conecção passado com sucesso."
+msgstr "Teste de ligação com sucesso."
#: js/settings.js:855
msgid "Connection test failed"
-msgstr "Erro no teste de conecção."
+msgstr "Erro no teste de ligação."
#: js/settings.js:864
msgid "Do you really want to delete the current Server Configuration?"
@@ -147,28 +148,28 @@ msgstr "Deseja realmente apagar as configurações de servidor actuais?"
msgid "Confirm Deletion"
msgstr "Confirmar a operação de apagar"
-#: lib/wizard.php:83 lib/wizard.php:97
+#: lib/wizard.php:97 lib/wizard.php:112
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] "%s grupo encontrado"
msgstr[1] "%s grupos encontrados"
-#: lib/wizard.php:130
+#: lib/wizard.php:126
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] "%s utilizador encontrado"
msgstr[1] "%s utilizadores encontrados"
-#: lib/wizard.php:825 lib/wizard.php:837
-msgid "Invalid Host"
-msgstr "Hospedeiro Inválido"
-
-#: lib/wizard.php:1025
+#: lib/wizard.php:317 lib/wizard.php:1051
msgid "Could not find the desired feature"
msgstr "Não se encontrou a função desejada"
+#: lib/wizard.php:858 lib/wizard.php:870
+msgid "Invalid Host"
+msgstr "Hospedeiro Inválido"
+
#: settings.php:52
msgid "Server"
msgstr "Servidor"
@@ -200,7 +201,7 @@ msgstr "Ajuda"
#: templates/part.wizard-groupfilter.php:4
#, php-format
msgid "Groups meeting these criteria are available in %s:"
-msgstr ""
+msgstr "Grupos que satisfazerem estes critérios estão disponíveis em %s:"
#: templates/part.wizard-groupfilter.php:8
#: templates/part.wizard-userfilter.php:8
@@ -236,7 +237,7 @@ msgstr "grupos encontrados"
#: templates/part.wizard-loginfilter.php:4
msgid "Users login with this attribute:"
-msgstr ""
+msgstr "Utilizadores entrar com este atributo:"
#: templates/part.wizard-loginfilter.php:8
msgid "LDAP Username:"
@@ -405,7 +406,7 @@ msgstr "Desligar a validação de certificado SSL."
msgid ""
"Not recommended, use it for testing only! If connection only works with this"
" option, import the LDAP server's SSL certificate in your %s server."
-msgstr ""
+msgstr "Não recomendado, use-o somente para teste! ligação só funciona com esta opção, importar o certificado SSL do servidor LDAP para o seu servidor %s."
#: templates/settings.php:28
msgid "Cache Time-To-Live"
@@ -469,24 +470,24 @@ msgstr "Associar utilizador ao grupo."
#: templates/settings.php:39
msgid "Nested Groups"
-msgstr ""
+msgstr "Grupos agrupados"
#: templates/settings.php:39
msgid ""
"When switched on, groups that contain groups are supported. (Only works if "
"the group member attribute contains DNs.)"
-msgstr ""
+msgstr "Quando habilitado os grupos, os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)"
#: templates/settings.php:40
msgid "Paging chunksize"
-msgstr ""
+msgstr "Bloco de paginação"
#: templates/settings.php:40
msgid ""
"Chunksize used for paged LDAP searches that may return bulky results like "
"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
"those situations.)"
-msgstr ""
+msgstr "Tamanho do bloco usado para pesquisas LDAP paginados que podem retornar resultados volumosos como utilizador ou grupo de enumeração. (Defini-lo 0 desactiva paginada das pesquisas LDAP nessas situações.)"
#: templates/settings.php:42
msgid "Special Attributes"
diff --git a/l10n/pt_PT/user_webdavauth.po b/l10n/pt_PT/user_webdavauth.po
index 859cf30c542..d2f479cface 100644
--- a/l10n/pt_PT/user_webdavauth.po
+++ b/l10n/pt_PT/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 13:40+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 73ec0186060..7bf19da6549 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -254,76 +254,76 @@ msgstr "Resetează parola"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nu"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Alege"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Un conflict de fișier"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Ce fișiere vrei să păstrezi?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Anulare"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Continuă"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -462,29 +462,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "poate edita"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "control acces"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "creare"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "actualizare"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "ștergere"
-#: js/share.js:587
-msgid "share"
-msgstr "partajare"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Protejare cu parolă"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 3f9acd0a4f0..09a4d5f96e6 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -10,15 +10,16 @@
# Dumitru Ursu <dima@ceata.org>, 2013
# ina <ina.c.ina@gmail.com>, 2013
# laura berindei <lauraagavriloae@yahoo.com>, 2014
+# Liana Ioana Tascau <lianatascau@yahoo.com>, 2014
# Popescu Ionut <ripkid666@gmail.com>, 2013
# Sergiu Sechel <sergiu.sechel@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-21 01:54-0400\n"
+"PO-Revision-Date: 2014-06-20 21:20+0000\n"
+"Last-Translator: Liana Ioana Tascau <lianatascau@yahoo.com>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +52,7 @@ msgid ""
"allowed."
msgstr "Nume nevalide, '\\', '/', '<', '>', ':', '\"', '|', '?' și '*' nu sunt permise."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:159
#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Dosarul țintă a fost mutat sau șters."
@@ -97,54 +98,54 @@ msgstr "Imposibil de a seta directorul pentru incărcare."
msgid "Invalid Token"
msgstr "Jeton Invalid"
-#: ajax/upload.php:75
+#: ajax/upload.php:77
msgid "No file was uploaded. Unknown error"
msgstr "Niciun fișier nu a fost încărcat. Eroare necunoscută"
-#: ajax/upload.php:82
+#: ajax/upload.php:84
msgid "There is no error, the file uploaded with success"
msgstr "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes"
-#: ajax/upload.php:83
+#: ajax/upload.php:85
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Fișierul încărcat depășește directiva upload_max_filesize din php.ini:"
-#: ajax/upload.php:85
+#: ajax/upload.php:87
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Fișierul încărcat depășește directiva MAX_FILE_SIZE specificată în formularul HTML"
-#: ajax/upload.php:86
+#: ajax/upload.php:88
msgid "The uploaded file was only partially uploaded"
msgstr "Fișierul a fost încărcat doar parțial"
-#: ajax/upload.php:87
+#: ajax/upload.php:89
msgid "No file was uploaded"
msgstr "Nu a fost încărcat niciun fișier"
-#: ajax/upload.php:88
+#: ajax/upload.php:90
msgid "Missing a temporary folder"
msgstr "Lipsește un dosar temporar"
-#: ajax/upload.php:89
+#: ajax/upload.php:91
msgid "Failed to write to disk"
msgstr "Eroare la scrierea pe disc"
-#: ajax/upload.php:109
+#: ajax/upload.php:111
msgid "Not enough storage available"
msgstr "Nu este disponibil suficient spațiu"
-#: ajax/upload.php:171
+#: ajax/upload.php:173
msgid "Upload failed. Could not find uploaded file"
msgstr "Încărcare eșuată. Nu se poate găsi fișierul încărcat"
-#: ajax/upload.php:181
+#: ajax/upload.php:183
msgid "Upload failed. Could not get file info."
msgstr "Încărcare eșuată. Nu se pot obține informații despre fișier."
-#: ajax/upload.php:196
+#: ajax/upload.php:198
msgid "Invalid directory."
msgstr "Dosar nevalid."
@@ -154,7 +155,7 @@ msgstr "Fișiere"
#: appinfo/app.php:27
msgid "All files"
-msgstr ""
+msgstr "Toate fișierele."
#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
@@ -186,7 +187,7 @@ msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerup
msgid "URL cannot be empty"
msgstr "URL nu poate fi gol"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} există deja"
@@ -224,57 +225,57 @@ msgid ""
"big."
msgstr "Se pregătește descărcarea. Aceasta poate dura ceva timp dacă fișierele sunt mari."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1703
msgid "Pending"
msgstr "În așteptare"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Eroare la mutarea fișierului."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Eroare la mutarea fișierului"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Eroare"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Nu s-a putut redenumi fisierul"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Eroare la ștergerea fisierului."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Nume"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Mărime"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Modificat"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n director"
msgstr[1] "%n directoare"
msgstr[2] "%n directoare"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n fișier"
msgstr[1] "%n fișiere"
msgstr[2] "%n fișiere"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1596 js/filelist.js:1635
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Se încarcă %n fișier."
@@ -409,4 +410,4 @@ msgstr "Fișierele sunt scanate, te rog așteaptă."
#: templates/list.php:102
msgid "Currently scanning"
-msgstr ""
+msgstr "Acum scaneaza"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index c1705372cd6..5598d3223d0 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -50,7 +50,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -124,7 +124,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Salvează"
#: templates/public.php:28
msgid "Download"
@@ -140,7 +140,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index b83f18c51ce..45dbf15a2ba 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ro/user_webdavauth.po b/l10n/ro/user_webdavauth.po
index 76a8bb2ee96..d3a5edac695 100644
--- a/l10n/ro/user_webdavauth.po
+++ b/l10n/ro/user_webdavauth.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index e8b54f0f9bf..85b3b3bf46b 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -12,7 +12,7 @@
# BuxarNET <buxarnet@gmail.com>, 2014
# Evgenij Spitsyn <evgeniy@spitsyn.net>, 2013
# Gennady <mxiru@mail.ru>, 2014
-# jekader <jekader@gmail.com>, 2013
+# jekader <jekader@gmail.com>, 2013-2014
# Kalinkin Alex <insider.junk@gmail.com>, 2013
# Pavel P. Zabortsev <ppz2001@mail.ru>, 2014
# Simon Tushev, 2013
@@ -27,13 +27,14 @@
# Вячеслав <s@neola.ru>, 2013
# Денис <denstarr@mail.md>, 2013
# Дмитрий <langaru@gmail.com>, 2013
+# Михаил Маслиёв <misha.masliev@yandex.ru>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 23:30+0000\n"
-"Last-Translator: Vladimir Sapronov <vladimir.sapronov@gmail.com>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -64,7 +65,7 @@ msgstr "База данных обновлена"
#: ajax/update.php:19
msgid "Checked database schema update"
-msgstr ""
+msgstr "Проверено обновление схемы БД"
#: ajax/update.php:27
#, php-format
@@ -193,7 +194,7 @@ msgstr "Сохранение..."
#: js/js.js:1276
msgid "seconds ago"
-msgstr "несколько секунд назад"
+msgstr "только что"
#: js/js.js:1277
msgid "%n minute ago"
@@ -226,7 +227,7 @@ msgstr[2] "%n дней назад"
#: js/js.js:1282
msgid "last month"
-msgstr "в прошлом месяце"
+msgstr "месяц назад"
#: js/js.js:1283
msgid "%n month ago"
@@ -237,7 +238,7 @@ msgstr[2] "%n месяцев назад"
#: js/js.js:1284
msgid "last year"
-msgstr "в прошлом году"
+msgstr "год назад"
#: js/js.js:1285
msgid "years ago"
@@ -252,7 +253,7 @@ msgid ""
"The link to reset your password has been sent to your email. If you do not "
"receive it within a reasonable amount of time, check your spam/junk "
"folders.<br>If it is not there ask your local administrator."
-msgstr ""
+msgstr "Ссылка для восстановления пароля была отправлена на вашу почту. Если вы не получили её, проверьте папку спама.<br>Если там письма со ссылкой нет, то обратитесь к локальному администратору."
#: js/lostpassword.js:7
msgid ""
@@ -260,7 +261,7 @@ msgid ""
"will be no way to get your data back after your password is reset.<br />If "
"you are not sure what to do, please contact your administrator before you "
"continue. <br />Do you really want to continue?"
-msgstr ""
+msgstr "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к локальному администратору.<br />Вытдействительно хотите продолжить?"
#: js/lostpassword.js:10
msgid "I know what I'm doing"
@@ -274,76 +275,76 @@ msgstr "Сбросить пароль"
msgid "Password can not be changed. Please contact your administrator."
msgstr "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Нет"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Выбрать"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Ошибка при загрузке шаблона выбора файлов: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ок"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Ошибка загрузки шаблона сообщений: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} конфликт в файлах"
msgstr[1] "{count} конфликта в файлах"
msgstr[2] "{count} конфликтов в файлах"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Один конфликт в файлах"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Новые файлы"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Существующие файлы"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Какие файлы вы хотите сохранить?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "При выборе обоих версий, к названию копируемого файла будет добавлена цифра"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Отменить"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Продолжить"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(выбраны все)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} выбрано)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Ошибка при загрузке шаблона существующего файла"
@@ -377,7 +378,7 @@ msgstr "Доступ открыл {owner}"
#: js/share.js:205
msgid "Shared with {recipients}"
-msgstr ""
+msgstr "Доступ открыт {recipients}"
#: js/share.js:211
msgid "Share"
@@ -482,29 +483,29 @@ msgid "notify by email"
msgstr "уведомить по почте"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "может редактировать"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "контроль доступа"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "создать"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "обновить"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "удалить"
-#: js/share.js:587
-msgid "share"
-msgstr "открыть доступ"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Защищено паролем"
@@ -575,7 +576,7 @@ msgstr "Обновление прошло успешно. Перенаправл
#: lostpassword/controller/lostcontroller.php:110
msgid "Couldn't reset password because the token is invalid"
-msgstr ""
+msgstr "Невозможно сбросить пароль потому, что ключ неправильный"
#: lostpassword/controller/lostcontroller.php:136
msgid "Couldn't send reset email. Please make sure your username is correct."
@@ -585,7 +586,7 @@ msgstr "Не удалось отправить письмо для сброса
msgid ""
"Couldn't send reset email because there is no email address for this "
"username. Please contact your administrator."
-msgstr ""
+msgstr "Невозможно отправить письмо для сброса пароля, т.к. у вашего аккаунта не прописан адрес почты. Пожалуйста, свяжитесь с администратором."
#: lostpassword/controller/lostcontroller.php:168
#, php-format
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 5ca281dd649..5e28f82e06f 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -18,13 +18,14 @@
# Yuriy Malyovaniy <yuriy.malyovaniy@gmail.com>, 2013
# Алексей <hackproof.ai@gmail.com>, 2013
# Антон <antonshramko@yandex.ru>, 2013
+# Михаил Маслиёв <misha.masliev@yandex.ru>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 10:50+0000\n"
+"Last-Translator: Михаил Маслиёв <misha.masliev@yandex.ru>\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"
@@ -57,7 +58,7 @@ msgid ""
"allowed."
msgstr "Неправильное имя: символы '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:159
#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Целевой каталог был перемещен или удален."
@@ -103,54 +104,54 @@ msgstr "Не удалось установить каталог загрузки
msgid "Invalid Token"
msgstr "Недопустимый маркер"
-#: ajax/upload.php:75
+#: ajax/upload.php:77
msgid "No file was uploaded. Unknown error"
msgstr "Файл не был загружен. Неизвестная ошибка"
-#: ajax/upload.php:82
+#: ajax/upload.php:84
msgid "There is no error, the file uploaded with success"
msgstr "Файл загружен успешно."
-#: ajax/upload.php:83
+#: ajax/upload.php:85
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Файл превышает размер, установленный параметром upload_max_filesize в php.ini:"
-#: ajax/upload.php:85
+#: ajax/upload.php:87
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Загруженный файл превышает размер, установленный параметром MAX_FILE_SIZE в HTML-форме"
-#: ajax/upload.php:86
+#: ajax/upload.php:88
msgid "The uploaded file was only partially uploaded"
msgstr "Файл загружен лишь частично"
-#: ajax/upload.php:87
+#: ajax/upload.php:89
msgid "No file was uploaded"
msgstr "Ни одного файла загружено не было"
-#: ajax/upload.php:88
+#: ajax/upload.php:90
msgid "Missing a temporary folder"
msgstr "Отсутствует временный каталог"
-#: ajax/upload.php:89
+#: ajax/upload.php:91
msgid "Failed to write to disk"
msgstr "Ошибка записи на диск"
-#: ajax/upload.php:109
+#: ajax/upload.php:111
msgid "Not enough storage available"
msgstr "Недостаточно доступного места в хранилище"
-#: ajax/upload.php:171
+#: ajax/upload.php:173
msgid "Upload failed. Could not find uploaded file"
msgstr "Загрузка не удалась. Невозможно найти загружаемый файл"
-#: ajax/upload.php:181
+#: ajax/upload.php:183
msgid "Upload failed. Could not get file info."
msgstr "Загрузка не удалась. Невозможно получить информацию о файле"
-#: ajax/upload.php:196
+#: ajax/upload.php:198
msgid "Invalid directory."
msgstr "Неверный каталог."
@@ -192,7 +193,7 @@ msgstr "Идёт загрузка файла. Покинув страницу,
msgid "URL cannot be empty"
msgstr "Ссылка не может быть пустой."
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1192
msgid "{new_name} already exists"
msgstr "{new_name} уже существует"
@@ -208,19 +209,19 @@ msgstr "Не удалось создать каталог"
msgid "Error fetching URL"
msgstr "Ошибка получения URL"
-#: js/fileactions.js:211
+#: js/fileactions.js:213
msgid "Share"
msgstr "Открыть доступ"
-#: js/fileactions.js:224
+#: js/fileactions.js:226
msgid "Delete permanently"
msgstr "Удалить окончательно"
-#: js/fileactions.js:226 templates/list.php:78 templates/list.php:79
+#: js/fileactions.js:228 templates/list.php:78 templates/list.php:79
msgid "Delete"
msgstr "Удалить"
-#: js/fileactions.js:262
+#: js/fileactions.js:264
msgid "Rename"
msgstr "Переименовать"
@@ -230,57 +231,57 @@ msgid ""
"big."
msgstr "Идёт подготовка к скачиванию. Это может занять некоторое время, если файлы большого размера."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:623 js/filelist.js:1713
msgid "Pending"
msgstr "Ожидание"
-#: js/filelist.js:1139
+#: js/filelist.js:1143
msgid "Error moving file."
msgstr "Ошибка перемещения файла."
-#: js/filelist.js:1147
+#: js/filelist.js:1151
msgid "Error moving file"
msgstr "Ошибка при перемещении файла"
-#: js/filelist.js:1147
+#: js/filelist.js:1151
msgid "Error"
msgstr "Ошибка"
-#: js/filelist.js:1225
+#: js/filelist.js:1240
msgid "Could not rename file"
msgstr "Не удалось переименовать файл"
-#: js/filelist.js:1346
+#: js/filelist.js:1358
msgid "Error deleting file."
msgstr "Ошибка при удалении файла."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1461 templates/list.php:62
msgid "Name"
msgstr "Имя"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1462 templates/list.php:73
msgid "Size"
msgstr "Размер"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1463 templates/list.php:76
msgid "Modified"
-msgstr "Дата изменения"
+msgstr "Изменён"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1473 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n каталог"
msgstr[1] "%n каталога"
msgstr[2] "%n каталогов"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1479 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n файл"
msgstr[1] "%n файла"
msgstr[2] "%n файлов"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1606 js/filelist.js:1645
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Закачка %n файла"
@@ -330,7 +331,7 @@ msgstr "%s не может быть переименован"
#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
-msgstr "Загружено (max. %s)"
+msgstr "Загрузка (Максимум: %s)"
#: templates/admin.php:6
msgid "File handling"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 7df73eff3c3..bf14a007080 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -3,17 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Alexander Savchenko <a.v.savchenko@mail.ru>, 2014
# BuxarNET <buxarnet@gmail.com>, 2014
# anshibanov <shibanovan@yandex.ru>, 2014
# Swab <swab@i.ua>, 2014
# viskubov <viskubov@gmail.com>, 2014
+# Михаил Маслиёв <misha.masliev@yandex.ru>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 15:02+0000\n"
+"Last-Translator: Михаил Маслиёв <misha.masliev@yandex.ru>\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"
@@ -43,7 +45,7 @@ msgstr "Ключ"
#: appinfo/app.php:55
msgid "Secret"
-msgstr ""
+msgstr "Секрет"
#: appinfo/app.php:56 appinfo/app.php:65
msgid "Bucket"
@@ -213,7 +215,7 @@ msgstr "Личное"
msgid "System"
msgstr ""
-#: js/settings.js:318 js/settings.js:325
+#: js/settings.js:320 js/settings.js:327
msgid "Saved"
msgstr "Сохранено"
@@ -237,18 +239,18 @@ msgstr "<b>Примечание:</b> Поддержка cURL в PHP не вкл
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Обратите внимание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору."
#: lib/config.php:739
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
" ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Обратите внимание:</b> \"%s\" не установлен. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору."
#: templates/list.php:7
msgid "You don't have any external storages"
-msgstr ""
+msgstr "У вас нет внешних хранилищ"
#: templates/list.php:16
msgid "Name"
@@ -256,7 +258,7 @@ msgstr "Имя"
#: templates/list.php:20
msgid "Storage type"
-msgstr ""
+msgstr "Тип хранилища"
#: templates/list.php:23
msgid "Scope"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index bc49226ebe9..4d9a0be9e2e 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -10,12 +10,13 @@
# Victor Bravo <>, 2013
# Void Ayanami <hex.void@gmail.com>, 2013
# Денис <denstarr@mail.md>, 2013
+# Михаил Маслиёв <misha.masliev@yandex.ru>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -32,21 +33,21 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
-msgstr ""
+msgstr "Опубликованы вами"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
-msgstr ""
+msgstr "Опубликованы другими"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
#: js/app.js:35
msgid "No files have been shared with you yet."
-msgstr ""
+msgstr "Вы ещё не опубликовали файлы"
#: js/app.js:54
msgid "You haven't shared any files yet."
@@ -56,7 +57,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -94,7 +95,7 @@ msgstr "Имя"
#: templates/list.php:20
msgid "Share time"
-msgstr ""
+msgstr "Дата публикации"
#: templates/part.404.php:3
msgid "Sorry, this link doesn’t seem to work anymore."
@@ -130,7 +131,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Сохранить"
#: templates/public.php:28
msgid "Download"
@@ -146,7 +147,7 @@ msgid "Direct link"
msgstr "Прямая ссылка"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index df100c6f348..948b38d1b90 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -11,13 +11,14 @@
# Victor Ashirov <victor.ashirov@gmail.com>, 2013
# Yuriy Malyovaniy <yuriy.malyovaniy@gmail.com>, 2013
# Антон <antonshramko@yandex.ru>, 2013
+# Михаил Маслиёв <misha.masliev@yandex.ru>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 17:51+0000\n"
+"Last-Translator: Михаил Маслиёв <misha.masliev@yandex.ru>\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"
@@ -25,50 +26,50 @@ 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"
-#: base.php:678
+#: base.php:673
msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "Вы пытаетесь получить доступ к серверу с неподтверждённого домена."
-#: base.php:679
+#: base.php:674
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
"example configuration is provided in config/config.sample.php."
-msgstr ""
+msgstr "Пожалуйста, свяжитесь с администратором. Если вы администратор этого хранилища, сконфигурируйте \"trusted_domain\" в config/config.php. Пример настройки можно найти в /config/config.sample.php."
-#: private/app.php:361
+#: private/app.php:366
msgid "Help"
msgstr "Помощь"
-#: private/app.php:374
+#: private/app.php:379
msgid "Personal"
msgstr "Личное"
-#: private/app.php:385
+#: private/app.php:390
msgid "Settings"
msgstr "Конфигурация"
-#: private/app.php:397
+#: private/app.php:402
msgid "Users"
msgstr "Пользователи"
-#: private/app.php:410
+#: private/app.php:415
msgid "Admin"
-msgstr "Admin"
+msgstr "Администрирование"
-#: private/app.php:978
+#: private/app.php:987
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr "Не смог обновить \"%s\"."
-#: private/app.php:1135
+#: private/app.php:1144
#, php-format
msgid ""
"App \\\"%s\\\" can't be installed because it is not compatible with this "
"version of ownCloud."
-msgstr ""
+msgstr "Невозможно установить приложение \\\"%s\\\", т.к. оно несовместимо с этой версией ownCloud."
-#: private/app.php:1147
+#: private/app.php:1156
msgid "No app name specified"
msgstr "Не выбрано имя приложения"
@@ -93,48 +94,48 @@ msgstr "Папка приложения уже существует"
msgid "Can't create app folder. Please fix permissions. %s"
msgstr "Не удалось создать директорию. Исправьте права доступа. %s"
-#: private/installer.php:231
+#: private/installer.php:235
msgid "No source specified when installing app"
msgstr "Не указан источник при установке приложения"
-#: private/installer.php:238
+#: private/installer.php:242
msgid "No href specified when installing app from http"
msgstr "Не указан атрибут href при установке приложения через http"
-#: private/installer.php:243
+#: private/installer.php:247
msgid "No path specified when installing app from local file"
msgstr "Не указан путь при установке приложения из локального файла"
-#: private/installer.php:257
+#: private/installer.php:261
#, php-format
msgid "Archives of type %s are not supported"
msgstr "Архивы %s не поддерживаются"
-#: private/installer.php:271
+#: private/installer.php:275
msgid "Failed to open archive when installing app"
msgstr "Не возможно открыть архив при установке приложения"
-#: private/installer.php:309
+#: private/installer.php:313
msgid "App does not provide an info.xml file"
msgstr "Приложение не имеет файла info.xml"
-#: private/installer.php:315
+#: private/installer.php:319
msgid "App can't be installed because of not allowed code in the App"
msgstr "Приложение невозможно установить. В нем содержится запрещенный код."
-#: private/installer.php:321
+#: private/installer.php:325
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr "Приложение невозможно установить. Не совместимо с текущей версией ownCloud."
-#: private/installer.php:327
+#: private/installer.php:331
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr "Приложение невозможно установить. Оно содержит параметр <shipped>true</shipped> который не допустим для приложений, не входящих в поставку."
-#: private/installer.php:340
+#: private/installer.php:344
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
@@ -252,13 +253,13 @@ msgstr "Установить имя пользователя для admin."
msgid "Set an admin password."
msgstr "становит пароль для admin."
-#: private/setup.php:164
+#: private/setup.php:170
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV."
-#: private/setup.php:165
+#: private/setup.php:171
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
@@ -272,12 +273,12 @@ msgstr "%s поделился »%s« с вами"
#: private/share/share.php:494
#, php-format
msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
+msgstr "Публикация %s неудачна, т.к. файл не существует"
#: private/share/share.php:501
#, php-format
msgid "You are not allowed to share %s"
-msgstr ""
+msgstr "Вам запрещено публиковать %s"
#: private/share/share.php:531
#, php-format
@@ -315,7 +316,7 @@ msgstr "Не удалось установить общий доступ для
msgid ""
"You need to provide a password to create a public link, only protected links"
" are allowed"
-msgstr ""
+msgstr "Вам нужно задать пароль для создания публичной ссылки. Разрешены только защищённые ссылки"
#: private/share/share.php:653
#, php-format
@@ -327,57 +328,57 @@ msgstr "Не удалось установить общий доступ для
msgid "Share type %s is not valid for %s"
msgstr "Такой втд общего доступа как %s не допустим для %s"
-#: private/share/share.php:820
+#: private/share/share.php:860
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr "Настройка прав доступа для %s невозможна, поскольку права доступа превышают предоставленные права доступа %s"
-#: private/share/share.php:881
+#: private/share/share.php:921
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr "Не удалось произвести настройку прав доступа для %s , элемент не был найден."
-#: private/share/share.php:1002
+#: private/share/share.php:1046
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:1009
+#: private/share/share.php:1053
#, php-format
msgid "Sharing backend %s not found"
-msgstr ""
+msgstr "Бэкэнд для общего доступа %s не найден"
-#: private/share/share.php:1015
+#: private/share/share.php:1059
#, php-format
msgid "Sharing backend for %s not found"
-msgstr ""
+msgstr "Бэкэнд для общего доступа к %s не найден"
-#: private/share/share.php:1432
+#: private/share/share.php:1476
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
-msgstr ""
+msgstr "Публикация %s неудачна, т.к. пользователь %s - публикатор оригинала файла"
-#: private/share/share.php:1441
+#: private/share/share.php:1485
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1457
+#: private/share/share.php:1501
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
-msgstr ""
+msgstr "Публикация %s неудачна, т.к републикация запрещена"
-#: private/share/share.php:1469
+#: private/share/share.php:1513
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1483
+#: private/share/share.php:1527
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 3ea2d23561d..dae2644404e 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -12,6 +12,7 @@
# Denis <denispal@gmail.com>, 2014
# Evgenij Spitsyn <evgeniy@spitsyn.net>, 2013
# jekader <jekader@gmail.com>, 2013
+# Михаил Маслиёв <misha.masliev@yandex.ru>, 2014
# Serge Shpikin <rkfg@rkfg.me>, 2013
# anshibanov <shibanovan@yandex.ru>, 2014
# Simon Tushev, 2014
@@ -22,13 +23,14 @@
# Алексей <hackproof.ai@gmail.com>, 2013
# Антон <antonshramko@yandex.ru>, 2013
# Иван <wen89@inbox.ru>, 2013
+# Михаил Маслиёв <misha.masliev@yandex.ru>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 15:02+0000\n"
+"Last-Translator: Михаил Маслиёв <misha.masliev@yandex.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -66,15 +68,15 @@ msgstr "Письмо отправлено"
msgid "You need to set your user email before being able to send test emails."
msgstr "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения."
-#: admin/controller.php:116 templates/admin.php:350
+#: admin/controller.php:116 templates/admin.php:337
msgid "Send mode"
msgstr "Отправить сообщение"
-#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144
msgid "Encryption"
msgstr "Шифрование"
-#: admin/controller.php:120 templates/admin.php:387
+#: admin/controller.php:120 templates/admin.php:374
msgid "Authentication method"
msgstr "Метод проверки подлинности"
@@ -119,17 +121,17 @@ msgstr "Ошибка при дешифровании файлов. Провер
#: ajax/deletekeys.php:14
msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Ключи шифрования перманентно удалены"
#: ajax/deletekeys.php:16
msgid ""
"Couldn't permanently delete your encryption keys, please check your "
"owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Не получается удалить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору"
#: ajax/installapp.php:18 ajax/uninstallapp.php:18
msgid "Couldn't remove app."
-msgstr ""
+msgstr "Невозможно удалить приложение."
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -155,7 +157,7 @@ msgstr "Резервная копия успешно восстановлена"
msgid ""
"Couldn't restore your encryption keys, please check your owncloud.log or ask"
" your administrator"
-msgstr ""
+msgstr "Не получается восстановить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору."
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -212,7 +214,7 @@ msgstr "Используемый механизм не поддерживает
msgid "Unable to change password"
msgstr "Невозможно изменить пароль"
-#: js/admin.js:126
+#: js/admin.js:127
msgid "Sending..."
msgstr "Отправляется ..."
@@ -230,7 +232,7 @@ msgstr "Обновить до {версия приложения}"
#: js/apps.js:90
msgid "Uninstall App"
-msgstr ""
+msgstr "Удалить приложение"
#: js/apps.js:96 js/apps.js:158 js/apps.js:191
msgid "Disable"
@@ -274,19 +276,19 @@ msgstr "Обновлено"
#: js/apps.js:233
msgid "Uninstalling ...."
-msgstr ""
+msgstr "Удаление ..."
#: js/apps.js:236
msgid "Error while uninstalling app"
-msgstr ""
+msgstr "Ошибка при удалении приложения."
#: js/apps.js:237 templates/apps.php:56
msgid "Uninstall"
-msgstr ""
+msgstr "Удалить"
#: js/personal.js:256
msgid "Select a profile picture"
-msgstr "Выберите картинку профиля"
+msgstr "Выберите аватар"
#: js/personal.js:287
msgid "Very weak password"
@@ -314,11 +316,11 @@ msgstr "Расшифровка файлов... Пожалуйста, подож
#: js/personal.js:324
msgid "Delete encryption keys permanently."
-msgstr ""
+msgstr "Перманентно удалить ключи шифрования. "
#: js/personal.js:338
msgid "Restore encryption keys."
-msgstr ""
+msgstr "Восстановить ключи шифрования."
#: js/users/deleteHandler.js:166
msgid "Unable to delete {objName}"
@@ -330,17 +332,17 @@ msgstr "Ошибка создания группы"
#: js/users/groups.js:177
msgid "A valid group name must be provided"
-msgstr ""
+msgstr "Введите правильное имя группы"
#: js/users/groups.js:205
msgid "deleted {groupName}"
-msgstr ""
+msgstr "удалено {groupName}"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "отмена"
-#: js/users/users.js:37 templates/admin.php:302
+#: js/users/users.js:37 templates/admin.php:292
#: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10
#: templates/users/part.userlist.php:41
msgid "Groups"
@@ -351,36 +353,36 @@ msgstr "Группы"
msgid "Group Admin"
msgstr "Администратор группы"
-#: js/users/users.js:63 templates/users/part.grouplist.php:44
+#: js/users/users.js:63 templates/users/part.grouplist.php:46
#: templates/users/part.userlist.php:108
msgid "Delete"
msgstr "Удалить"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "никогда"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
-msgstr ""
+msgstr "удалён {userName}"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "добавить группу"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Укажите правильное имя пользователя"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Ошибка создания пользователя"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Укажите валидный пароль"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Предупреждение: домашняя папка пользователя \"{user}\" уже существует"
@@ -477,18 +479,18 @@ msgstr ""
msgid ""
"This is probably caused by a cache/accelerator such as Zend OPcache or "
"eAccelerator."
-msgstr ""
+msgstr "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator."
#: templates/admin.php:105
msgid "Database Performance Info"
-msgstr ""
+msgstr "Информация о производительности Базы Данных"
#: templates/admin.php:108
msgid ""
"SQLite is used as database. For larger installations we recommend to change "
"this. To migrate to another database use the command line tool: 'occ db"
":convert-type'"
-msgstr ""
+msgstr "В качестве Базы Данных используется SQLite. Для больших установок рекомендуется использовать другие типы Баз Данных. Чтобы переехать на другую Базу Данных используйте инструмент командной строки: 'ooc: db:conver-type'"
#: templates/admin.php:119
msgid "Module 'fileinfo' missing"
@@ -552,18 +554,18 @@ msgstr "Планировщик задач по расписанию"
#: templates/admin.php:196
#, php-format
msgid "Last cron was executed at %s."
-msgstr ""
+msgstr "Последняя cron-задача была запущена: %s."
#: templates/admin.php:199
#, php-format
msgid ""
"Last cron was executed at %s. This is more than an hour ago, something seems"
" wrong."
-msgstr ""
+msgstr "Последняя cron-задача была запущена: %s. Это было больше часа назад, кажется что-то не так."
#: templates/admin.php:203
msgid "Cron was not executed yet!"
-msgstr ""
+msgstr "Cron-задачи ещё не запускались!"
#: templates/admin.php:213
msgid "Execute one task with each page loaded"
@@ -583,148 +585,148 @@ msgstr "Использовать системный cron для вызова cro
msgid "Sharing"
msgstr "Общий доступ"
-#: templates/admin.php:240
+#: templates/admin.php:238
msgid "Allow apps to use the Share API"
msgstr "Позволить приложениям использовать API общего доступа"
-#: templates/admin.php:247
+#: templates/admin.php:243
msgid "Allow users to share via link"
msgstr ""
-#: templates/admin.php:251
+#: templates/admin.php:249
msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:252
msgid "Allow public uploads"
msgstr "Разрешить открытые загрузки"
-#: templates/admin.php:258
+#: templates/admin.php:256
msgid "Set default expiration date"
-msgstr ""
+msgstr "Установите дату окончания по-умолчанию"
#: templates/admin.php:260
msgid "Expire after "
-msgstr ""
+msgstr "Заканчивается после"
#: templates/admin.php:263
msgid "days"
-msgstr ""
+msgstr "дней"
#: templates/admin.php:266
msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:276
+#: templates/admin.php:271
msgid "Allow resharing"
msgstr "Разрешить переоткрытие общего доступа"
-#: templates/admin.php:283
+#: templates/admin.php:276
msgid "Restrict users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:290
+#: templates/admin.php:281
msgid "Allow users to send mail notification for shared files"
msgstr "Разрешить пользователю оповещать почтой о расшаренных файлах"
-#: templates/admin.php:297
+#: templates/admin.php:286
msgid "Exclude groups from sharing"
-msgstr ""
+msgstr "Исключить группы из общего доступа"
-#: templates/admin.php:308
+#: templates/admin.php:298
msgid ""
"These groups will still be able to receive shares, but not to initiate them."
-msgstr ""
+msgstr "Эти группы смогут получать общие файлы, но не смогут отправлять их."
-#: templates/admin.php:316
+#: templates/admin.php:303
msgid "Security"
msgstr "Безопасность"
-#: templates/admin.php:327
+#: templates/admin.php:314
msgid "Enforce HTTPS"
msgstr "Принудить к HTTPS"
-#: templates/admin.php:329
+#: templates/admin.php:316
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Принудить клиентов подключаться к %s через шифрованное соединение."
-#: templates/admin.php:335
+#: templates/admin.php:322
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить принудительное SSL."
-#: templates/admin.php:345
+#: templates/admin.php:332
msgid "Email Server"
msgstr "Сервер почты"
-#: templates/admin.php:347
+#: templates/admin.php:334
msgid "This is used for sending out notifications."
msgstr "Используется для отправки уведомлений."
-#: templates/admin.php:378
+#: templates/admin.php:365
msgid "From address"
msgstr "Адрес отправителя"
-#: templates/admin.php:379
+#: templates/admin.php:366
msgid "mail"
-msgstr ""
+msgstr "почта"
-#: templates/admin.php:400
+#: templates/admin.php:387
msgid "Authentication required"
msgstr "Требуется аутентификация "
-#: templates/admin.php:404
+#: templates/admin.php:391
msgid "Server address"
msgstr "Адрес сервера"
-#: templates/admin.php:408
+#: templates/admin.php:395
msgid "Port"
msgstr "Порт"
-#: templates/admin.php:413
+#: templates/admin.php:400
msgid "Credentials"
msgstr "Полномочия"
-#: templates/admin.php:414
+#: templates/admin.php:401
msgid "SMTP Username"
msgstr "Имя пользователя"
-#: templates/admin.php:417
+#: templates/admin.php:404
msgid "SMTP Password"
msgstr "Пароль"
-#: templates/admin.php:421
+#: templates/admin.php:408
msgid "Test email settings"
msgstr "Тест настроек"
-#: templates/admin.php:422
+#: templates/admin.php:409
msgid "Send email"
msgstr "Отправить сообщение"
-#: templates/admin.php:427
+#: templates/admin.php:414
msgid "Log"
msgstr "Журнал"
-#: templates/admin.php:428
+#: templates/admin.php:415
msgid "Log level"
msgstr "Уровень детализации журнала"
-#: templates/admin.php:460
+#: templates/admin.php:447
msgid "More"
msgstr "Больше"
-#: templates/admin.php:461
+#: templates/admin.php:448
msgid "Less"
msgstr "Меньше"
-#: templates/admin.php:467 templates/personal.php:196
+#: templates/admin.php:454 templates/personal.php:196
msgid "Version"
msgstr "Версия"
-#: templates/admin.php:471 templates/personal.php:199
+#: templates/admin.php:458 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -764,7 +766,7 @@ msgstr "<span class=\"licence\"></span> лицензия. Автор <span class
#: templates/apps.php:59
msgid "Enable only for specific groups"
-msgstr ""
+msgstr "Включить только для этих групп"
#: templates/apps.php:61
msgid "All"
@@ -784,7 +786,7 @@ msgstr "Форум"
#: templates/help.php:33
msgid "Bugtracker"
-msgstr "Bugtracker"
+msgstr "Багтрекер"
#: templates/help.php:40
msgid "Commercial Support"
@@ -844,15 +846,15 @@ msgstr "Ваш адрес электронной почты"
msgid ""
"Fill in an email address to enable password recovery and receive "
"notifications"
-msgstr ""
+msgstr "Введите свой email-адрес для того, чтобы включить возможность восстановления пароля и получения уведомлений"
#: templates/personal.php:89
msgid "Profile picture"
-msgstr "Фото профиля"
+msgstr "Аватар"
#: templates/personal.php:94
msgid "Upload new"
-msgstr "Загрузить новую"
+msgstr "Загрузить новый"
#: templates/personal.php:96
msgid "Select new from Files"
@@ -860,11 +862,11 @@ msgstr "Выберите новый из файлов"
#: templates/personal.php:97
msgid "Remove image"
-msgstr "Удалить изображение"
+msgstr "Удалить аватар"
#: templates/personal.php:98
msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr "Либо png, либо jpg. Изображение должно быть квадратным, но вы сможете обрезать его позже."
+msgstr "Допустимые форматы: png и jpg. Если изображение не квадратное, то вам будет предложено обрезать его."
#: templates/personal.php:100
msgid "Your avatar is provided by your original account."
@@ -876,7 +878,7 @@ msgstr "Отменить"
#: templates/personal.php:105
msgid "Choose as profile image"
-msgstr "Выберите изображение профиля"
+msgstr "Установить как аватар"
#: templates/personal.php:111 templates/personal.php:112
msgid "Language"
@@ -903,15 +905,15 @@ msgid ""
"Your encryption keys are moved to a backup location. If something went wrong"
" you can restore the keys. Only delete them permanently if you are sure that"
" all files are decrypted correctly."
-msgstr ""
+msgstr "Ваши ключи шифрования были архивированы. Если что-то пойдёт не так, вы сможете восстановить ключи. Удаляйте ключи из архива только тогда, когда вы будете уверены, что все файлы были успешно расшифрованы."
#: templates/personal.php:178
msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Восстановить Ключи Шифрования"
#: templates/personal.php:182
msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Удалить Ключи Шифрования"
#: templates/users/part.createuser.php:4
msgid "Login Name"
@@ -934,7 +936,7 @@ msgstr "Введите пароль для того, чтобы восстано
#: templates/users/part.createuser.php:32
msgid "Search Users and Groups"
-msgstr ""
+msgstr "Искать пользователей и групп"
#: templates/users/part.grouplist.php:5
msgid "Add Group"
@@ -948,7 +950,7 @@ msgstr "Группа"
msgid "Everyone"
msgstr "Все"
-#: templates/users/part.grouplist.php:29
+#: templates/users/part.grouplist.php:31
msgid "Admins"
msgstr "Администраторы"
@@ -982,7 +984,7 @@ msgstr ""
#: templates/users/part.userlist.php:16
msgid "Last Login"
-msgstr ""
+msgstr "Последний вход"
#: templates/users/part.userlist.php:30
msgid "change full name"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 97ad8062f12..4dbe28f1c85 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Alexander Savchenko <a.v.savchenko@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ru/user_webdavauth.po b/l10n/ru/user_webdavauth.po
index 95fe84ab3a5..a7efd4d315b 100644
--- a/l10n/ru/user_webdavauth.po
+++ b/l10n/ru/user_webdavauth.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 17:11+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Alexander Savchenko <a.v.savchenko@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 55c89de561c..544594c1249 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr "මුරපදය ප්‍රත්‍යාරම්භ කරන්
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "ඔව්"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "එපා"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "තෝරන්න"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "හරි"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "එපා"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,29 +453,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "සංස්කරණය කළ හැක"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "ප්‍රවේශ පාලනය"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "සදන්න"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "යාවත්කාලීන කරන්න"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "මකන්න"
-#: js/share.js:587
-msgid "share"
-msgstr "බෙදාහදාගන්න"
-
#: js/share.js:917
msgid "Password protected"
msgstr "මුර පදයකින් ආරක්ශාකර ඇත"
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 604b39937f1..be32c852b36 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "දෝෂයක්"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "නම"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "ප්‍රමාණය"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "වෙනස් කළ"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index e23d5bc42e5..09dcd11848d 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "සුරකින්න"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index 1df4681c20d..e39affb3312 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/user_webdavauth.po b/l10n/si_LK/user_webdavauth.po
index 397edc1e882..5eb1928351a 100644
--- a/l10n/si_LK/user_webdavauth.po
+++ b/l10n/si_LK/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index aa95a8acb5e..a45d325a2ab 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -250,76 +250,76 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Zrušiť"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -458,27 +458,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index d0ba0a9eb3d..9b459f40616 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,57 +215,57 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr ""
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr ""
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr ""
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po
index 21b21020659..7b8de98ad9e 100644
--- a/l10n/sk/files_sharing.po
+++ b/l10n/sk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Uložiť"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index e011c4f1c7d..dc7c8ead633 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk/user_webdavauth.po b/l10n/sk/user_webdavauth.po
index 576e0347aa2..df4ece03c08 100644
--- a/l10n/sk/user_webdavauth.po
+++ b/l10n/sk/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 2982abc8852..cbb696bc198 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-16 19:53+0000\n"
-"Last-Translator: Marián Hvolka <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -252,76 +252,76 @@ msgstr "Obnovenie hesla"
msgid "Password can not be changed. Please contact your administrator."
msgstr "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Áno"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nie"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Vybrať"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Chyba pri nahrávaní šablóny výberu súborov: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Chyba pri nahrávaní šablóny správy: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} konflikt súboru"
msgstr[1] "{count} konflikty súboru"
msgstr[2] "{count} konfliktov súboru"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Jeden konflikt súboru"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Nové súbory"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Už existujúce súbory"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Ktoré súbory chcete ponechať?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Zrušiť"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Pokračovať"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(všetko vybrané)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} vybraných)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Chyba pri nahrávaní šablóny existencie súboru"
@@ -460,29 +460,29 @@ msgid "notify by email"
msgstr "informovať emailom"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "môže upraviť"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "prístupové práva"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "vytvoriť"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "aktualizovať"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "vymazať"
-#: js/share.js:587
-msgid "share"
-msgstr "zdieľať"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Chránené heslom"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index f93c60d6469..959e7db645d 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-11 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 13:02+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Marián Hvolka <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"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index ac996ad6a25..f8f9bdb6624 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -20,21 +20,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Zdieľanie server-server nie je na tomto serveri povolené"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Nemožno pridať vzdialené zdieľanie"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Zdieľané s vami"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Zdieľané s ostanými"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Zdieľané pomocou odkazu"
@@ -50,17 +50,17 @@ msgstr "Zatiaľ ste nezdieľali žiadne súbory."
msgid "You haven't shared any files by link yet."
msgstr "Zatiaľ ste pomocou odkazu nezdieľali žiaden súbor."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "Pridať {name} z {owner}@{remote}"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "Žiadna ownCloud inštancia na {remote}"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Chybná ownCloud url"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -116,15 +116,15 @@ msgstr "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "Uložiť do ownCloud"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "example.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Uložiť"
#: templates/public.php:28
msgid "Download"
@@ -140,13 +140,13 @@ msgid "Direct link"
msgstr "Priama linka"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Povoliť ďalším inštanciám pripojiť verejné odkazy zdieľané z tohto servera"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Povoliť používateľom pripojiť sa na zdieľané verejné odkazy"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 110913796fa..02c68aa4cb0 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-19 05:20+0000\n"
+"Last-Translator: Marián Hvolka <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +60,7 @@ msgstr "Zlyhala aktualizácia \"%s\"."
msgid ""
"App \\\"%s\\\" can't be installed because it is not compatible with this "
"version of ownCloud."
-msgstr ""
+msgstr "Aplikáciu \\\"%s\\\" nemožno nainštalovať, pretože nie je kompatibilná s touto verziou systému ownCloud."
#: private/app.php:1147
msgid "No app name specified"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 1c141522283..d3a9850e8e5 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-21 01:54-0400\n"
+"PO-Revision-Date: 2014-06-20 12:54+0000\n"
+"Last-Translator: Marián Hvolka <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -49,15 +49,15 @@ msgstr "Email odoslaný"
msgid "You need to set your user email before being able to send test emails."
msgstr "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email."
-#: admin/controller.php:116 templates/admin.php:350
+#: admin/controller.php:116 templates/admin.php:337
msgid "Send mode"
msgstr "Mód odosielania"
-#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144
msgid "Encryption"
msgstr "Šifrovanie"
-#: admin/controller.php:120 templates/admin.php:387
+#: admin/controller.php:120 templates/admin.php:374
msgid "Authentication method"
msgstr "Autentifikačná metóda"
@@ -112,7 +112,7 @@ msgstr "Nebolo možné natrvalo vymazať vaše šifrovacie kľúče, skontrolujt
#: ajax/installapp.php:18 ajax/uninstallapp.php:18
msgid "Couldn't remove app."
-msgstr ""
+msgstr "Nemožno odstrániť aplikáciu."
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -195,7 +195,7 @@ msgstr "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používate
msgid "Unable to change password"
msgstr "Zmena hesla sa nepodarila"
-#: js/admin.js:126
+#: js/admin.js:127
msgid "Sending..."
msgstr "Odosielam..."
@@ -213,7 +213,7 @@ msgstr "Aktualizovať na {appversion}"
#: js/apps.js:90
msgid "Uninstall App"
-msgstr ""
+msgstr "Odinštalovanie aplikácie"
#: js/apps.js:96 js/apps.js:158 js/apps.js:191
msgid "Disable"
@@ -257,15 +257,15 @@ msgstr "Aktualizované"
#: js/apps.js:233
msgid "Uninstalling ...."
-msgstr ""
+msgstr "Prebieha odinštalovanie..."
#: js/apps.js:236
msgid "Error while uninstalling app"
-msgstr ""
+msgstr "Chyba pri odinštalovaní aplikácie"
#: js/apps.js:237 templates/apps.php:56
msgid "Uninstall"
-msgstr ""
+msgstr "Odinštalácia"
#: js/personal.js:256
msgid "Select a profile picture"
@@ -319,11 +319,11 @@ msgstr "Musíte zadať platný názov skupiny"
msgid "deleted {groupName}"
msgstr "vymazaná {groupName}"
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "vrátiť"
-#: js/users/users.js:37 templates/admin.php:302
+#: js/users/users.js:37 templates/admin.php:292
#: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10
#: templates/users/part.userlist.php:41
msgid "Groups"
@@ -339,31 +339,31 @@ msgstr "Správca skupiny"
msgid "Delete"
msgstr "Zmazať"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "nikdy"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
msgstr "vymazané {userName}"
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "pridať skupinu"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Musíte zadať platné používateľské meno"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Chyba pri vytváraní používateľa"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Musíte zadať platné heslo"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Upozornenie: Domovský priečinok používateľa \"{user}\" už existuje"
@@ -566,23 +566,23 @@ msgstr "Použite systémovú službu cron, ktorá zavolá súbor cron.php každ
msgid "Sharing"
msgstr "Zdieľanie"
-#: templates/admin.php:240
+#: templates/admin.php:238
msgid "Allow apps to use the Share API"
msgstr "Povoliť aplikáciám používať API na zdieľanie"
-#: templates/admin.php:247
+#: templates/admin.php:243
msgid "Allow users to share via link"
msgstr "Povoliť používateľom zdieľanie pomocou odkazov"
-#: templates/admin.php:251
+#: templates/admin.php:249
msgid "Enforce password protection"
msgstr "Vynútiť ochranu heslom"
-#: templates/admin.php:254
+#: templates/admin.php:252
msgid "Allow public uploads"
msgstr "Povoliť verejné nahrávanie súborov"
-#: templates/admin.php:258
+#: templates/admin.php:256
msgid "Set default expiration date"
msgstr "Nastaviť predvolený dátum expirácie"
@@ -598,116 +598,116 @@ msgstr "dni"
msgid "Enforce expiration date"
msgstr "Vynútiť dátum expirácie"
-#: templates/admin.php:276
+#: templates/admin.php:271
msgid "Allow resharing"
msgstr "Povoliť zdieľanie ďalej"
-#: templates/admin.php:283
+#: templates/admin.php:276
msgid "Restrict users to only share with users in their groups"
msgstr "Povoliť používateľom zdieľanie len medzi nimi v rámci skupiny"
-#: templates/admin.php:290
+#: templates/admin.php:281
msgid "Allow users to send mail notification for shared files"
msgstr "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov"
-#: templates/admin.php:297
+#: templates/admin.php:286
msgid "Exclude groups from sharing"
msgstr "Vybrať skupiny zo zdieľania"
-#: templates/admin.php:308
+#: templates/admin.php:298
msgid ""
"These groups will still be able to receive shares, but not to initiate them."
msgstr "Tieto skupiny budú môcť stále zdieľať, ale sami nemôžu zdieľať ostatným."
-#: templates/admin.php:316
+#: templates/admin.php:303
msgid "Security"
msgstr "Zabezpečenie"
-#: templates/admin.php:327
+#: templates/admin.php:314
msgid "Enforce HTTPS"
msgstr "Vynútiť HTTPS"
-#: templates/admin.php:329
+#: templates/admin.php:316
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Vynúti pripájanie klientov k %s šifrovaným pripojením."
-#: templates/admin.php:335
+#: templates/admin.php:322
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL."
-#: templates/admin.php:345
+#: templates/admin.php:332
msgid "Email Server"
msgstr "Email server"
-#: templates/admin.php:347
+#: templates/admin.php:334
msgid "This is used for sending out notifications."
msgstr "Používa sa na odosielanie upozornení."
-#: templates/admin.php:378
+#: templates/admin.php:365
msgid "From address"
msgstr "Z adresy"
-#: templates/admin.php:379
+#: templates/admin.php:366
msgid "mail"
msgstr "email"
-#: templates/admin.php:400
+#: templates/admin.php:387
msgid "Authentication required"
msgstr "Vyžaduje sa overenie"
-#: templates/admin.php:404
+#: templates/admin.php:391
msgid "Server address"
msgstr "Adresa servera"
-#: templates/admin.php:408
+#: templates/admin.php:395
msgid "Port"
msgstr "Port"
-#: templates/admin.php:413
+#: templates/admin.php:400
msgid "Credentials"
msgstr "Prihlasovanie údaje"
-#: templates/admin.php:414
+#: templates/admin.php:401
msgid "SMTP Username"
msgstr "SMTP používateľské meno"
-#: templates/admin.php:417
+#: templates/admin.php:404
msgid "SMTP Password"
msgstr "SMTP heslo"
-#: templates/admin.php:421
+#: templates/admin.php:408
msgid "Test email settings"
msgstr "Nastavenia testovacieho emailu"
-#: templates/admin.php:422
+#: templates/admin.php:409
msgid "Send email"
msgstr "Odoslať email"
-#: templates/admin.php:427
+#: templates/admin.php:414
msgid "Log"
msgstr "Záznam"
-#: templates/admin.php:428
+#: templates/admin.php:415
msgid "Log level"
msgstr "Úroveň záznamu"
-#: templates/admin.php:460
+#: templates/admin.php:447
msgid "More"
msgstr "Viac"
-#: templates/admin.php:461
+#: templates/admin.php:448
msgid "Less"
msgstr "Menej"
-#: templates/admin.php:467 templates/personal.php:196
+#: templates/admin.php:454 templates/personal.php:196
msgid "Version"
msgstr "Verzia"
-#: templates/admin.php:471 templates/personal.php:199
+#: templates/admin.php:458 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 37be519af4a..fa43c32505f 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-11 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 13:02+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Marián Hvolka <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"
diff --git a/l10n/sk_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index aa5ad2e2090..8ac932988e2 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-11 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 13:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Marián Hvolka <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"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 7aebbccef32..bbd94efc59d 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -163,7 +163,7 @@ msgstr "Slika"
#: js/js.js:593
msgid "Audio"
-msgstr ""
+msgstr "Zvok"
#: js/js.js:607
msgid "Saving..."
@@ -254,33 +254,33 @@ msgstr "Ponastavi geslo"
#: js/lostpassword.js:16
msgid "Password can not be changed. Please contact your administrator."
-msgstr ""
+msgstr "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Izbor"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Napaka nalaganja predloge izbirnika datotek: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "V redu"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Napaka nalaganja predloge sporočil: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} spor datotek"
@@ -288,45 +288,45 @@ msgstr[1] "{count} spora datotek"
msgstr[2] "{count} spori datotek"
msgstr[3] "{count} sporov datotek"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "En spor datotek"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Nove datoteke"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Obstoječe datoteke"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Katare datoteke želite ohraniti?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Prekliči"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Nadaljuj"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(vse izbrano)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} izbranih)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Napaka nalaganja predloge obstoječih datotek"
@@ -465,29 +465,29 @@ msgid "notify by email"
msgstr "obvesti po elektronski pošti"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "lahko ureja"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "nadzor dostopa"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "ustvari"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "posodobi"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "izbriše"
-#: js/share.js:587
-msgid "share"
-msgstr "določi souporabo"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Zaščiteno z geslom"
@@ -550,7 +550,7 @@ msgstr "Stran je treba ponovno naložiti"
#: js/update.js:52
msgid "The update was unsuccessful."
-msgstr ""
+msgstr "Posodobitev je spodletela"
#: js/update.js:61
msgid "The update was successful. Redirecting you to ownCloud now."
@@ -611,7 +611,7 @@ msgstr "Novo geslo"
#: lostpassword/templates/resetpassword.php:6
msgid "New Password"
-msgstr ""
+msgstr "Novo geslo"
#: setup/controller.php:140
#, php-format
@@ -890,7 +890,7 @@ msgstr ""
#: templates/update.admin.php:17
#, php-format
msgid "The theme %s has been disabled."
-msgstr ""
+msgstr "Tema %s je onemogočena za uporabo."
#: templates/update.admin.php:21
msgid ""
@@ -900,7 +900,7 @@ msgstr ""
#: templates/update.admin.php:23
msgid "Start update"
-msgstr ""
+msgstr "Začni posodobitev"
#: templates/update.user.php:3
msgid ""
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 88f20ba6682..f868c1361eb 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
-"Last-Translator: Marko <marko.ambrozic@gmail.com>\n"
+"POT-Creation-Date: 2014-06-25 06:33-0400\n"
+"PO-Revision-Date: 2014-06-24 14:02+0000\n"
+"Last-Translator: Matej Urbančič <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +45,7 @@ msgid ""
"allowed."
msgstr "Neveljavno ime; znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:159
#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr "Ciljna mapa je premaknjena ali izbrisana."
@@ -91,54 +91,54 @@ msgstr "Mapo, v katero boste prenašali dokumente, ni mogoče določiti"
msgid "Invalid Token"
msgstr "Neveljaven žeton"
-#: ajax/upload.php:75
+#: ajax/upload.php:77
msgid "No file was uploaded. Unknown error"
msgstr "Ni poslane datoteke. Neznana napaka."
-#: ajax/upload.php:82
+#: ajax/upload.php:84
msgid "There is no error, the file uploaded with success"
msgstr "Datoteka je uspešno naložena."
-#: ajax/upload.php:83
+#: ajax/upload.php:85
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Poslana datoteka presega dovoljeno velikost, ki je določena z možnostjo upload_max_filesize v datoteki php.ini:"
-#: ajax/upload.php:85
+#: ajax/upload.php:87
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Poslana datoteka presega velikost, ki jo določa parameter največje dovoljene velikosti v obrazcu HTML."
-#: ajax/upload.php:86
+#: ajax/upload.php:88
msgid "The uploaded file was only partially uploaded"
msgstr "Poslan je le del datoteke."
-#: ajax/upload.php:87
+#: ajax/upload.php:89
msgid "No file was uploaded"
msgstr "Ni poslane datoteke"
-#: ajax/upload.php:88
+#: ajax/upload.php:90
msgid "Missing a temporary folder"
msgstr "Manjka začasna mapa"
-#: ajax/upload.php:89
+#: ajax/upload.php:91
msgid "Failed to write to disk"
msgstr "Pisanje na disk je spodletelo"
-#: ajax/upload.php:109
+#: ajax/upload.php:111
msgid "Not enough storage available"
msgstr "Na voljo ni dovolj prostora"
-#: ajax/upload.php:171
+#: ajax/upload.php:173
msgid "Upload failed. Could not find uploaded file"
msgstr "Pošiljanje je spodletelo. Ni mogoče najti poslane datoteke."
-#: ajax/upload.php:181
+#: ajax/upload.php:183
msgid "Upload failed. Could not get file info."
msgstr "Pošiljanje je spodletelo. Ni mogoče pridobiti podrobnosti datoteke."
-#: ajax/upload.php:196
+#: ajax/upload.php:198
msgid "Invalid directory."
msgstr "Neveljavna mapa."
@@ -180,7 +180,7 @@ msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošilja
msgid "URL cannot be empty"
msgstr "Polje naslova URL ne sme biti prazno"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1192
msgid "{new_name} already exists"
msgstr "{new_name} že obstaja"
@@ -196,19 +196,19 @@ msgstr "Ni mogoče ustvariti mape"
msgid "Error fetching URL"
msgstr "Napaka pridobivanja naslova URL"
-#: js/fileactions.js:211
+#: js/fileactions.js:213
msgid "Share"
msgstr "Souporaba"
-#: js/fileactions.js:224
+#: js/fileactions.js:226
msgid "Delete permanently"
msgstr "Izbriši dokončno"
-#: js/fileactions.js:226 templates/list.php:78 templates/list.php:79
+#: js/fileactions.js:228 templates/list.php:78 templates/list.php:79
msgid "Delete"
msgstr "Izbriši"
-#: js/fileactions.js:262
+#: js/fileactions.js:264
msgid "Rename"
msgstr "Preimenuj"
@@ -218,43 +218,43 @@ msgid ""
"big."
msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, kadar je datoteka zelo velika."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:623 js/filelist.js:1713
msgid "Pending"
msgstr "V čakanju ..."
-#: js/filelist.js:1139
+#: js/filelist.js:1143
msgid "Error moving file."
msgstr "Napaka premikanja datoteke."
-#: js/filelist.js:1147
+#: js/filelist.js:1151
msgid "Error moving file"
msgstr "Napaka premikanja datoteke"
-#: js/filelist.js:1147
+#: js/filelist.js:1151
msgid "Error"
msgstr "Napaka"
-#: js/filelist.js:1225
+#: js/filelist.js:1240
msgid "Could not rename file"
msgstr "Ni mogoče preimenovati datoteke"
-#: js/filelist.js:1346
+#: js/filelist.js:1358
msgid "Error deleting file."
msgstr "Napaka brisanja datoteke."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1461 templates/list.php:62
msgid "Name"
msgstr "Ime"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1462 templates/list.php:73
msgid "Size"
msgstr "Velikost"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1463 templates/list.php:76
msgid "Modified"
msgstr "Spremenjeno"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1473 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n mapa"
@@ -262,7 +262,7 @@ msgstr[1] "%n mapi"
msgstr[2] "%n mape"
msgstr[3] "%n map"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1479 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n datoteka"
@@ -270,7 +270,7 @@ msgstr[1] "%n datoteki"
msgstr[2] "%n datoteke"
msgstr[3] "%n datotek"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1606 js/filelist.js:1645
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Posodabljanje %n datoteke"
@@ -348,7 +348,7 @@ msgstr "WebDAV"
msgid ""
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
"WebDAV</a>"
-msgstr "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>."
+msgstr "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek peko sistema WebDAV</a>."
#: templates/list.php:5
msgid "New"
@@ -406,4 +406,4 @@ msgstr "Poteka preučevanje datotek, počakajte ..."
#: templates/list.php:102
msgid "Currently scanning"
-msgstr "Trenutno preverjam"
+msgstr "Poteka preverjanje"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index f6ce550755d..a98e3b5b99f 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Deljen z vami"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Deljen z ostalimi"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Souporaba preko povezave"
@@ -51,7 +51,7 @@ msgstr "Niste še delili datotek"
msgid "You haven't shared any files by link yet."
msgstr "Niste še delili datotek preko povezave"
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Shrani"
#: templates/public.php:28
msgid "Download"
@@ -141,7 +141,7 @@ msgid "Direct link"
msgstr "Neposredna povezava"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 95b11fc95c1..fdc995d6cad 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-25 06:33-0400\n"
+"PO-Revision-Date: 2014-06-24 14:02+0000\n"
+"Last-Translator: Matej Urbančič <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -49,15 +49,15 @@ msgstr "Elektronska pošta je poslana"
msgid "You need to set your user email before being able to send test emails."
msgstr ""
-#: admin/controller.php:116 templates/admin.php:350
+#: admin/controller.php:116 templates/admin.php:337
msgid "Send mode"
msgstr "Način pošiljanja"
-#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144
msgid "Encryption"
msgstr "Šifriranje"
-#: admin/controller.php:120 templates/admin.php:387
+#: admin/controller.php:120 templates/admin.php:374
msgid "Authentication method"
msgstr "Način overitve"
@@ -195,7 +195,7 @@ msgstr "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodo
msgid "Unable to change password"
msgstr "Ni mogoče spremeniti gesla"
-#: js/admin.js:126
+#: js/admin.js:127
msgid "Sending..."
msgstr "Poteka pošiljanje ..."
@@ -265,7 +265,7 @@ msgstr ""
#: js/apps.js:237 templates/apps.php:56
msgid "Uninstall"
-msgstr ""
+msgstr "Odstrani namestitev"
#: js/personal.js:256
msgid "Select a profile picture"
@@ -319,11 +319,11 @@ msgstr ""
msgid "deleted {groupName}"
msgstr ""
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr "razveljavi"
-#: js/users/users.js:37 templates/admin.php:302
+#: js/users/users.js:37 templates/admin.php:292
#: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10
#: templates/users/part.userlist.php:41
msgid "Groups"
@@ -334,36 +334,36 @@ msgstr "Skupine"
msgid "Group Admin"
msgstr "Skrbnik skupine"
-#: js/users/users.js:63 templates/users/part.grouplist.php:44
+#: js/users/users.js:63 templates/users/part.grouplist.php:46
#: templates/users/part.userlist.php:108
msgid "Delete"
msgstr "Izbriši"
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr "nikoli"
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
msgstr ""
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr "dodaj skupino"
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr "Navedeno mora biti veljavno uporabniško ime"
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr "Napaka ustvarjanja uporabnika"
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr "Navedeno mora biti veljavno geslo"
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja"
@@ -566,23 +566,23 @@ msgstr "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 1
msgid "Sharing"
msgstr "Souporaba"
-#: templates/admin.php:240
+#: templates/admin.php:238
msgid "Allow apps to use the Share API"
msgstr "Dovoli programom uporabo vmesnika API souporabe"
-#: templates/admin.php:247
+#: templates/admin.php:243
msgid "Allow users to share via link"
msgstr ""
-#: templates/admin.php:251
+#: templates/admin.php:249
msgid "Enforce password protection"
msgstr ""
-#: templates/admin.php:254
+#: templates/admin.php:252
msgid "Allow public uploads"
msgstr "Dovoli javno pošiljanje datotek v oblak"
-#: templates/admin.php:258
+#: templates/admin.php:256
msgid "Set default expiration date"
msgstr ""
@@ -598,116 +598,116 @@ msgstr ""
msgid "Enforce expiration date"
msgstr ""
-#: templates/admin.php:276
+#: templates/admin.php:271
msgid "Allow resharing"
msgstr "Dovoli nadaljnjo souporabo"
-#: templates/admin.php:283
+#: templates/admin.php:276
msgid "Restrict users to only share with users in their groups"
msgstr ""
-#: templates/admin.php:290
+#: templates/admin.php:281
msgid "Allow users to send mail notification for shared files"
msgstr "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti."
-#: templates/admin.php:297
+#: templates/admin.php:286
msgid "Exclude groups from sharing"
msgstr ""
-#: templates/admin.php:308
+#: templates/admin.php:298
msgid ""
"These groups will still be able to receive shares, but not to initiate them."
msgstr ""
-#: templates/admin.php:316
+#: templates/admin.php:303
msgid "Security"
msgstr "Varnost"
-#: templates/admin.php:327
+#: templates/admin.php:314
msgid "Enforce HTTPS"
msgstr "Zahtevaj uporabo HTTPS"
-#: templates/admin.php:329
+#: templates/admin.php:316
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "Vsili povezavo odjemalca z %s preko šifrirane povezave."
-#: templates/admin.php:335
+#: templates/admin.php:322
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS."
-#: templates/admin.php:345
+#: templates/admin.php:332
msgid "Email Server"
msgstr "Poštni strežnik"
-#: templates/admin.php:347
+#: templates/admin.php:334
msgid "This is used for sending out notifications."
msgstr ""
-#: templates/admin.php:378
+#: templates/admin.php:365
msgid "From address"
msgstr ""
-#: templates/admin.php:379
+#: templates/admin.php:366
msgid "mail"
msgstr ""
-#: templates/admin.php:400
+#: templates/admin.php:387
msgid "Authentication required"
msgstr "Zahtevana je overitev"
-#: templates/admin.php:404
+#: templates/admin.php:391
msgid "Server address"
msgstr "Naslov strežnika"
-#: templates/admin.php:408
+#: templates/admin.php:395
msgid "Port"
msgstr "Vrata"
-#: templates/admin.php:413
+#: templates/admin.php:400
msgid "Credentials"
msgstr "Poverila"
-#: templates/admin.php:414
+#: templates/admin.php:401
msgid "SMTP Username"
msgstr "Uporabniško ime SMTP"
-#: templates/admin.php:417
+#: templates/admin.php:404
msgid "SMTP Password"
msgstr "Geslo SMTP"
-#: templates/admin.php:421
+#: templates/admin.php:408
msgid "Test email settings"
msgstr "Preizkus nastavitev elektronske pošte"
-#: templates/admin.php:422
+#: templates/admin.php:409
msgid "Send email"
msgstr "Pošlji elektronsko sporočilo"
-#: templates/admin.php:427
+#: templates/admin.php:414
msgid "Log"
msgstr "Dnevnik"
-#: templates/admin.php:428
+#: templates/admin.php:415
msgid "Log level"
msgstr "Raven beleženja"
-#: templates/admin.php:460
+#: templates/admin.php:447
msgid "More"
msgstr "Več"
-#: templates/admin.php:461
+#: templates/admin.php:448
msgid "Less"
msgstr "Manj"
-#: templates/admin.php:467 templates/personal.php:196
+#: templates/admin.php:454 templates/personal.php:196
msgid "Version"
msgstr "Različica"
-#: templates/admin.php:471 templates/personal.php:199
+#: templates/admin.php:458 templates/personal.php:199
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -921,7 +921,7 @@ msgstr ""
#: templates/users/part.grouplist.php:5
msgid "Add Group"
-msgstr ""
+msgstr "Dodaj skupino"
#: templates/users/part.grouplist.php:10
msgid "Group"
@@ -929,11 +929,11 @@ msgstr "Skupina"
#: templates/users/part.grouplist.php:18
msgid "Everyone"
-msgstr ""
+msgstr "Vsi"
-#: templates/users/part.grouplist.php:29
+#: templates/users/part.grouplist.php:31
msgid "Admins"
-msgstr ""
+msgstr "Skrbniki"
#: templates/users/part.setquota.php:7
msgid "Default Quota"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 91eb1906559..61de6ea40da 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-25 06:33-0400\n"
+"PO-Revision-Date: 2014-06-24 14:02+0000\n"
+"Last-Translator: Matej Urbančič <>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -144,7 +144,7 @@ msgstr "Ali res želite izbrisati trenutne nastavitve strežnika?"
msgid "Confirm Deletion"
msgstr "Potrdi brisanje"
-#: lib/wizard.php:83 lib/wizard.php:97
+#: lib/wizard.php:97 lib/wizard.php:112
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
@@ -153,7 +153,7 @@ msgstr[1] "%s najdeni skupini"
msgstr[2] "%s najdene skupine"
msgstr[3] "%s najdenih skupin"
-#: lib/wizard.php:130
+#: lib/wizard.php:126
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
@@ -162,25 +162,25 @@ msgstr[1] "%s najdena uporabnika"
msgstr[2] "%s najdeni uporabniki"
msgstr[3] "%s najdenih uporabnikov"
-#: lib/wizard.php:825 lib/wizard.php:837
-msgid "Invalid Host"
-msgstr "Neveljaven gostitelj"
-
-#: lib/wizard.php:1025
+#: lib/wizard.php:317 lib/wizard.php:1051
msgid "Could not find the desired feature"
msgstr "Želene zmožnosti ni mogoče najti"
+#: lib/wizard.php:858 lib/wizard.php:870
+msgid "Invalid Host"
+msgstr "Neveljaven gostitelj"
+
#: settings.php:52
msgid "Server"
-msgstr ""
+msgstr "Strežnik"
#: settings.php:53
msgid "User Filter"
-msgstr ""
+msgstr "Uporabniški filter"
#: settings.php:54
msgid "Login Filter"
-msgstr ""
+msgstr "Filter prijave"
#: settings.php:55
msgid "Group Filter"
@@ -273,7 +273,7 @@ msgstr "Dodaj nastavitve strežnika"
#: templates/part.wizard-server.php:21
msgid "Delete Configuration"
-msgstr ""
+msgstr "Izbriši nastavitve"
#: templates/part.wizard-server.php:30
msgid "Host"
diff --git a/l10n/sl/user_webdavauth.po b/l10n/sl/user_webdavauth.po
index 4d0b9dac4c8..51f171c3101 100644
--- a/l10n/sl/user_webdavauth.po
+++ b/l10n/sl/user_webdavauth.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index f444cdbc3bc..b6a8caf4075 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -248,75 +248,75 @@ msgstr "Rivendos kodin"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Po"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Jo"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Zgjidh"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Në rregull"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Anulo"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -455,29 +455,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "mund të ndryshosh"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "kontrollimi i hyrjeve"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "krijo"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "azhurno"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "elimino"
-#: js/share.js:587
-msgid "share"
-msgstr "nda"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Mbrojtur me kod"
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 98d78decb42..762beb2f95a 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -179,7 +179,7 @@ msgstr "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin"
msgid "URL cannot be empty"
msgstr "URL-i nuk mund të jetë bosh"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} është ekzistues "
@@ -217,55 +217,55 @@ msgid ""
"big."
msgstr "Shkarkimi juaj është duke u përgatitur. Kjo mund të kërkojë kohë nëse skedarët janë të mëdhenj."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Në vijim"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Gabim lëvizjen dokumentave"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Gabim"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Emri"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Madhësia"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Ndryshuar"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n dosje"
msgstr[1] "%n dosje"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n skedar"
msgstr[1] "%n skedarë"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Po ngarkoj %n skedar"
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index 3d6b7ae676d..31aca48242c 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -27,15 +27,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -51,7 +51,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Ruaj"
#: templates/public.php:28
msgid "Download"
@@ -141,7 +141,7 @@ msgid "Direct link"
msgstr "Lidhje direkte"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 8a029cc5ae1..65258c5ff6c 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sq/user_webdavauth.po b/l10n/sq/user_webdavauth.po
index 487b5da3e4d..b9da8c25b1d 100644
--- a/l10n/sq/user_webdavauth.po
+++ b/l10n/sq/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 7745664999c..231cd0f569c 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -250,76 +250,76 @@ msgstr "Ресетуј лозинку"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Да"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Не"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Одабери"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "У реду"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Откажи"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -458,29 +458,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "може да мења"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "права приступа"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "направи"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "ажурирај"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "обриши"
-#: js/share.js:587
-msgid "share"
-msgstr "подели"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Заштићено лозинком"
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 4480d7f3a0d..a914f2c430d 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "Отпремање датотеке је у току. Ако сада н
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} већ постоји"
@@ -215,57 +215,57 @@ msgid ""
"big."
msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "На чекању"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Грешка"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Име"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Величина"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Измењено"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 803e81eb495..af3959bb142 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Сачувај"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index e3698fb6658..1613b20d5e3 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr/user_webdavauth.po b/l10n/sr/user_webdavauth.po
index 95dc6639505..2627b9a2d4d 100644
--- a/l10n/sr/user_webdavauth.po
+++ b/l10n/sr/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 4c3bc6f8ac9..20d2a111a03 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -252,76 +252,76 @@ msgstr "Resetuj lozinku"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Da"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Ne"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Izaberi"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Otkaži"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -460,29 +460,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "dozvoljene izmene"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "kontrola pristupa"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "napravi"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "ažuriranje"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "brisanje"
-#: js/share.js:587
-msgid "share"
-msgstr "deljenje"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Zaštćeno lozinkom"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index c33306b48d4..03be05aba9d 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,57 +215,57 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Greška"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Ime"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Veličina"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Zadnja izmena"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 7a21dc6a39b..76b81979a85 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Snimi"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 7d43ecf7a63..84f147444ba 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/user_webdavauth.po b/l10n/sr@latin/user_webdavauth.po
index 085258b5255..3370897bd7c 100644
--- a/l10n/sr@latin/user_webdavauth.po
+++ b/l10n/sr@latin/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/su/core.po b/l10n/su/core.po
index 951c7a7f10a..5b8b11b4c5c 100644
--- a/l10n/su/core.po
+++ b/l10n/su/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -242,74 +242,74 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -448,27 +448,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/su/files_sharing.po b/l10n/su/files_sharing.po
index d95b3298fbd..c7566d2da05 100644
--- a/l10n/su/files_sharing.po
+++ b/l10n/su/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 07f74cb3e0e..580cacc7185 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-16 09:50+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -255,75 +255,75 @@ msgstr "Återställ lösenordet"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Ja"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Nej"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Välj"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Fel uppstod för filväljarmall: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Fel uppstod under inläsningen av meddelandemallen: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} filkonflikt"
msgstr[1] "{count} filkonflikter"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "En filkonflikt"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Nya filer"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Filer som redan existerar"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Vilken fil vill du behålla?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Avbryt"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Fortsätt"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(Alla valda)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} valda)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Fel uppstod filmall existerar"
@@ -462,29 +462,29 @@ msgid "notify by email"
msgstr "informera via e-post"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "kan redigera"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "åtkomstkontroll"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "skapa"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "uppdatera"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "radera"
-#: js/share.js:587
-msgid "share"
-msgstr "dela"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Lösenordsskyddad"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 51ba6b6f4d4..c38c7149084 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-16 09:50+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 952bfd70046..717ebd7fbb4 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -30,15 +30,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Delat med dig"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Delat med andra"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Delad som länk"
@@ -54,7 +54,7 @@ msgstr "Du har inte delat några filer ännu."
msgid "You haven't shared any files by link yet."
msgstr "Du har inte delat några filer som länk ännu."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -128,7 +128,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Spara"
#: templates/public.php:28
msgid "Download"
@@ -144,7 +144,7 @@ msgid "Direct link"
msgstr "Direkt länk"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index c5b104345c6..ada6b44772a 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Juho Ojala\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sv/user_webdavauth.po b/l10n/sv/user_webdavauth.po
index 8689e59434b..a79a1f6e829 100644
--- a/l10n/sv/user_webdavauth.po
+++ b/l10n/sv/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 09:11+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Juho Ojala\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index aed61104cd6..a185385c8b9 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po
index d31f1efd7bc..2c63b66e077 100644
--- a/l10n/sw_KE/files_sharing.po
+++ b/l10n/sw_KE/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ta_IN/core.po b/l10n/ta_IN/core.po
index 3fb6dae1a21..ae733e76a53 100644
--- a/l10n/ta_IN/core.po
+++ b/l10n/ta_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/ta_IN/files_sharing.po b/l10n/ta_IN/files_sharing.po
index f71326f466c..cfe8655f173 100644
--- a/l10n/ta_IN/files_sharing.po
+++ b/l10n/ta_IN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 498fcb09125..0ebe5ca8230 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr "மீளமைத்த கடவுச்சொல்"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "ஆம்"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "இல்லை"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "தெரிவுசெய்க "
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "சரி"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "இரத்து செய்க"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,29 +453,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "தொகுக்க முடியும்"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "கட்டுப்பாடான அணுகல்"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "உருவவாக்கல்"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "இற்றைப்படுத்தல்"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "நீக்குக"
-#: js/share.js:587
-msgid "share"
-msgstr "பகிர்தல்"
-
#: js/share.js:917
msgid "Password protected"
msgstr "கடவுச்சொல் பாதுகாக்கப்பட்டது"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 794955f667c..33c649b8962 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "கோப்பு பதிவேற்றம் செயல்பா
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} ஏற்கனவே உள்ளது"
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "நிலுவையிலுள்ள"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "வழு"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "பெயர்"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "அளவு"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "மாற்றப்பட்டது"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index 6849816cf7a..acd60c6e256 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "சேமிக்க "
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index db911880b71..bda7c32bfaf 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/user_webdavauth.po b/l10n/ta_LK/user_webdavauth.po
index 838950f9642..9d8e5507323 100644
--- a/l10n/ta_LK/user_webdavauth.po
+++ b/l10n/ta_LK/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 0a147c23b7a..6043749ed6e 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -247,75 +247,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "అవును"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "కాదు"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "సరే"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "రద్దుచేయి"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "కొనసాగించు"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -454,29 +454,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr ""
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr ""
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr ""
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr ""
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "తొలగించు"
-#: js/share.js:587
-msgid "share"
-msgstr ""
-
#: js/share.js:917
msgid "Password protected"
msgstr ""
diff --git a/l10n/te/files.po b/l10n/te/files.po
index ea632278c87..89bc99f10fa 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "పొరపాటు"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "పేరు"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "పరిమాణం"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr ""
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index e89601082d7..4d6e345132c 100644
--- a/l10n/te/files_sharing.po
+++ b/l10n/te/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "భద్రపరచు"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index cc97faa7b9f..0a011a394fd 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/te/user_webdavauth.po b/l10n/te/user_webdavauth.po
index 470fcc1d8bf..17b13835489 100644
--- a/l10n/te/user_webdavauth.po
+++ b/l10n/te/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 5a8017184b3..264a31c8a2e 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -247,75 +247,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its "
"name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -454,27 +454,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 4eaee03e739..c5c4a1c3000 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,7 +43,7 @@ msgid ""
"allowed."
msgstr ""
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:159
#: lib/app.php:77
msgid "The target folder has been moved or deleted."
msgstr ""
@@ -88,54 +88,54 @@ msgstr ""
msgid "Invalid Token"
msgstr ""
-#: ajax/upload.php:75
+#: ajax/upload.php:77
msgid "No file was uploaded. Unknown error"
msgstr ""
-#: ajax/upload.php:82
+#: ajax/upload.php:84
msgid "There is no error, the file uploaded with success"
msgstr ""
-#: ajax/upload.php:83
+#: ajax/upload.php:85
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr ""
-#: ajax/upload.php:85
+#: ajax/upload.php:87
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr ""
-#: ajax/upload.php:86
+#: ajax/upload.php:88
msgid "The uploaded file was only partially uploaded"
msgstr ""
-#: ajax/upload.php:87
+#: ajax/upload.php:89
msgid "No file was uploaded"
msgstr ""
-#: ajax/upload.php:88
+#: ajax/upload.php:90
msgid "Missing a temporary folder"
msgstr ""
-#: ajax/upload.php:89
+#: ajax/upload.php:91
msgid "Failed to write to disk"
msgstr ""
-#: ajax/upload.php:109
+#: ajax/upload.php:111
msgid "Not enough storage available"
msgstr ""
-#: ajax/upload.php:171
+#: ajax/upload.php:173
msgid "Upload failed. Could not find uploaded file"
msgstr ""
-#: ajax/upload.php:181
+#: ajax/upload.php:183
msgid "Upload failed. Could not get file info."
msgstr ""
-#: ajax/upload.php:196
+#: ajax/upload.php:198
msgid "Invalid directory."
msgstr ""
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1190
+#: js/file-upload.js:559 js/filelist.js:1192
msgid "{new_name} already exists"
msgstr ""
@@ -193,19 +193,19 @@ msgstr ""
msgid "Error fetching URL"
msgstr ""
-#: js/fileactions.js:211
+#: js/fileactions.js:213
msgid "Share"
msgstr ""
-#: js/fileactions.js:224
+#: js/fileactions.js:226
msgid "Delete permanently"
msgstr ""
-#: js/fileactions.js:226 templates/list.php:78 templates/list.php:79
+#: js/fileactions.js:228 templates/list.php:78 templates/list.php:79
msgid "Delete"
msgstr ""
-#: js/fileactions.js:262
+#: js/fileactions.js:264
msgid "Rename"
msgstr ""
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:621 js/filelist.js:1693
+#: js/filelist.js:623 js/filelist.js:1713
msgid "Pending"
msgstr ""
-#: js/filelist.js:1141
+#: js/filelist.js:1143
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1149
+#: js/filelist.js:1151
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1149
+#: js/filelist.js:1151
msgid "Error"
msgstr ""
-#: js/filelist.js:1227
+#: js/filelist.js:1240
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1348
+#: js/filelist.js:1358
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1451 templates/list.php:62
+#: js/filelist.js:1461 templates/list.php:62
msgid "Name"
msgstr ""
-#: js/filelist.js:1452 templates/list.php:73
+#: js/filelist.js:1462 templates/list.php:73
msgid "Size"
msgstr ""
-#: js/filelist.js:1453 templates/list.php:76
+#: js/filelist.js:1463 templates/list.php:76
msgid "Modified"
msgstr ""
-#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1473 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1479 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1601 js/filelist.js:1640
+#: js/filelist.js:1606 js/filelist.js:1645
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 50711d96f2c..07735900cf2 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index bd10cec3079..cf1f64511ed 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 5aefc63fda1..fc1fede7825 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 98174e7392b..43f167b9a94 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,7 +39,7 @@ msgstr ""
msgid "Error"
msgstr ""
-#: lib/trashbin.php:857 lib/trashbin.php:859
+#: lib/trashbin.php:891 lib/trashbin.php:893
msgid "restored"
msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 347ceb7ce14..93e8a1e513f 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index d0342ccb097..c600c434fb1 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,50 +18,50 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: base.php:678
+#: base.php:673
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:679
+#: base.php:674
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
"example configuration is provided in config/config.sample.php."
msgstr ""
-#: private/app.php:361
+#: private/app.php:366
msgid "Help"
msgstr ""
-#: private/app.php:374
+#: private/app.php:379
msgid "Personal"
msgstr ""
-#: private/app.php:385
+#: private/app.php:390
msgid "Settings"
msgstr ""
-#: private/app.php:397
+#: private/app.php:402
msgid "Users"
msgstr ""
-#: private/app.php:410
+#: private/app.php:415
msgid "Admin"
msgstr ""
-#: private/app.php:978
+#: private/app.php:987
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: private/app.php:1135
+#: private/app.php:1144
#, php-format
msgid ""
"App \\\"%s\\\" can't be installed because it is not compatible with this "
"version of ownCloud."
msgstr ""
-#: private/app.php:1147
+#: private/app.php:1156
msgid "No app name specified"
msgstr ""
@@ -86,48 +86,48 @@ msgstr ""
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: private/installer.php:231
+#: private/installer.php:235
msgid "No source specified when installing app"
msgstr ""
-#: private/installer.php:238
+#: private/installer.php:242
msgid "No href specified when installing app from http"
msgstr ""
-#: private/installer.php:243
+#: private/installer.php:247
msgid "No path specified when installing app from local file"
msgstr ""
-#: private/installer.php:257
+#: private/installer.php:261
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: private/installer.php:271
+#: private/installer.php:275
msgid "Failed to open archive when installing app"
msgstr ""
-#: private/installer.php:309
+#: private/installer.php:313
msgid "App does not provide an info.xml file"
msgstr ""
-#: private/installer.php:315
+#: private/installer.php:319
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: private/installer.php:321
+#: private/installer.php:325
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: private/installer.php:327
+#: private/installer.php:331
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: private/installer.php:340
+#: private/installer.php:344
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
@@ -245,13 +245,13 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: private/setup.php:164
+#: private/setup.php:170
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: private/setup.php:165
+#: private/setup.php:171
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -320,57 +320,57 @@ msgstr ""
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:820
+#: private/share/share.php:860
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:881
+#: private/share/share.php:921
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:1002
+#: private/share/share.php:1046
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:1009
+#: private/share/share.php:1053
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:1015
+#: private/share/share.php:1059
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1432
+#: private/share/share.php:1476
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1441
+#: private/share/share.php:1485
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1457
+#: private/share/share.php:1501
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1469
+#: private/share/share.php:1513
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1483
+#: private/share/share.php:1527
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index ce11d06709c..e21a25b0f2e 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,39 +18,39 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: app.php:361
+#: app.php:366
msgid "Help"
msgstr ""
-#: app.php:374
+#: app.php:379
msgid "Personal"
msgstr ""
-#: app.php:385
+#: app.php:390
msgid "Settings"
msgstr ""
-#: app.php:397
+#: app.php:402
msgid "Users"
msgstr ""
-#: app.php:410
+#: app.php:415
msgid "Admin"
msgstr ""
-#: app.php:978
+#: app.php:987
#, php-format
msgid "Failed to upgrade \"%s\"."
msgstr ""
-#: app.php:1135
+#: app.php:1144
#, php-format
msgid ""
"App \\\"%s\\\" can't be installed because it is not compatible with this "
"version of ownCloud."
msgstr ""
-#: app.php:1147
+#: app.php:1156
msgid "No app name specified"
msgstr ""
@@ -75,48 +75,48 @@ msgstr ""
msgid "Can't create app folder. Please fix permissions. %s"
msgstr ""
-#: installer.php:231
+#: installer.php:235
msgid "No source specified when installing app"
msgstr ""
-#: installer.php:238
+#: installer.php:242
msgid "No href specified when installing app from http"
msgstr ""
-#: installer.php:243
+#: installer.php:247
msgid "No path specified when installing app from local file"
msgstr ""
-#: installer.php:257
+#: installer.php:261
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: installer.php:271
+#: installer.php:275
msgid "Failed to open archive when installing app"
msgstr ""
-#: installer.php:309
+#: installer.php:313
msgid "App does not provide an info.xml file"
msgstr ""
-#: installer.php:315
+#: installer.php:319
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: installer.php:321
+#: installer.php:325
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: installer.php:327
+#: installer.php:331
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: installer.php:340
+#: installer.php:344
msgid ""
"App can't be installed because the version in info.xml/version is not the "
"same as the version reported from the app store"
@@ -227,13 +227,13 @@ msgstr ""
msgid "Set an admin password."
msgstr ""
-#: setup.php:164
+#: setup.php:170
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr ""
-#: setup.php:165
+#: setup.php:171
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr ""
@@ -301,57 +301,57 @@ msgstr ""
msgid "Share type %s is not valid for %s"
msgstr ""
-#: share/share.php:820
+#: share/share.php:860
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: share/share.php:881
+#: share/share.php:921
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: share/share.php:1002
+#: share/share.php:1046
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: share/share.php:1009
+#: share/share.php:1053
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: share/share.php:1015
+#: share/share.php:1059
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: share/share.php:1432
+#: share/share.php:1476
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: share/share.php:1441
+#: share/share.php:1485
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: share/share.php:1457
+#: share/share.php:1501
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: share/share.php:1469
+#: share/share.php:1513
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: share/share.php:1483
+#: share/share.php:1527
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index e7bcc704f8a..4b0a05a97f4 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -316,7 +316,7 @@ msgstr ""
msgid "deleted {groupName}"
msgstr ""
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
msgid "undo"
msgstr ""
@@ -331,36 +331,36 @@ msgstr ""
msgid "Group Admin"
msgstr ""
-#: js/users/users.js:63 templates/users/part.grouplist.php:44
+#: js/users/users.js:63 templates/users/part.grouplist.php:46
#: templates/users/part.userlist.php:108
msgid "Delete"
msgstr ""
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
msgid "never"
msgstr ""
-#: js/users/users.js:254
+#: js/users/users.js:264
msgid "deleted {userName}"
msgstr ""
-#: js/users/users.js:371
+#: js/users/users.js:381
msgid "add group"
msgstr ""
-#: js/users/users.js:568
+#: js/users/users.js:578
msgid "A valid username must be provided"
msgstr ""
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
msgid "Error creating user"
msgstr ""
-#: js/users/users.js:574
+#: js/users/users.js:584
msgid "A valid password must be provided"
msgstr ""
-#: js/users/users.js:598
+#: js/users/users.js:608
msgid "Warning: Home directory for user \"{user}\" already exists"
msgstr ""
@@ -927,7 +927,7 @@ msgstr ""
msgid "Everyone"
msgstr ""
-#: templates/users/part.grouplist.php:29
+#: templates/users/part.grouplist.php:31
msgid "Admins"
msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 30edd8f129c..6adebd34d9f 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -143,26 +143,26 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:83 lib/wizard.php:97
+#: lib/wizard.php:97 lib/wizard.php:112
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:130
+#: lib/wizard.php:126
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:825 lib/wizard.php:837
-msgid "Invalid Host"
+#: lib/wizard.php:317 lib/wizard.php:1051
+msgid "Could not find the desired feature"
msgstr ""
-#: lib/wizard.php:1025
-msgid "Could not find the desired feature"
+#: lib/wizard.php:858 lib/wizard.php:870
+msgid "Invalid Host"
msgstr ""
#: settings.php:52
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index b32129d3833..b1234d130e6 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index a2f4cfc7e83..652dbe026df 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -242,74 +242,74 @@ msgstr "เปลี่ยนรหัสผ่าน"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "ตกลง"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "ไม่ตกลง"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "เลือก"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "ตกลง"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "ไฟล์ใหม่"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "ยกเลิก"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -448,29 +448,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "สามารถแก้ไข"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "ระดับควบคุมการเข้าใช้งาน"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "สร้าง"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "อัพเดท"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "ลบ"
-#: js/share.js:587
-msgid "share"
-msgstr "แชร์"
-
#: js/share.js:917
msgid "Password protected"
msgstr "ใส่รหัสผ่านไว้"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 115c2264fc5..3eba82dd5f2 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "การอัพโหลดไฟล์กำลังอยู่ใ
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} มีอยู่แล้วในระบบ"
@@ -215,53 +215,53 @@ msgid ""
"big."
msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่"
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "อยู่ระหว่างดำเนินการ"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "ข้อผิดพลาด"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "ชื่อ"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "ขนาด"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "แก้ไขแล้ว"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 9428ff5cd8d..3da8365cb5b 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "บันทึก"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 60ce7bb983e..89273779f7d 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/user_webdavauth.po b/l10n/th_TH/user_webdavauth.po
index d3e60651152..c3fb658ca25 100644
--- a/l10n/th_TH/user_webdavauth.po
+++ b/l10n/th_TH/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 6cddcdf64ba..ce8615897ed 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-16 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 11:20+0000\n"
-"Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
+"Last-Translator: I Robot\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"
@@ -250,75 +250,75 @@ msgstr "Parolayı sıfırla"
msgid "Password can not be changed. Please contact your administrator."
msgstr "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin."
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Evet"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Hayır"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Seç"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Dosya seçici şablonu yüklenirken hata: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Tamam"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "İleti şablonu yüklenirken hata: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} dosya çakışması"
msgstr[1] "{count} dosya çakışması"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Bir dosya çakışması"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Yeni Dosyalar"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "Zaten mevcut olan dosyalar"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Hangi dosyaları saklamak istiyorsunuz?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "İptal"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Devam et"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(tümü seçildi)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} seçildi)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Dosya mevcut şablonu yüklenirken hata"
@@ -457,29 +457,29 @@ msgid "notify by email"
msgstr "e-posta ile bildir"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "düzenleyebilir"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "erişim kontrolü"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "oluştur"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "güncelle"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "sil"
-#: js/share.js:587
-msgid "share"
-msgstr "paylaş"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Parola korumalı"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index de26bb5bf5f..02f0e1bba31 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -182,7 +182,7 @@ msgstr "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme i
msgid "URL cannot be empty"
msgstr "URL boş olamaz"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} zaten mevcut"
@@ -220,55 +220,55 @@ msgid ""
"big."
msgstr "İndirme hazırlanıyor. Dosyalar büyük ise bu biraz zaman alabilir."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Bekliyor"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr "Dosya taşıma hatası."
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Dosya taşıma hatası"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Hata"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Dosya adlandırılamadı"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Dosya silinirken hata."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "İsim"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Boyut"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Değiştirilme"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n dizin"
msgstr[1] "%n dizin"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n dosya"
msgstr[1] "%n dosya"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n dosya yükleniyor"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index af98880067f..f843d847004 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -20,21 +20,21 @@ msgstr ""
#: ajax/external.php:20
msgid "Server to server sharing is not enabled on this server"
-msgstr ""
+msgstr "Sunucudan sunucuya paylaşım bu sunucuda etkin değil"
#: ajax/external.php:50
msgid "Couldn't add remote share"
-msgstr ""
+msgstr "Uzak paylaşım eklenemedi"
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr "Sizinle paylaşılmış"
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr "Diğerleri ile paylaşılmış"
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr "Bağlantı ile paylaşılmış"
@@ -50,17 +50,17 @@ msgstr "Henüz hiçbir dosya paylaşmadınız."
msgid "You haven't shared any files by link yet."
msgstr "Bağlantı ile henüz hiçbir dosya paylaşmadınız."
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
-msgstr ""
+msgstr "{name} paylaşımını {owner}@{remote} konumundan ekle"
#: js/public.js:200
msgid "No ownCloud installation found at {remote}"
-msgstr ""
+msgstr "{remote} üzerinde ownCloud kurulumu bulunamadı"
#: js/public.js:201
msgid "Invalid ownCloud url"
-msgstr ""
+msgstr "Geçersiz ownCloud adresi"
#: js/share.js:60
msgid "Shared by {owner}"
@@ -116,15 +116,15 @@ msgstr "Daha fazla bilgi için bu bağlantıyı aldığınız kişi ile iletişi
#: templates/public.php:20
msgid "Save to ownCloud"
-msgstr ""
+msgstr "ownCloud'a kaydet"
#: templates/public.php:22
msgid "example.com/owncloud"
-msgstr ""
+msgstr "örnek.com/owncloud"
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Kaydet"
#: templates/public.php:28
msgid "Download"
@@ -140,13 +140,13 @@ msgid "Direct link"
msgstr "Doğrudan bağlantı"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
msgid "Allow other instances to mount public links shared from this server"
-msgstr ""
+msgstr "Diğer örneklerin, bu sunucudan paylaşılmış herkese açık bağlantıları bağlamasına izin ver"
#: templates/settings-admin.php:11
msgid "Allow users to mount public link shares"
-msgstr ""
+msgstr "Kullanıcıların herkese açık bağlantı paylaşımlarını bağlamasına izin ver"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index a180b062a47..609374321dc 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: Volkan Gezer <volkangezer@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/user_webdavauth.po b/l10n/tr/user_webdavauth.po
index cd84d14cf55..28ef5485e4f 100644
--- a/l10n/tr/user_webdavauth.po
+++ b/l10n/tr/user_webdavauth.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: Volkan Gezer <volkangezer@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/tzm/core.po b/l10n/tzm/core.po
index a3ce05cacb7..ccf32cf6e68 100644
--- a/l10n/tzm/core.po
+++ b/l10n/tzm/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/tzm/files_sharing.po b/l10n/tzm/files_sharing.po
index 06ded65e17d..915f5d2c2ff 100644
--- a/l10n/tzm/files_sharing.po
+++ b/l10n/tzm/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 9da12da2a05..b7fe9b23e69 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -242,74 +242,74 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "ھەئە"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "ياق"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "جەزملە"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "ۋاز كەچ"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -448,29 +448,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr ""
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr ""
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr ""
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr ""
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "ئۆچۈر"
-#: js/share.js:587
-msgid "share"
-msgstr "ھەمبەھىر"
-
#: js/share.js:917
msgid "Password protected"
msgstr ""
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index 6db97378ac1..5b16970d384 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋا
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} مەۋجۇت"
@@ -215,53 +215,53 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "كۈتۈۋاتىدۇ"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "خاتالىق"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "ئاتى"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "چوڭلۇقى"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "ئۆزگەرتكەن"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index 626331a01af..568df3fb65a 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -50,7 +50,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -124,7 +124,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "ساقلا"
#: templates/public.php:28
msgid "Download"
@@ -140,7 +140,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index 077881b647b..5ed793835f4 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ug/user_webdavauth.po b/l10n/ug/user_webdavauth.po
index c6fa8d82caf..19fbe89847a 100644
--- a/l10n/ug/user_webdavauth.po
+++ b/l10n/ug/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index a472530344e..059970ca1fe 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -151,7 +151,7 @@ msgstr "Налаштування"
#: js/js.js:590
msgid "File"
-msgstr ""
+msgstr "Файл"
#: js/js.js:591
msgid "Folder"
@@ -252,76 +252,76 @@ msgstr "Скинути пароль"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Так"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Ні"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Обрати"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Помилка при завантаженні шаблону вибору: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Ok"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Помилка при завантаженні шаблону повідомлення: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} файловий конфлікт"
msgstr[1] "{count} файлових конфліктів"
msgstr[2] "{count} файлових конфліктів"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Один файловий конфлікт"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "Нових Файлів"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Які файли ви хочете залишити?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Якщо ви оберете обидві версії, скопійований файл буде мати номер, доданий у його ім'я."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Відмінити"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Продовжити"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(все вибрано)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} вибрано)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Помилка при завантаженні файлу існуючого шаблону"
@@ -460,29 +460,29 @@ msgid "notify by email"
msgstr "повідомити по Email"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "може редагувати"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "контроль доступу"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "створити"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "оновити"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "видалити"
-#: js/share.js:587
-msgid "share"
-msgstr "опублікувати"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Захищено паролем"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index e917a259d87..2ecf9c0b2f6 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# v_2e <v_2e@ukr.net>, 2014
# zubr139, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 18:31+0000\n"
+"Last-Translator: v_2e <v_2e@ukr.net>\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"
@@ -35,7 +36,7 @@ msgstr " Ім'я файлу не може бути порожнім."
#: ajax/newfile.php:63
#, php-format
msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" - це некоректне ім'я файлу."
#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
msgid ""
@@ -43,17 +44,17 @@ msgid ""
"allowed."
msgstr "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені."
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:159
#: lib/app.php:77
msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "Теку призначення було переміщено або видалено."
#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
"name."
-msgstr ""
+msgstr "Файл з ім'ям %s вже є у теці %s. Оберіть інше ім'я."
#: ajax/newfile.php:97
msgid "Not a valid source"
@@ -62,16 +63,16 @@ msgstr ""
#: ajax/newfile.php:102
msgid ""
"Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
+msgstr "Серверу заборонено відкривати посилання, перевірте конфігурацію"
#: ajax/newfile.php:118
#, php-format
msgid "Error while downloading %s to %s"
-msgstr ""
+msgstr "Помилка завантаження %s до %s"
#: ajax/newfile.php:146
msgid "Error when creating the file"
-msgstr ""
+msgstr "Помилка створення файлу"
#: ajax/newfolder.php:22
msgid "Folder name cannot be empty."
@@ -79,7 +80,7 @@ msgstr "Ім'я теки не може бути порожнім."
#: ajax/newfolder.php:66
msgid "Error when creating the folder"
-msgstr ""
+msgstr "Помилка створення теки"
#: ajax/upload.php:19 ajax/upload.php:57
msgid "Unable to set upload directory."
@@ -89,54 +90,54 @@ msgstr "Не вдалося встановити каталог завантаж
msgid "Invalid Token"
msgstr ""
-#: ajax/upload.php:75
+#: ajax/upload.php:77
msgid "No file was uploaded. Unknown error"
msgstr "Не завантажено жодного файлу. Невідома помилка"
-#: ajax/upload.php:82
+#: ajax/upload.php:84
msgid "There is no error, the file uploaded with success"
msgstr "Файл успішно вивантажено без помилок."
-#: ajax/upload.php:83
+#: ajax/upload.php:85
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: "
-#: ajax/upload.php:85
+#: ajax/upload.php:87
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form"
msgstr "Розмір відвантаженого файлу перевищує директиву MAX_FILE_SIZE вказану в HTML формі"
-#: ajax/upload.php:86
+#: ajax/upload.php:88
msgid "The uploaded file was only partially uploaded"
msgstr "Файл відвантажено лише частково"
-#: ajax/upload.php:87
+#: ajax/upload.php:89
msgid "No file was uploaded"
msgstr "Не відвантажено жодного файлу"
-#: ajax/upload.php:88
+#: ajax/upload.php:90
msgid "Missing a temporary folder"
msgstr "Відсутній тимчасовий каталог"
-#: ajax/upload.php:89
+#: ajax/upload.php:91
msgid "Failed to write to disk"
msgstr "Невдалося записати на диск"
-#: ajax/upload.php:109
+#: ajax/upload.php:111
msgid "Not enough storage available"
msgstr "Місця більше немає"
-#: ajax/upload.php:171
+#: ajax/upload.php:173
msgid "Upload failed. Could not find uploaded file"
-msgstr ""
+msgstr "Завантаження не вдалося. Неможливо знайти завантажений файл."
-#: ajax/upload.php:181
+#: ajax/upload.php:183
msgid "Upload failed. Could not get file info."
-msgstr ""
+msgstr "Завантаження не вдалося. Неможливо отримати інформацію про файл."
-#: ajax/upload.php:196
+#: ajax/upload.php:198
msgid "Invalid directory."
msgstr "Невірний каталог."
@@ -146,20 +147,20 @@ msgstr "Файли"
#: appinfo/app.php:27
msgid "All files"
-msgstr ""
+msgstr "Усі файли"
#: js/file-upload.js:257
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Неможливо завантажити {filename}, оскільки це каталог або має нульовий розмір."
#: js/file-upload.js:270
msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "Розмір файлу {size1} перевищує обмеження {size2}"
#: js/file-upload.js:281
msgid ""
"Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Недостатньо вільного місця, ви завантажуєте {size1}, а залишилося лише {size2}"
#: js/file-upload.js:358
msgid "Upload cancelled."
@@ -167,7 +168,7 @@ msgstr "Завантаження перервано."
#: js/file-upload.js:404
msgid "Could not get result from server."
-msgstr ""
+msgstr "Не вдалося отримати результат від сервера."
#: js/file-upload.js:490
msgid ""
@@ -178,7 +179,7 @@ msgstr "Виконується завантаження файлу. Закрит
msgid "URL cannot be empty"
msgstr "URL не може бути порожнім"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1192
msgid "{new_name} already exists"
msgstr "{new_name} вже існує"
@@ -192,21 +193,21 @@ msgstr "Не вдалося створити теку"
#: js/file-upload.js:677
msgid "Error fetching URL"
-msgstr ""
+msgstr "Помилка отримання URL"
-#: js/fileactions.js:211
+#: js/fileactions.js:213
msgid "Share"
msgstr "Поділитися"
-#: js/fileactions.js:224
+#: js/fileactions.js:226
msgid "Delete permanently"
msgstr "Видалити назавжди"
-#: js/fileactions.js:226 templates/list.php:78 templates/list.php:79
+#: js/fileactions.js:228 templates/list.php:78 templates/list.php:79
msgid "Delete"
msgstr "Видалити"
-#: js/fileactions.js:262
+#: js/fileactions.js:264
msgid "Rename"
msgstr "Перейменувати"
@@ -216,66 +217,66 @@ msgid ""
"big."
msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:623 js/filelist.js:1713
msgid "Pending"
msgstr "Очікування"
-#: js/filelist.js:1139
+#: js/filelist.js:1143
msgid "Error moving file."
-msgstr ""
+msgstr "Помилка переміщення файлу."
-#: js/filelist.js:1147
+#: js/filelist.js:1151
msgid "Error moving file"
msgstr "Помилка переміщення файлу"
-#: js/filelist.js:1147
+#: js/filelist.js:1151
msgid "Error"
msgstr "Помилка"
-#: js/filelist.js:1225
+#: js/filelist.js:1240
msgid "Could not rename file"
msgstr "Неможливо перейменувати файл"
-#: js/filelist.js:1346
+#: js/filelist.js:1358
msgid "Error deleting file."
-msgstr ""
+msgstr "Помилка видалення файлу."
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1461 templates/list.php:62
msgid "Name"
msgstr "Ім'я"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1462 templates/list.php:73
msgid "Size"
msgstr "Розмір"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1463 templates/list.php:76
msgid "Modified"
msgstr "Змінено"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1473 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n тека"
msgstr[1] "%n тека"
msgstr[2] "%n теки"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1479 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n файл"
msgstr[1] "%n файлів"
msgstr[2] "%n файли"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1606 js/filelist.js:1645
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Завантаження %n файлу"
+msgstr[1] "Завантаження %n файлів"
+msgstr[2] "Завантаження %n файлів"
#: js/files.js:101
msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" - некоректне ім'я файлу."
#: js/files.js:122
msgid "Your storage is full, files can not be updated or synced anymore!"
@@ -289,20 +290,20 @@ msgstr "Ваше сховище майже повне ({usedSpacePercent}%)"
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
-msgstr ""
+msgstr "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову"
#: js/files.js:144
msgid ""
"Invalid private key for Encryption App. Please update your private key "
"password in your personal settings to recover access to your encrypted "
"files."
-msgstr ""
+msgstr "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях."
#: js/files.js:148
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
-msgstr ""
+msgstr "Шифрування було вимкнено, але ваші файли все ще зашифровано. Для розшифрування перейдіть до персональних налаштувань."
#: js/filesummary.js:182
msgid "{dirs} and {files}"
@@ -316,7 +317,7 @@ msgstr "%s не може бути перейменований"
#: lib/helper.php:23 templates/list.php:25
#, php-format
msgid "Upload (max. %s)"
-msgstr ""
+msgstr "Завантаження (макс. %s)"
#: templates/admin.php:6
msgid "File handling"
@@ -343,7 +344,7 @@ msgstr "WebDAV"
msgid ""
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
"WebDAV</a>"
-msgstr ""
+msgstr "Для доступу до файлів через WebDAV використовуйте <a href=\"%s\" target=\"_blank\">це посилання</a>"
#: templates/list.php:5
msgid "New"
@@ -351,7 +352,7 @@ msgstr "Створити"
#: templates/list.php:8
msgid "New text file"
-msgstr ""
+msgstr "Новий текстовий файл"
#: templates/list.php:9
msgid "Text file"
@@ -375,7 +376,7 @@ msgstr "Перервати завантаження"
#: templates/list.php:48
msgid "You don’t have permission to upload or create files here"
-msgstr ""
+msgstr "У вас недостатньо прав для завантаження або створення файлів тут"
#: templates/list.php:53
msgid "Nothing in here. Upload something!"
@@ -401,4 +402,4 @@ msgstr "Файли скануються, зачекайте, будь-ласка
#: templates/list.php:102
msgid "Currently scanning"
-msgstr ""
+msgstr "Триває перевірка"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index ab23664037b..44f2a682f59 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# v_2e <v_2e@ukr.net>, 2014
# пан Володимир <volodya327@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -26,15 +27,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -50,7 +51,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -124,7 +125,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Зберегти"
#: templates/public.php:28
msgid "Download"
@@ -133,14 +134,14 @@ msgstr "Завантажити"
#: templates/public.php:59
#, php-format
msgid "Download %s"
-msgstr ""
+msgstr "Завантажити %s"
#: templates/public.php:63
msgid "Direct link"
msgstr "Пряме посилання"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index ed3233bf5e9..dbb7eebdb4c 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/files_trashbin.po
@@ -4,13 +4,14 @@
#
# Translators:
# Soul Kim <warlock.rf@gmail.com>, 2013
+# v_2e <v_2e@ukr.net>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-26 17:21+0000\n"
+"Last-Translator: v_2e <v_2e@ukr.net>\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"
@@ -30,7 +31,7 @@ msgstr "Неможливо відновити %s"
#: appinfo/app.php:13 js/filelist.js:34
msgid "Deleted files"
-msgstr "Видалено файлів"
+msgstr "Видалені файли"
#: js/app.js:52 templates/index.php:21 templates/index.php:23
msgid "Restore"
@@ -40,7 +41,7 @@ msgstr "Відновити"
msgid "Error"
msgstr "Помилка"
-#: lib/trashbin.php:857 lib/trashbin.php:859
+#: lib/trashbin.php:891 lib/trashbin.php:893
msgid "restored"
msgstr "відновлено"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 80eb9de6a46..22b5c2d450c 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index ca5d553b284..c2166d2e7a7 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur/core.po b/l10n/ur/core.po
index 9aef119e029..75719564f7b 100644
--- a/l10n/ur/core.po
+++ b/l10n/ur/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -246,75 +246,75 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
msgstr[1] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -453,27 +453,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/ur/files_sharing.po b/l10n/ur/files_sharing.po
index 71531522685..1a2103cfaf9 100644
--- a/l10n/ur/files_sharing.po
+++ b/l10n/ur/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index 60545e8fede..890a9a15f16 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -247,75 +247,75 @@ msgstr "ری سیٹ پاسورڈ"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "ہاں"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "نہیں"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "منتخب کریں"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "اوکے"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{گنتی} فائل متصادم "
msgstr[1] "{گنتی} فائل متصادم "
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "اایک فائل متصادم ہے"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "جدید فائلیں"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "پہلے سے موجودجدید فائلیں"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "آپ کون سی فائلیں رکھنا چاہتے ہیں ؟"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "منسوخ کریں"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "جاری"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(سب منتخب شدہ)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({گنتی} منتخب شدہ)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -454,29 +454,29 @@ msgid "notify by email"
msgstr "ای میل کے ذریعے مطلع کریں"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "تبدیل کر سکے ھیں"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "اسیس کنٹرول"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "نیا بنائیں"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "اپ ڈیٹ"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "ختم کریں"
-#: js/share.js:587
-msgid "share"
-msgstr "شئیر کریں"
-
#: js/share.js:917
msgid "Password protected"
msgstr "پاسورڈ سے محفوظ کیا گیا ہے"
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index 6abe8a81428..986e13bcadf 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,55 +215,55 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "ایرر"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "اسم"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr ""
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr ""
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index 25338811dd0..c89b10a11a9 100644
--- a/l10n/ur_PK/files_sharing.po
+++ b/l10n/ur_PK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "حفظ"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index d6e8203324e..6beafdcb7c5 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/user_webdavauth.po b/l10n/ur_PK/user_webdavauth.po
index f6872a8ed78..c519e683bb9 100644
--- a/l10n/ur_PK/user_webdavauth.po
+++ b/l10n/ur_PK/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/uz/core.po b/l10n/uz/core.po
index 8c8bbb23c57..29bad37c09b 100644
--- a/l10n/uz/core.po
+++ b/l10n/uz/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -242,74 +242,74 @@ msgstr ""
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr ""
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr ""
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr ""
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr ""
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -448,27 +448,27 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
-msgid "can edit"
+msgid "can share"
msgstr ""
-#: js/share.js:575
-msgid "access control"
+#: js/share.js:576
+msgid "can edit"
msgstr ""
#: js/share.js:578
-msgid "create"
+msgid "access control"
msgstr ""
#: js/share.js:581
-msgid "update"
+msgid "create"
msgstr ""
#: js/share.js:584
-msgid "delete"
+msgid "update"
msgstr ""
#: js/share.js:587
-msgid "share"
+msgid "delete"
msgstr ""
#: js/share.js:917
diff --git a/l10n/uz/files_sharing.po b/l10n/uz/files_sharing.po
index a7b6cdd6dba..232f5432d62 100644
--- a/l10n/uz/files_sharing.po
+++ b/l10n/uz/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 2ec97e6a8c9..cf31110c6c8 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -246,74 +246,74 @@ msgstr "Khôi phục mật khẩu"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Có"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "Không"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "Chọn"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "Lỗi khi tải mẫu tập tin picker: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "Đồng ý"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "Lỗi khi tải mẫu thông điệp: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} tập tin xung đột"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "Một tập tin xung đột"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "File mới"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "Bạn muốn tiếp tục với những tập tin nào?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Nếu bạn chọn cả hai phiên bản, tập tin được sao chép sẽ được đánh thêm số vào tên của nó."
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "Hủy"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "Tiếp tục"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(Tất cả các lựa chọn)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "({count} được chọn)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "Lỗi khi tải tập tin mẫu đã tồn tại"
@@ -452,29 +452,29 @@ msgid "notify by email"
msgstr "Thông báo qua email"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "có thể chỉnh sửa"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "quản lý truy cập"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "tạo"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "cập nhật"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "xóa"
-#: js/share.js:587
-msgid "share"
-msgstr "chia sẻ"
-
#: js/share.js:917
msgid "Password protected"
msgstr "Mật khẩu bảo vệ"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 8243be10675..6543ea64fe8 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@ msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi t
msgid "URL cannot be empty"
msgstr "URL không thể để trống"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} đã tồn tại"
@@ -219,53 +219,53 @@ msgid ""
"big."
msgstr "Your download is being prepared. This might take some time if the files are big."
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "Đang chờ"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "Lỗi di chuyển tập tin"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "Lỗi"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "Không thể đổi tên file"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr "Lỗi xóa file,"
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "Tên"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "Kích cỡ"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "Thay đổi"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n thư mục"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n tập tin"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "Đang tải lên %n tập tin"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index fee15550f61..93196732a91 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "Lưu"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 49bfe3eb135..6d90839ed8b 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/vi/user_webdavauth.po b/l10n/vi/user_webdavauth.po
index 00c540d3b57..9d362c90be5 100644
--- a/l10n/vi/user_webdavauth.po
+++ b/l10n/vi/user_webdavauth.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index eb53db88af1..4fa4eb39b30 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -249,74 +249,74 @@ msgstr "重置密码"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "否"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "选择(&C)..."
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "加载文件分拣模板出错: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "好"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "加载消息模板出错: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} 个文件冲突"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "1个文件冲突"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "新文件"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr "已经存在的文件"
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "想要保留哪一个文件呢?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "如果同时选择了两个版本,复制的文件名将会增加上一个数字。"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "取消"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "继续"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(选中全部)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "(选择了{count}个)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "加载文件存在性模板失败"
@@ -455,29 +455,29 @@ msgid "notify by email"
msgstr "以邮件通知"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "可以修改"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "访问控制"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "创建"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "更新"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "删除"
-#: js/share.js:587
-msgid "share"
-msgstr "共享"
-
#: js/share.js:917
msgid "Password protected"
msgstr "密码已受保护"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index aee78176a2e..920bec89087 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-11 01:54-0400\n"
-"PO-Revision-Date: 2014-06-11 04:00+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: phy <transifex@phy25.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 43fc2d6a77d..44bad733c40 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -28,15 +28,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -52,7 +52,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -126,7 +126,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "保存"
#: templates/public.php:28
msgid "Download"
@@ -142,7 +142,7 @@ msgid "Direct link"
msgstr "直接链接"
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index e912bba16d9..6872e5fed07 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-11 01:54-0400\n"
-"PO-Revision-Date: 2014-06-11 04:00+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: phy <transifex@phy25.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index ececa7d5ff3..d8dfeee9111 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 60f11118640..babc67bdbb7 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -242,74 +242,74 @@ msgstr "重設密碼"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "Yes"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "No"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr ""
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr ""
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "OK"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr ""
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] ""
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr ""
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr ""
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr ""
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr ""
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "取消"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr ""
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr ""
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr ""
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr ""
@@ -448,29 +448,29 @@ msgid "notify by email"
msgstr ""
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr ""
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr ""
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "新增"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "更新"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "刪除"
-#: js/share.js:587
-msgid "share"
-msgstr "分享"
-
#: js/share.js:917
msgid "Password protected"
msgstr "密碼保護"
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 12976bb9474..7f96a1ee117 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -177,7 +177,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr ""
@@ -215,53 +215,53 @@ msgid ""
"big."
msgstr ""
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr ""
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "錯誤"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "名稱"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "大小"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr ""
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 1536a116ccd..1a285275d3c 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -123,7 +123,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "儲存"
#: templates/public.php:28
msgid "Download"
@@ -139,7 +139,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 328c3ec7a37..ccc56ab2b27 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/user_webdavauth.po b/l10n/zh_HK/user_webdavauth.po
index 96fc2f5b03d..64a994b1329 100644
--- a/l10n/zh_HK/user_webdavauth.po
+++ b/l10n/zh_HK/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index d3d1dc1331a..cb8b2d8d24b 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-15 01:54-0400\n"
-"PO-Revision-Date: 2014-06-15 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -151,7 +151,7 @@ msgstr "設定"
#: js/js.js:590
msgid "File"
-msgstr ""
+msgstr "檔案"
#: js/js.js:591
msgid "Folder"
@@ -244,74 +244,74 @@ msgstr "重設密碼"
msgid "Password can not be changed. Please contact your administrator."
msgstr ""
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
msgid "No"
msgstr "否"
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
msgid "Choose"
msgstr "選擇"
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
msgid "Error loading file picker template: {error}"
msgstr "載入檔案選擇器樣板出錯: {error}"
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
msgid "Ok"
msgstr "好"
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
msgid "Error loading message template: {error}"
msgstr "載入訊息樣板出錯: {error}"
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
msgstr[0] "{count} 個檔案衝突"
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
msgid "One file conflict"
msgstr "一個檔案衝突"
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
msgid "New Files"
msgstr "新檔案"
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
msgid "Which files do you want to keep?"
msgstr "您要保留哪一個檔案?"
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "如果您同時選擇兩個版本,被複製的那個檔案名稱後面會加上編號"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
msgid "Cancel"
msgstr "取消"
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
msgid "Continue"
msgstr "繼續"
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
msgid "(all selected)"
msgstr "(已全選)"
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
msgid "({count} selected)"
msgstr "(已選 {count} 項)"
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
msgid "Error loading file exists template"
msgstr "載入檔案存在樣板出錯"
@@ -450,29 +450,29 @@ msgid "notify by email"
msgstr "以 email 通知"
#: js/share.js:573
+msgid "can share"
+msgstr ""
+
+#: js/share.js:576
msgid "can edit"
msgstr "可編輯"
-#: js/share.js:575
+#: js/share.js:578
msgid "access control"
msgstr "存取控制"
-#: js/share.js:578
+#: js/share.js:581
msgid "create"
msgstr "建立"
-#: js/share.js:581
+#: js/share.js:584
msgid "update"
msgstr "更新"
-#: js/share.js:584
+#: js/share.js:587
msgid "delete"
msgstr "刪除"
-#: js/share.js:587
-msgid "share"
-msgstr "分享"
-
#: js/share.js:917
msgid "Password protected"
msgstr "受密碼保護"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index c482e650038..ad57191a912 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -179,7 +179,7 @@ msgstr "檔案上傳中,離開此頁面將會取消上傳。"
msgid "URL cannot be empty"
msgstr "URL 不能留空"
-#: js/file-upload.js:559 js/filelist.js:1188
+#: js/file-upload.js:559 js/filelist.js:1190
msgid "{new_name} already exists"
msgstr "{new_name} 已經存在"
@@ -217,53 +217,53 @@ msgid ""
"big."
msgstr "正在準備您的下載,若您的檔案較大,將會需要更多時間。"
-#: js/filelist.js:619 js/filelist.js:1691
+#: js/filelist.js:621 js/filelist.js:1693
msgid "Pending"
msgstr "等候中"
-#: js/filelist.js:1139
+#: js/filelist.js:1141
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error moving file"
msgstr "移動檔案失敗"
-#: js/filelist.js:1147
+#: js/filelist.js:1149
msgid "Error"
msgstr "錯誤"
-#: js/filelist.js:1225
+#: js/filelist.js:1227
msgid "Could not rename file"
msgstr "無法重新命名"
-#: js/filelist.js:1346
+#: js/filelist.js:1348
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1449 templates/list.php:62
+#: js/filelist.js:1451 templates/list.php:62
msgid "Name"
msgstr "名稱"
-#: js/filelist.js:1450 templates/list.php:73
+#: js/filelist.js:1452 templates/list.php:73
msgid "Size"
msgstr "大小"
-#: js/filelist.js:1451 templates/list.php:76
+#: js/filelist.js:1453 templates/list.php:76
msgid "Modified"
msgstr "修改時間"
-#: js/filelist.js:1461 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1463 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n 個資料夾"
-#: js/filelist.js:1467 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1469 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n 個檔案"
-#: js/filelist.js:1599 js/filelist.js:1638
+#: js/filelist.js:1601 js/filelist.js:1640
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] "%n 個檔案正在上傳"
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index d09fc3bbabc..43c95b009bb 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -4,13 +4,14 @@
#
# Translators:
# Pellaeon Lin <nfsmwlin@gmail.com>, 2013
+# Flymok <transifex@flymok.net>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-25 06:33-0400\n"
+"PO-Revision-Date: 2014-06-25 03:20+0000\n"
+"Last-Translator: Flymok <transifex@flymok.net>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -32,15 +33,15 @@ msgstr "地點"
#: appinfo/app.php:51
msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
#: appinfo/app.php:54
msgid "Key"
-msgstr ""
+msgstr "鑰"
#: appinfo/app.php:55
msgid "Secret"
-msgstr ""
+msgstr "密"
#: appinfo/app.php:56 appinfo/app.php:65
msgid "Bucket"
@@ -56,23 +57,23 @@ msgstr ""
#: appinfo/app.php:64
msgid "Secret Key"
-msgstr ""
+msgstr "密鑰"
#: appinfo/app.php:66
msgid "Hostname (optional)"
-msgstr ""
+msgstr "主機名稱 (選填)"
#: appinfo/app.php:67
msgid "Port (optional)"
-msgstr ""
+msgstr "埠號 (選填)"
#: appinfo/app.php:68
msgid "Region (optional)"
-msgstr ""
+msgstr "區域 (選填)"
#: appinfo/app.php:69
msgid "Enable SSL"
-msgstr ""
+msgstr "啟用 SSL"
#: appinfo/app.php:70
msgid "Enable Path Style"
@@ -124,7 +125,7 @@ msgstr ""
#: appinfo/app.php:112
msgid "Username (required)"
-msgstr ""
+msgstr "使用者名稱 (必填)"
#: appinfo/app.php:113
msgid "Bucket (required)"
@@ -208,44 +209,44 @@ msgstr "個人"
#: js/mountsfilelist.js:36
msgid "System"
-msgstr ""
+msgstr "系統"
-#: js/settings.js:318 js/settings.js:325
+#: js/settings.js:320 js/settings.js:327
msgid "Saved"
msgstr "已儲存"
#: lib/config.php:703
msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>警告:</b> "
#: lib/config.php:713
msgid " and "
-msgstr ""
+msgstr "與"
#: lib/config.php:735
#, php-format
msgid ""
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
"of %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>警告:</b> PHP 並未啓用 Curl 的支援,因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。"
#: lib/config.php:737
#, php-format
msgid ""
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
" %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>警告</b>:PHP 並未啓用 FTP 的支援,因此無法掛載 %s,請洽您的系統管理員將其安裝並啓用。"
#: lib/config.php:739
#, php-format
msgid ""
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
" ask your system administrator to install it."
-msgstr ""
+msgstr "<b>警告</b>並未安裝 \"%s\",因此無法掛載 %s。請洽您的系統管理員將其安裝並啓用。"
#: templates/list.php:7
msgid "You don't have any external storages"
-msgstr ""
+msgstr "您沒有任何外部儲存"
#: templates/list.php:16
msgid "Name"
@@ -277,7 +278,7 @@ msgstr "選項"
#: templates/settings.php:12
msgid "Available for"
-msgstr ""
+msgstr "可用的"
#: templates/settings.php:32
msgid "Add storage"
@@ -285,7 +286,7 @@ msgstr "增加儲存區"
#: templates/settings.php:92
msgid "No user or group"
-msgstr ""
+msgstr "沒有使用者或群組"
#: templates/settings.php:95
msgid "All Users"
@@ -310,7 +311,7 @@ msgstr "啓用使用者外部儲存"
#: templates/settings.php:135
msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "允許使用者自行掛載以下的外部儲存"
#: templates/settings.php:150
msgid "SSL root certificates"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 3cd04bce5df..1cc9d1886ad 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 05:54+0000\n"
+"POT-Creation-Date: 2014-06-27 01:54-0400\n"
+"PO-Revision-Date: 2014-06-27 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgstr ""
msgid "Couldn't add remote share"
msgstr ""
-#: appinfo/app.php:46 js/app.js:34
+#: appinfo/app.php:33 js/app.js:34
msgid "Shared with you"
msgstr ""
-#: appinfo/app.php:55 js/app.js:53
+#: appinfo/app.php:42 js/app.js:53
msgid "Shared with others"
msgstr ""
-#: appinfo/app.php:64 js/app.js:72
+#: appinfo/app.php:51 js/app.js:72
msgid "Shared by link"
msgstr ""
@@ -50,7 +50,7 @@ msgstr ""
msgid "You haven't shared any files by link yet."
msgstr ""
-#: js/external.js:43 js/external.js:46
+#: js/external.js:45 js/external.js:48
msgid "Add {name} from {owner}@{remote}"
msgstr ""
@@ -124,7 +124,7 @@ msgstr ""
#: templates/public.php:23
msgid "Save"
-msgstr ""
+msgstr "儲存"
#: templates/public.php:28
msgid "Download"
@@ -140,7 +140,7 @@ msgid "Direct link"
msgstr ""
#: templates/settings-admin.php:3
-msgid "File Sharing"
+msgid "Remote Shares"
msgstr ""
#: templates/settings-admin.php:7
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 5e3b3b6bd5a..553d6a03fa5 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-10 01:54-0400\n"
-"PO-Revision-Date: 2014-06-10 05:01+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:12+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po
index 15e25c37623..456d4eb1bdf 100644
--- a/l10n/zh_TW/user_webdavauth.po
+++ b/l10n/zh_TW/user_webdavauth.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-06 01:54-0400\n"
-"PO-Revision-Date: 2014-06-05 06:12+0000\n"
+"POT-Creation-Date: 2014-06-19 01:54-0400\n"
+"PO-Revision-Date: 2014-06-18 06:11+0000\n"
"Last-Translator: I Robot\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/base.php b/lib/base.php
index 7bde1dbeb8f..eef094737b6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -262,15 +262,10 @@ class OC {
* check if the instance needs to preform an upgrade
*
* @return bool
+ * @deprecated use \OCP\Util::needUpgrade instead
*/
public static function needUpgrade() {
- if (OC_Config::getValue('installed', false)) {
- $installedVersion = OC_Config::getValue('version', '0.0.0');
- $currentVersion = implode('.', OC_Util::getVersion());
- return version_compare($currentVersion, $installedVersion, '>');
- } else {
- return false;
- }
+ return \OCP\Util::needUpgrade();
}
/**
@@ -279,7 +274,7 @@ class OC {
* @return bool|void
*/
public static function checkUpgrade($showTemplate = true) {
- if (self::needUpgrade()) {
+ if (\OCP\Util::needUpgrade()) {
if ($showTemplate && !OC_Config::getValue('maintenance', false)) {
$version = OC_Util::getVersion();
$oldTheme = OC_Config::getValue('theme');
@@ -595,7 +590,7 @@ class OC {
* register hooks for the cache
*/
public static function registerCacheHooks() {
- if (OC_Config::getValue('installed', false) && !self::needUpgrade()) { //don't try to do this before we are properly setup
+ if (OC_Config::getValue('installed', false) && !\OCP\Util::needUpgrade()) { //don't try to do this before we are properly setup
\OCP\BackgroundJob::registerJob('OC\Cache\FileGlobalGC');
// NOTE: This will be replaced to use OCP
@@ -608,7 +603,7 @@ class OC {
* register hooks for the cache
*/
public static function registerLogRotate() {
- if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false) && !self::needUpgrade()) {
+ if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
//don't try to do this before we are properly setup
//use custom logfile path if defined, otherwise use default of owncloud.log in data directory
\OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue('logfile', OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/owncloud.log'));
@@ -695,7 +690,7 @@ class OC {
if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) {
try {
- if (!OC_Config::getValue('maintenance', false) && !self::needUpgrade()) {
+ if (!OC_Config::getValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
OC_App::loadApps(array('authentication'));
OC_App::loadApps(array('filesystem', 'logging'));
OC_App::loadApps();
diff --git a/lib/l10n/ast.php b/lib/l10n/ast.php
index e4214df03f1..273ef27b44a 100644
--- a/lib/l10n/ast.php
+++ b/lib/l10n/ast.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
"Users" => "Usuarios",
"Admin" => "Almin",
"Failed to upgrade \"%s\"." => "Fallu al anovar \"%s\".",
+"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "L'aplicación \\\"%s\\\" nun pue instalase porque nun ye compatible con esta versión d'ownCloud",
"No app name specified" => "Nun s'especificó nome de l'aplicación",
"Unknown filetype" => "Triba de ficheru desconocida",
"Invalid image" => "Imaxe inválida",
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index 071f6a98859..b238cc30508 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -5,12 +5,18 @@ $TRANSLATIONS = array(
"Settings" => "Agordo",
"Users" => "Uzantoj",
"Admin" => "Administranto",
+"Failed to upgrade \"%s\"." => "Malsukcesis ĝisdatigo de “%s”.",
+"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "La aplikaĵo “%s” ne povas instaliĝi ĉar ĝi ne kongruas kun ĉi tiu eldono de ownCloud.",
"Unknown filetype" => "Ne konatas dosiertipo",
"Invalid image" => "Ne validas bildo",
"web services under your control" => "TTT-servoj regataj de vi",
+"App directory already exists" => "La dosierujo de la aplikaĵo jam ekzistas",
+"App does not provide an info.xml file" => "La aplikaĵo ne provizas dosieron info.xml",
+"App can't be installed because it is not compatible with this version of ownCloud" => "La aplikaĵo ne povas instaliĝi ĉar ĝi ne kongruas kun ĉi tiu eldono de ownCloud",
"Application is not enabled" => "La aplikaĵo ne estas kapabligita",
"Authentication error" => "Aŭtentiga eraro",
"Token expired. Please reload page." => "Ĵetono eksvalidiĝis. Bonvolu reŝargi la paĝon.",
+"Unknown user" => "Nekonata uzanto",
"%s enter the database username." => "%s enigu la uzantonomon de la datumbazo.",
"%s enter the database name." => "%s enigu la nomon de la datumbazo.",
"%s you may not use dots in the database name" => "%s vi ne povas uzi punktojn en la nomo de la datumbazo",
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 61c47f28e3a..30fe1a58aaa 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
"Users" => "Kasutajad",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Ebaõnnestunud uuendus \"%s\".",
+"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Rakendit \\\"%s\\\" ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
"No app name specified" => "Ühegi rakendi nime pole määratletud",
"Unknown filetype" => "Tundmatu failitüüp",
"Invalid image" => "Vigane pilt",
@@ -57,6 +58,7 @@ $TRANSLATIONS = array(
"Sharing %s failed, because this item is already shared with %s" => "%s jagamine ebaõnnestus, kuna see üksus on juba jagatud %s",
"Sharing %s failed, because the group %s does not exist" => "%s jagamine ebaõnnestus, kuna gruppi %s pole olemas",
"Sharing %s failed, because %s is not a member of the group %s" => "%s jagamine ebaõnnestus, kuna %s pole grupi %s liige",
+"You need to provide a password to create a public link, only protected links are allowed" => "Avaliku viite tekitamiseks pead sisestama parooli, ainult kaitstud viited on lubatud",
"Sharing %s failed, because sharing with links is not allowed" => "%s jagamine ebaõnnestus, kuna linkidega jagamine pole lubatud",
"Share type %s is not valid for %s" => "Jagamise tüüp %s ei ole õige %s jaoks",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Lubade seadistus %s jaoks ebaõnnestus, kuna antud õigused ületavad %s jaoks määratud õigusi",
@@ -83,6 +85,7 @@ $TRANSLATIONS = array(
"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Kasutajanimes on lubatud ainult järgnevad tähemärgid: \"a-z\", \"A-Z\", \"0-9\" ja \"_.@-\"",
"A valid username must be provided" => "Sisesta nõuetele vastav kasutajatunnus",
"A valid password must be provided" => "Sisesta nõuetele vastav parool",
-"The username is already being used" => "Kasutajanimi on juba kasutuses"
+"The username is already being used" => "Kasutajanimi on juba kasutuses",
+"Could not obtain lock type %d on \"%s\"." => "Ei suutnud hankida %d tüüpi lukustust \"%s\"."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index d753e2cf44e..6b6865184eb 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
"Users" => "Utilisateurs",
"Admin" => "Administration",
"Failed to upgrade \"%s\"." => "Echec de la mise à niveau \"%s\".",
+"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "L'application \\\"%s\\\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud.",
"No app name specified" => "Aucun nom d'application spécifié",
"Unknown filetype" => "Type de fichier inconnu",
"Invalid image" => "Image invalide",
diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php
index 29a1ae102ec..aa779d62ce2 100644
--- a/lib/l10n/ja.php
+++ b/lib/l10n/ja.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
"Users" => "ユーザー",
"Admin" => "管理",
"Failed to upgrade \"%s\"." => "\"%s\" へのアップグレードに失敗しました。",
+"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "アプリ \\\"%s\\\" をインストールできません。現在の owncloud のバージョンと互換性がありません。",
"No app name specified" => "アプリ名が未指定",
"Unknown filetype" => "不明なファイルタイプ",
"Invalid image" => "無効な画像",
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index c112d8bf34e..e643cab1162 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
"Users" => "Gebruikers",
"Admin" => "Beheerder",
"Failed to upgrade \"%s\"." => "Upgrade \"%s\" mislukt.",
+"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App \\\"%s\\\" kan niet worden geïnstalleerd omdat de app niet compatible is met deze versie van ownCloud.",
"No app name specified" => "De app naam is niet gespecificeerd.",
"Unknown filetype" => "Onbekend bestandsformaat",
"Invalid image" => "Ongeldige afbeelding",
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 4906a1305a0..e902edb9de5 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -4,7 +4,7 @@ $TRANSLATIONS = array(
"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Por favor, contate o administrador. Se você é um administrador desta instância, configurre o \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
"Help" => "Ajuda",
"Personal" => "Pessoal",
-"Settings" => "Ajustes",
+"Settings" => "Configurações",
"Users" => "Usuários",
"Admin" => "Admin",
"Failed to upgrade \"%s\"." => "Falha na atualização de \"%s\".",
@@ -16,7 +16,7 @@ $TRANSLATIONS = array(
"App directory already exists" => "Diretório App já existe",
"Can't create app folder. Please fix permissions. %s" => "Não é possível criar pasta app. Corrija as permissões. %s",
"No source specified when installing app" => "Nenhuma fonte foi especificada enquanto instalava o aplicativo",
-"No href specified when installing app from http" => "Nenhuma href foi especificada enquanto instalava o aplicativo de httml",
+"No href specified when installing app from http" => "Nenhuma href foi especificada enquanto instalava o aplicativo de http",
"No path specified when installing app from local file" => "Nenhum caminho foi especificado enquanto instalava o aplicativo do arquivo local",
"Archives of type %s are not supported" => "Arquivos do tipo %s não são suportados",
"Failed to open archive when installing app" => "Falha para abrir o arquivo enquanto instalava o aplicativo",
@@ -24,7 +24,7 @@ $TRANSLATIONS = array(
"App can't be installed because of not allowed code in the App" => "O aplicativo não pode ser instalado por causa do código não permitido no Aplivativo",
"App can't be installed because it is not compatible with this version of ownCloud" => "O aplicativo não pode ser instalado porque não é compatível com esta versão do ownCloud",
"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "O aplicativo não pode ser instalado porque ele contém a marca <shipped>verdadeiro</shipped> que não é permitido para aplicações não embarcadas",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "O aplicativo não pode ser instalado porque a versão em info.xml /versão não é a mesma que a versão relatada na App Store",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "O aplicativo não pode ser instalado porque a versão em info.xml/versão não é a mesma que a versão relatada na App Store",
"Application is not enabled" => "Aplicação não está habilitada",
"Authentication error" => "Erro de autenticação",
"Token expired. Please reload page." => "Token expirou. Por favor recarregue a página.",
@@ -33,7 +33,7 @@ $TRANSLATIONS = array(
"%s enter the database name." => "%s insira o nome do banco de dados.",
"%s you may not use dots in the database name" => "%s você não pode usar pontos no nome do banco de dados",
"MS SQL username and/or password not valid: %s" => "Nome de usuário e/ou senha MS SQL inválido(s): %s",
-"You need to enter either an existing account or the administrator." => "Você precisa inserir uma conta existente ou o administrador.",
+"You need to enter either an existing account or the administrator." => "Você precisa inserir uma conta existente ou a do administrador.",
"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB nome de usuário e/ou senha não é válida",
"DB Error: \"%s\"" => "Erro no BD: \"%s\"",
"Offending command was: \"%s\"" => "Comando ofensivo era: \"%s\"",
@@ -45,9 +45,9 @@ $TRANSLATIONS = array(
"Oracle username and/or password not valid" => "Nome de usuário e/ou senha Oracle inválido(s)",
"Offending command was: \"%s\", name: %s, password: %s" => "Comando ofensivo era: \"%s\", nome: %s, senha: %s",
"PostgreSQL username and/or password not valid" => "Nome de usuário e/ou senha PostgreSQL inválido(s)",
-"Set an admin username." => "Defina um nome de usuário de administrador.",
+"Set an admin username." => "Defina um nome do usuário administrador.",
"Set an admin password." => "Defina uma senha de administrador.",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando.",
"Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira os <a href='%s'>guias de instalação</a>.",
"%s shared »%s« with you" => "%s compartilhou »%s« com você",
"Sharing %s failed, because the file does not exist" => "Compartilhamento %s falhou, porque o arquivo não existe",
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 59bc2a321fd..f160c0e92e0 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -1,11 +1,14 @@
<?php
$TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "Вы пытаетесь получить доступ к серверу с неподтверждённого домена.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Пожалуйста, свяжитесь с администратором. Если вы администратор этого хранилища, сконфигурируйте \"trusted_domain\" в config/config.php. Пример настройки можно найти в /config/config.sample.php.",
"Help" => "Помощь",
"Personal" => "Личное",
"Settings" => "Конфигурация",
"Users" => "Пользователи",
-"Admin" => "Admin",
+"Admin" => "Администрирование",
"Failed to upgrade \"%s\"." => "Не смог обновить \"%s\".",
+"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Невозможно установить приложение \\\"%s\\\", т.к. оно несовместимо с этой версией ownCloud.",
"No app name specified" => "Не выбрано имя приложения",
"Unknown filetype" => "Неизвестный тип файла",
"Invalid image" => "Изображение повреждено",
@@ -47,15 +50,22 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV.",
"Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
"%s shared »%s« with you" => "%s поделился »%s« с вами",
+"Sharing %s failed, because the file does not exist" => "Публикация %s неудачна, т.к. файл не существует",
+"You are not allowed to share %s" => "Вам запрещено публиковать %s",
"Sharing %s failed, because the user %s is the item owner" => "Не удалось установить общий доступ для %s, пользователь %s уже является владельцем",
"Sharing %s failed, because the user %s does not exist" => "Не удалось установить общий доступ для %s, пользователь %s не существует.",
"Sharing %s failed, because this item is already shared with %s" => "Не удалось установить общий доступ для %s ,в виду того что, объект уже находиться в общем доступе с %s",
"Sharing %s failed, because the group %s does not exist" => "Не удалось установить общий доступ для %s, группа %s не существует.",
"Sharing %s failed, because %s is not a member of the group %s" => "Не удалось установить общий доступ для %s, %s не является членом группы %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Вам нужно задать пароль для создания публичной ссылки. Разрешены только защищённые ссылки",
"Sharing %s failed, because sharing with links is not allowed" => "Не удалось установить общий доступ для %s, потому что обмен со ссылками не допускается",
"Share type %s is not valid for %s" => "Такой втд общего доступа как %s не допустим для %s",
"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Настройка прав доступа для %s невозможна, поскольку права доступа превышают предоставленные права доступа %s",
"Setting permissions for %s failed, because the item was not found" => "Не удалось произвести настройку прав доступа для %s , элемент не был найден.",
+"Sharing backend %s not found" => "Бэкэнд для общего доступа %s не найден",
+"Sharing backend for %s not found" => "Бэкэнд для общего доступа к %s не найден",
+"Sharing %s failed, because the user %s is the original sharer" => "Публикация %s неудачна, т.к. пользователь %s - публикатор оригинала файла",
+"Sharing %s failed, because resharing is not allowed" => "Публикация %s неудачна, т.к републикация запрещена",
"Could not find category \"%s\"" => "Категория \"%s\" не найдена",
"seconds ago" => "несколько секунд назад",
"_%n minute ago_::_%n minutes ago_" => array("%n минута назад","%n минуты назад","%n минут назад"),
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index fc1011b33b3..dae5e3ead59 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
"Users" => "Používatelia",
"Admin" => "Administrátor",
"Failed to upgrade \"%s\"." => "Zlyhala aktualizácia \"%s\".",
+"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikáciu \\\"%s\\\" nemožno nainštalovať, pretože nie je kompatibilná s touto verziou systému ownCloud.",
"No app name specified" => "Nešpecifikované meno aplikácie",
"Unknown filetype" => "Neznámy typ súboru",
"Invalid image" => "Chybný obrázok",
diff --git a/lib/private/app.php b/lib/private/app.php
index a62623905ff..9fb0ec2e34f 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -174,6 +174,7 @@ class OC_App {
}
$appConfig = \OC::$server->getAppConfig();
$appStatus = $appConfig->getValues(false, 'enabled');
+ $user = \OC_User::getUser();
foreach ($appStatus as $app => $enabled) {
if ($app === 'files') {
continue;
@@ -181,7 +182,6 @@ class OC_App {
if ($enabled === 'yes') {
$apps[] = $app;
} else if ($enabled !== 'no') {
- $user = \OC_User::getUser();
$groups = json_decode($enabled);
if (is_array($groups)) {
foreach ($groups as $group) {
@@ -195,7 +195,12 @@ class OC_App {
}
sort($apps);
array_unshift($apps, 'files');
- self::$enabledAppsCache = $apps;
+ // Only cache the app list, when the user is logged in.
+ // Otherwise we cache the list with disabled apps, although
+ // the apps are enabled for the user after he logged in.
+ if ($user) {
+ self::$enabledAppsCache = $apps;
+ }
return $apps;
}
@@ -504,6 +509,10 @@ class OC_App {
* @return string|false
*/
public static function getAppPath($appid) {
+ if ($appid === null || trim($appid) === '') {
+ return false;
+ }
+
if (($dir = self::findAppInDirectories($appid)) != false) {
return $dir['path'] . '/' . $appid;
}
diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php
index 6641097cf90..211d7e9abfc 100644
--- a/lib/private/backgroundjob/joblist.php
+++ b/lib/private/backgroundjob/joblist.php
@@ -152,6 +152,10 @@ class JobList implements IJobList {
if ($class === 'OC_Cache_FileGlobalGC') {
$class = '\OC\Cache\FileGlobalGC';
}
+ if (!class_exists($class)) {
+ // job from disabled app or old version of an app, no need to do anything
+ return null;
+ }
$job = new $class();
$job->setId($row['id']);
$job->setLastRun($row['last_run']);
diff --git a/lib/private/backgroundjob/legacy/queuedjob.php b/lib/private/backgroundjob/legacy/queuedjob.php
index 2bc001103b8..c5705abb467 100644
--- a/lib/private/backgroundjob/legacy/queuedjob.php
+++ b/lib/private/backgroundjob/legacy/queuedjob.php
@@ -13,6 +13,8 @@ class QueuedJob extends \OC\BackgroundJob\QueuedJob {
$class = $argument['klass'];
$method = $argument['method'];
$parameters = $argument['parameters'];
- call_user_func(array($class, $method), $parameters);
+ if (is_callable(array($class, $method))) {
+ call_user_func(array($class, $method), $parameters);
+ }
}
}
diff --git a/lib/private/backgroundjob/legacy/regularjob.php b/lib/private/backgroundjob/legacy/regularjob.php
index d4cfa348cea..eb85a30b4be 100644
--- a/lib/private/backgroundjob/legacy/regularjob.php
+++ b/lib/private/backgroundjob/legacy/regularjob.php
@@ -10,6 +10,8 @@ namespace OC\BackgroundJob\Legacy;
class RegularJob extends \OC\BackgroundJob\Job {
public function run($argument) {
- call_user_func($argument);
+ if (is_callable($argument)) {
+ call_user_func($argument);
+ }
}
}
diff --git a/lib/private/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php
index f2578e3c097..54596db3c47 100644
--- a/lib/private/connector/sabre/objecttree.php
+++ b/lib/private/connector/sabre/objecttree.php
@@ -135,10 +135,7 @@ class ObjectTree extends \Sabre\DAV\ObjectTree {
throw new \Sabre\DAV\Exception\Forbidden();
}
if ($sourceDir !== $destinationDir) {
- if (!$this->fileView->isUpdatable($sourceDir)) {
- throw new \Sabre\DAV\Exception\Forbidden();
- }
- if (!$this->fileView->isUpdatable($destinationDir)) {
+ if (!$this->fileView->isCreatable($destinationDir)) {
throw new \Sabre\DAV\Exception\Forbidden();
}
if (!$this->fileView->isDeletable($sourcePath) && !$isMovableMount) {
diff --git a/apps/files_external/lib/webdav.php b/lib/private/files/storage/dav.php
index c532c5eaa7d..8536c65ace9 100644
--- a/apps/files_external/lib/webdav.php
+++ b/lib/private/files/storage/dav.php
@@ -209,8 +209,14 @@ class DAV extends \OC\Files\Storage\Common {
$ext = '';
}
if ($this->file_exists($path)) {
+ if (!$this->isUpdatable($path)) {
+ return false;
+ }
$tmpFile = $this->getCachedFile($path);
} else {
+ if (!$this->isCreatable(dirname($path))) {
+ return false;
+ }
$tmpFile = \OCP\Files::tmpFile($ext);
}
\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
diff --git a/lib/private/files/utils/scanner.php b/lib/private/files/utils/scanner.php
index 1bb3e694c96..c2fabf51946 100644
--- a/lib/private/files/utils/scanner.php
+++ b/lib/private/files/utils/scanner.php
@@ -11,6 +11,7 @@ namespace OC\Files\Utils;
use OC\Files\View;
use OC\Files\Cache\ChangePropagator;
use OC\Files\Filesystem;
+use OC\ForbiddenException;
use OC\Hooks\PublicEmitter;
/**
@@ -104,6 +105,7 @@ class Scanner extends PublicEmitter {
/**
* @param string $dir
+ * @throws \OC\ForbiddenException
*/
public function scan($dir) {
$mounts = $this->getMounts($dir);
@@ -111,7 +113,14 @@ class Scanner extends PublicEmitter {
if (is_null($mount->getStorage())) {
continue;
}
- $scanner = $mount->getStorage()->getScanner();
+ $storage = $mount->getStorage();
+ // if the home storage isn't writable then the scanner is run as the wrong user
+ if ($storage->instanceOfStorage('\OC\Files\Storage\Home') and
+ (!$storage->isCreatable('') or !$storage->isCreatable('files'))
+ ) {
+ throw new ForbiddenException();
+ }
+ $scanner = $storage->getScanner();
$this->attachListener($mount);
$scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG | \OC\Files\Cache\Scanner::REUSE_SIZE);
}
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 91d7ea260d3..ff3cb9ee68b 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -896,7 +896,7 @@ class View {
return false;
}
- if ($mount instanceof MoveableMount) {
+ if ($mount instanceof MoveableMount && $internalPath === '') {
$data['permissions'] |= \OCP\PERMISSION_DELETE | \OCP\PERMISSION_UPDATE;
}
diff --git a/lib/private/helper.php b/lib/private/helper.php
index 243baa46948..f90c38d236c 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -405,12 +405,17 @@ class OC_Helper {
*/
static function rmdirr($dir) {
if (is_dir($dir)) {
- $files = scandir($dir);
- // FIXME: use flat array instead of recursion to avoid
- // too many levels
- foreach ($files as $file) {
- if ($file !== '' && $file !== "." && $file !== "..") {
- self::rmdirr("$dir/$file");
+ $files = new RecursiveIteratorIterator(
+ new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS),
+ RecursiveIteratorIterator::CHILD_FIRST
+ );
+
+ foreach ($files as $fileInfo) {
+ /** @var SplFileInfo $fileInfo */
+ if ($fileInfo->isDir()) {
+ rmdir($fileInfo->getRealPath());
+ } else {
+ unlink($fileInfo->getRealPath());
}
}
rmdir($dir);
diff --git a/lib/private/installer.php b/lib/private/installer.php
index 466aa4a8f89..29470dbe3a6 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -143,8 +143,12 @@ class OC_Installer{
* @param array $info
* @param bool $isShipped
*
+ * This function could work like described below, but currently it disables and then
+ * enables the app again. This does result in an updated app.
+ *
+ *
* This function installs an app. All information needed are passed in the
- * associative array $data.
+ * associative array $info.
* The following keys are required:
* - source: string, can be "path" or "http"
*
diff --git a/lib/private/repair.php b/lib/private/repair.php
index 23d1c2b831e..14a917be32c 100644
--- a/lib/private/repair.php
+++ b/lib/private/repair.php
@@ -13,7 +13,7 @@ use OC\Hooks\Emitter;
class Repair extends BasicEmitter {
/**
- * @var array
+ * @var RepairStep[]
**/
private $repairSteps;
@@ -68,7 +68,9 @@ class Repair extends BasicEmitter {
* @return array of RepairStep instances
*/
public static function getRepairSteps() {
- return array();
+ return array(
+ new \OC\Repair\RepairMimeTypes()
+ );
}
/**
@@ -78,6 +80,16 @@ class Repair extends BasicEmitter {
* @return array of RepairStep instances
*/
public static function getBeforeUpgradeRepairSteps() {
- return array();
+ return array(
+ );
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * Redeclared as public to allow invocation from within the closure above in php 5.3
+ */
+ public function emit($scope, $method, $arguments = array()) {
+ parent::emit($scope, $method, $arguments);
}
}
diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index e7c8ad9ebdd..f3a4bc5f3e4 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -192,7 +192,9 @@ class Router implements IRouter {
$this->loadRoutes($app);
} else if (substr($url, 0, 6) === '/core/' or substr($url, 0, 10) === '/settings/') {
\OC::$REQUESTEDAPP = $url;
- \OC_App::loadApps();
+ if (!\OC_Config::getValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
+ \OC_App::loadApps();
+ }
$this->loadRoutes('core');
} else {
$this->loadRoutes();
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 7a08816c4b1..fdf98ab0959 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -50,6 +50,12 @@ class OC_Setup {
$username = htmlspecialchars_decode($options['adminlogin']);
$password = htmlspecialchars_decode($options['adminpass']);
$datadir = htmlspecialchars_decode($options['directory']);
+ if( isset($options['trusted_domains'])
+ && is_array($options['trusted_domains'])) {
+ $trustedDomains = $options['trusted_domains'];
+ } else {
+ $trustedDomains = array(OC_Request::serverHost());
+ }
if (OC_Util::runningOnWindows()) {
$datadir = rtrim(realpath($datadir), '\\');
@@ -65,7 +71,7 @@ class OC_Setup {
OC_Config::setValue('passwordsalt', $salt);
//write the config file
- OC_Config::setValue('trusted_domains', array(OC_Request::serverHost()));
+ OC_Config::setValue('trusted_domains', $trustedDomains);
OC_Config::setValue('datadirectory', $datadir);
OC_Config::setValue('dbtype', $dbtype);
OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php
index 71c6d8517a9..46e3c280488 100644
--- a/lib/private/share/helper.php
+++ b/lib/private/share/helper.php
@@ -149,17 +149,18 @@ class Helper extends \OC\Share\Constants {
*/
public static function delete($parent, $excludeParent = false, $uidOwner = null) {
$ids = array($parent);
+ $deletedItems = array();
$parents = array($parent);
while (!empty($parents)) {
$parents = "'".implode("','", $parents)."'";
// Check the owner on the first search of reshares, useful for
// finding and deleting the reshares by a single user of a group share
if (count($ids) == 1 && isset($uidOwner)) {
- $query = \OC_DB::prepare('SELECT `id`, `uid_owner`, `item_type`, `item_target`, `parent`'
+ $query = \OC_DB::prepare('SELECT `id`, `share_with`, `item_type`, `share_type`, `item_target`, `file_target`, `parent`'
.' FROM `*PREFIX*share` WHERE `parent` IN ('.$parents.') AND `uid_owner` = ?');
$result = $query->execute(array($uidOwner));
} else {
- $query = \OC_DB::prepare('SELECT `id`, `item_type`, `item_target`, `parent`, `uid_owner`'
+ $query = \OC_DB::prepare('SELECT `id`, `share_with`, `item_type`, `share_type`, `item_target`, `file_target`, `parent`, `uid_owner`'
.' FROM `*PREFIX*share` WHERE `parent` IN ('.$parents.')');
$result = $query->execute();
}
@@ -168,16 +169,29 @@ class Helper extends \OC\Share\Constants {
while ($item = $result->fetchRow()) {
$ids[] = $item['id'];
$parents[] = $item['id'];
+ $tmpItem = array(
+ 'id' => $item['id'],
+ 'shareWith' => $item['share_with'],
+ 'itemTarget' => $item['item_target'],
+ 'itemType' => $item['item_type'],
+ 'shareType' => (int)$item['share_type'],
+ );
+ if (isset($item['file_target'])) {
+ $tmpItem['fileTarget'] = $item['file_target'];
+ }
+ $deletedItems[] = $tmpItem;
}
}
if ($excludeParent) {
unset($ids[0]);
}
if (!empty($ids)) {
- $ids = "'".implode("','", $ids)."'";
- $query = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `id` IN ('.$ids.')');
+ $idList = "'".implode("','", $ids)."'";
+ $query = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `id` IN ('.$idList.')');
$query->execute();
}
+
+ return $deletedItems;
}
/**
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 26108a937ce..c06ea72c348 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -738,11 +738,24 @@ class Share extends \OC\Share\Constants {
$shares = $result->fetchAll();
+ $listOfUnsharedItems = array();
+
$itemUnshared = false;
foreach ($shares as $share) {
if ((int)$share['share_type'] === \OCP\Share::SHARE_TYPE_USER &&
$share['share_with'] === $uid) {
- Helper::delete($share['id']);
+ $deletedShares = Helper::delete($share['id']);
+ $shareTmp = array(
+ 'id' => $share['id'],
+ 'shareWith' => $share['share_with'],
+ 'itemTarget' => $share['item_target'],
+ 'itemType' => $share['item_type'],
+ 'shareType' => (int)$share['share_type'],
+ );
+ if (isset($share['file_target'])) {
+ $shareTmp['fileTarget'] = $share['file_target'];
+ }
+ $listOfUnsharedItems = array_merge($listOfUnsharedItems, $deletedShares, array($shareTmp));
$itemUnshared = true;
break;
} elseif ((int)$share['share_type'] === \OCP\Share::SHARE_TYPE_GROUP) {
@@ -764,13 +777,40 @@ class Share extends \OC\Share\Constants {
$groupShare['id'], self::$shareTypeGroupUserUnique,
\OC_User::getUser(), $groupShare['uid_owner'], 0, $groupShare['stime'], $groupShare['file_source'],
$groupShare['file_target']));
+ $shareTmp = array(
+ 'id' => $groupShare['id'],
+ 'shareWith' => $groupShare['share_with'],
+ 'itemTarget' => $groupShare['item_target'],
+ 'itemType' => $groupShare['item_type'],
+ 'shareType' => (int)$groupShare['share_type'],
+ );
+ if (isset($groupShare['file_target'])) {
+ $shareTmp['fileTarget'] = $groupShare['file_target'];
+ }
+ $listOfUnsharedItems = array_merge($listOfUnsharedItems, array($groupShare));
$itemUnshared = true;
} elseif (!$itemUnshared && isset($uniqueGroupShare)) {
$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?');
$query->execute(array(0, $uniqueGroupShare['id']));
+ $shareTmp = array(
+ 'id' => $uniqueGroupShare['id'],
+ 'shareWith' => $uniqueGroupShare['share_with'],
+ 'itemTarget' => $uniqueGroupShare['item_target'],
+ 'itemType' => $uniqueGroupShare['item_type'],
+ 'shareType' => (int)$uniqueGroupShare['share_type'],
+ );
+ if (isset($uniqueGroupShare['file_target'])) {
+ $shareTmp['fileTarget'] = $uniqueGroupShare['file_target'];
+ }
+ $listOfUnsharedItems = array_merge($listOfUnsharedItems, array($uniqueGroupShare));
$itemUnshared = true;
}
+ if ($itemUnshared) {
+ \OC_Hook::emit('OCP\Share', 'post_unshareFromSelf',
+ array('unsharedItems' => $listOfUnsharedItems, 'itemType' => $itemType));
+ }
+
return $itemUnshared;
}
@@ -967,19 +1007,23 @@ class Share extends \OC\Share\Constants {
protected static function unshareItem(array $item) {
// Pass all the vars we have for now, they may be useful
$hookParams = array(
+ 'id' => $item['id'],
'itemType' => $item['item_type'],
'itemSource' => $item['item_source'],
- 'fileSource' => $item['file_source'],
- 'shareType' => $item['share_type'],
+ 'shareType' => (int)$item['share_type'],
'shareWith' => $item['share_with'],
'itemParent' => $item['parent'],
'uidOwner' => $item['uid_owner'],
);
+ if($item['item_type'] === 'file' || $item['item_type'] === 'folder') {
+ $hookParams['fileSource'] = $item['file_source'];
+ $hookParams['fileTarget'] = $item['file_target'];
+ }
- \OC_Hook::emit('OCP\Share', 'pre_unshare', $hookParams + array(
- 'fileSource' => $item['file_source'],
- ));
- Helper::delete($item['id']);
+ \OC_Hook::emit('OCP\Share', 'pre_unshare', $hookParams);
+ $deletedShares = Helper::delete($item['id']);
+ $deletedShares[] = $hookParams;
+ $hookParams['deletedShares'] = $deletedShares;
\OC_Hook::emit('OCP\Share', 'post_unshare', $hookParams);
}
@@ -1788,7 +1832,7 @@ class Share extends \OC\Share\Constants {
if (isset($uidOwner)) {
if ($fileDependent) {
$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `*PREFIX*share`.`parent`,'
- . ' `share_type`, `share_with`, `file_source`, `path`, `*PREFIX*share`.`permissions`, `stime`,'
+ . ' `share_type`, `share_with`, `file_source`, `file_target`, `path`, `*PREFIX*share`.`permissions`, `stime`,'
. ' `expiration`, `token`, `storage`, `mail_send`, `uid_owner`';
} else {
$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `*PREFIX*share`.`permissions`,'
diff --git a/lib/private/util.php b/lib/private/util.php
index d384eda5f7f..225cd64dbb3 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -377,7 +377,7 @@ class OC_Util {
$errors = array();
$CONFIG_DATADIRECTORY = OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data');
- if (!\OC::needUpgrade() && OC_Config::getValue('installed', false)) {
+ if (!self::needUpgrade() && OC_Config::getValue('installed', false)) {
// this check needs to be done every time
$errors = self::checkDataDirectoryValidity($CONFIG_DATADIRECTORY);
}
@@ -1404,4 +1404,19 @@ class OC_Util {
}
return true;
}
+
+ /**
+ * Check whether the instance needs to preform an upgrade
+ *
+ * @return bool
+ */
+ public static function needUpgrade() {
+ if (OC_Config::getValue('installed', false)) {
+ $installedVersion = OC_Config::getValue('version', '0.0.0');
+ $currentVersion = implode('.', OC_Util::getVersion());
+ return version_compare($currentVersion, $installedVersion, '>');
+ } else {
+ return false;
+ }
+ }
}
diff --git a/lib/public/util.php b/lib/public/util.php
index d1faec3997f..8f4691eeade 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -516,4 +516,13 @@ class Util {
public static function isPublicLinkPasswordRequired() {
return \OC_Util::isPublicLinkPasswordRequired();
}
+
+ /**
+ * Checks whether the current version needs upgrade.
+ *
+ * @return bool true if upgrade is needed, false otherwise
+ */
+ public static function needUpgrade() {
+ return \OC_Util::needUpgrade();
+ }
}
diff --git a/lib/repair/repairmimetypes.php b/lib/repair/repairmimetypes.php
new file mode 100644
index 00000000000..f7618c6e060
--- /dev/null
+++ b/lib/repair/repairmimetypes.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ * Copyright (c) 2014 Jörn Dreyer jfd@owncloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Repair;
+
+use OC\Hooks\BasicEmitter;
+
+class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
+
+ public function getName() {
+ return 'Repair mime types';
+ }
+
+ private function fixOfficeMimeTypes() {
+ // update wrong mimetypes
+ $wrongMimetypes = array(
+ 'application/mspowerpoint' => 'application/vnd.ms-powerpoint',
+ 'application/msexcel' => 'application/vnd.ms-excel',
+ );
+
+ $existsStmt = \OC_DB::prepare('
+ SELECT count(`mimetype`)
+ FROM `*PREFIX*mimetypes`
+ WHERE `mimetype` = ?
+ ');
+
+ $getIdStmt = \OC_DB::prepare('
+ SELECT `id`
+ FROM `*PREFIX*mimetypes`
+ WHERE `mimetype` = ?
+ ');
+
+ $insertStmt = \OC_DB::prepare('
+ INSERT INTO `*PREFIX*mimetypes` ( `mimetype` )
+ VALUES ( ? )
+ ');
+
+ $updateWrongStmt = \OC_DB::prepare('
+ UPDATE `*PREFIX*filecache`
+ SET `mimetype` = (
+ SELECT `id`
+ FROM `*PREFIX*mimetypes`
+ WHERE `mimetype` = ?
+ ) WHERE `mimetype` = ?
+ ');
+
+ $deleteStmt = \OC_DB::prepare('
+ DELETE FROM `*PREFIX*mimetypes`
+ WHERE `id` = ?
+ ');
+
+ foreach ($wrongMimetypes as $wrong => $correct) {
+
+
+ // do we need to remove a wrong mimetype?
+ $result = \OC_DB::executeAudited($getIdStmt, array($wrong));
+ $wrongId = $result->fetchOne();
+
+ if ($wrongId !== false) {
+
+ // do we need to insert the correct mimetype?
+ $result = \OC_DB::executeAudited($existsStmt, array($correct));
+ $exists = $result->fetchOne();
+
+ if ( ! $exists ) {
+ // insert mimetype
+ \OC_DB::executeAudited($insertStmt, array($correct));
+ }
+
+ // change wrong mimetype to correct mimetype in filecache
+ \OC_DB::executeAudited($updateWrongStmt, array($correct, $wrongId));
+
+ // delete wrong mimetype
+ \OC_DB::executeAudited($deleteStmt, array($wrongId));
+
+ }
+
+ }
+
+ $updatedMimetypes = array(
+ 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+ 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+ );
+
+ $updateByNameStmt = \OC_DB::prepare('
+ UPDATE `*PREFIX*filecache`
+ SET `mimetype` = (
+ SELECT `id`
+ FROM `*PREFIX*mimetypes`
+ WHERE `mimetype` = ?
+ ) WHERE `name` LIKE ?
+ ');
+
+ // separate doc from docx etc
+ foreach ($updatedMimetypes as $extension => $mimetype ) {
+ $result = \OC_DB::executeAudited($existsStmt, array($mimetype));
+ $exists = $result->fetchOne();
+
+ if ( ! $exists ) {
+ // insert mimetype
+ \OC_DB::executeAudited($insertStmt, array($mimetype));
+ }
+
+ // change mimetype for files with x extension
+ \OC_DB::executeAudited($updateByNameStmt, array($mimetype, '%.'.$extension));
+ }
+ }
+
+ /**
+ * Fix mime types
+ */
+ public function run() {
+ if ($this->fixOfficeMimeTypes()) {
+ $this->emit('\OC\Repair', 'info', array('Fixed office mime types'));
+ }
+ }
+}
+
diff --git a/remote.php b/remote.php
index 232e47ee402..a91742b0475 100644
--- a/remote.php
+++ b/remote.php
@@ -2,6 +2,15 @@
try {
require_once 'lib/base.php';
+
+ if (\OCP\Util::needUpgrade()) {
+ // since the behavior of apps or remotes are unpredictable during
+ // an upgrade, return a 503 directly
+ OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+ OC_Template::printErrorPage('Service unavailable');
+ exit;
+ }
+
$path_info = OC_Request::getPathInfo();
if ($path_info === false || $path_info === '') {
OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 906712a56ba..ef8428bd3ef 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -83,6 +83,7 @@ td.name, td.password { padding-left:.8em; }
td.password>img,td.displayName>img, td.remove>a, td.quota>img { visibility:hidden; }
td.password, td.quota, td.displayName { width:12em; cursor:pointer; }
td.password>span, td.quota>span, rd.displayName>span { margin-right: 1.2em; color: #C7C7C7; }
+span.usersLastLoginTooltip { white-space: nowrap; }
td.remove { width:1em; padding-right:1em; }
tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:pointer; }
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index a911225c5c5..1c0f3eef840 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -80,13 +80,23 @@ var UserList = {
}
}
$tr.find('td.storageLocation').text(storageLocation);
+
if(lastLogin === 0) {
- lastLogin = t('settings', 'never');
+ var lastLoginRel = t('settings', 'never');
+ var lastLoginAbs = lastLoginRel;
} else {
lastLogin = new Date(lastLogin * 1000);
- lastLogin = relative_modified_date(lastLogin.getTime() / 1000);
+ var lastLoginRel = relative_modified_date(lastLogin.getTime() / 1000);
+ var lastLoginAbs = formatDate(lastLogin.getTime());
}
- $tr.find('td.lastLogin').text(lastLogin);
+ $tdLastLogin = $tr.find('td.lastLogin');
+ $tdLastLogin.text(lastLoginRel);
+ //tooltip makes it complicated … to not insert new HTML, we adjust the
+ //original title. We use a temporary div to get back the html that we
+ //can pass later. It is also required to initialise tipsy.
+ var tooltip = $('<div>').html($($tdLastLogin.attr('original-title')).text(lastLoginAbs)).html();
+ $tdLastLogin.tipsy({gravity:'s', fade:true, html:true});
+ $tdLastLogin.attr('title', tooltip);
$tr.appendTo($userList);
if(UserList.isEmpty === true) {
//when the list was emptied, one row was left, necessary to keep
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
index 4afbe1c50bb..2268368d504 100644
--- a/settings/l10n/ast.php
+++ b/settings/l10n/ast.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
"Couldn't decrypt your files, check your password and try again" => "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués",
"Encryption keys deleted permanently" => "Desaniciaes dafechu les claves de cifráu",
"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nun pudieron desaniciase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
+"Couldn't remove app." => "Nun pudo desaniciase l'aplicación.",
"Email saved" => "Corréu-e guardáu",
"Invalid email" => "Corréu electrónicu non válidu",
"Unable to delete group" => "Nun pudo desaniciase'l grupu",
@@ -43,6 +44,7 @@ $TRANSLATIONS = array(
"User Documentation" => "Documentación d'usuariu",
"Admin Documentation" => "Documentación p'alministradores",
"Update to {appversion}" => "Anovar a {appversion}",
+"Uninstall App" => "Desinstalar aplicación",
"Disable" => "Desactivar",
"Enable" => "Activar",
"Please wait...." => "Espera, por favor....",
@@ -53,6 +55,9 @@ $TRANSLATIONS = array(
"Error" => "Fallu",
"Update" => "Anovar",
"Updated" => "Anováu",
+"Uninstalling ...." => "Desinstalando ...",
+"Error while uninstalling app" => "Fallu entrín se desinstalaba l'aplicación",
+"Uninstall" => "Desinstalar",
"Select a profile picture" => "Esbillar una imaxe de perfil",
"Very weak password" => "Contraseña mui feble",
"Weak password" => "Contraseña feble",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 498600862a2..2d1a1632789 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -44,7 +44,7 @@ $TRANSLATIONS = array(
"User Documentation" => "Uživatelská dokumentace",
"Admin Documentation" => "Dokumentace pro administrátory",
"Update to {appversion}" => "Aktualizovat na {appversion}",
-"Uninstall App" => "Odinstalovat Aplikaci",
+"Uninstall App" => "Odinstalovat aplikaci",
"Disable" => "Zakázat",
"Enable" => "Povolit",
"Please wait...." => "Čekejte prosím...",
@@ -198,13 +198,13 @@ $TRANSLATIONS = array(
"Log-in password" => "Přihlašovací heslo",
"Decrypt all Files" => "Odšifrovat všechny soubory",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vaše šifrovací klíče byly zálohovány. Pokud se něco pokazilo, dají se znovu obnovit. Smažte je trvale pouze pokud jste jisti, že jsou všechny vaše soubory bezchybně dešifrovány.",
-"Restore Encryption Keys" => "Obnovit Šifrovací Klíče",
-"Delete Encryption Keys" => "Smazat Šifrovací Klíče",
+"Restore Encryption Keys" => "Obnovit šifrovací klíče",
+"Delete Encryption Keys" => "Smazat šifrovací klíče",
"Login Name" => "Přihlašovací jméno",
"Create" => "Vytvořit",
"Admin Recovery Password" => "Heslo obnovy správce",
"Enter the recovery password in order to recover the users files during password change" => "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
-"Search Users and Groups" => "Prohledat Užiatele a Skupiny",
+"Search Users and Groups" => "Prohledat uživatele a skupiny",
"Add Group" => "Přidat skupinu",
"Group" => "Skupina",
"Everyone" => "Všichni",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 57b9e776854..1e6dfa77ffb 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -96,7 +96,7 @@ $TRANSLATIONS = array(
"TLS" => "TLS",
"Security Warning" => "Sicherheitswarnung",
"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du greifst auf %s via HTTP zu. Wir empfehlen Dir dringend, Deinen Server so konfigurieren, dass stattdessen HTTPS verlangt wird.",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Dein Datenverzeichnis und deine Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Dein Datenverzeichnis und deine Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
"Setup Warning" => "Einrichtungswarnung",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "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 nochmals die <a href=\"%s\">Installationsanleitungen</a>.",
@@ -113,7 +113,7 @@ $TRANSLATIONS = array(
"This means that there might be problems with certain characters in file names." => "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
"Internet connection not working" => "Keine Netzwerkverbindung",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen.",
"Cron" => "Cron",
"Last cron was executed at %s." => "Letzter Cron wurde um %s ausgeführt.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
@@ -131,7 +131,7 @@ $TRANSLATIONS = array(
"days" => "Tagen",
"Enforce expiration date" => "Ablaufdatum erzwingen",
"Allow resharing" => "Erlaubt erneutes Teilen",
-"Restrict users to only share with users in their groups" => "c",
+"Restrict users to only share with users in their groups" => "Erlaube Nutzern nur das Teilen in ihrer Gruppe",
"Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
"Exclude groups from sharing" => "Gruppen von Freigaben ausschließen",
"These groups will still be able to receive shares, but not to initiate them." => "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
@@ -203,7 +203,7 @@ $TRANSLATIONS = array(
"Login Name" => "Loginname",
"Create" => "Anlegen",
"Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
-"Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+"Enter the recovery password in order to recover the users files during password change" => "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
"Search Users and Groups" => "Nutzer und Gruppen suchen",
"Add Group" => "Gruppe hinzufügen",
"Group" => "Gruppe",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 7bdd14e4749..514bb1de70b 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
"Couldn't decrypt your files, check your password and try again" => "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων σας, ελέγξτε τον κωδικό πρόσβασής σας και δοκιμάστε πάλι",
"Encryption keys deleted permanently" => "Τα κλειδιά κρυπτογράφησης αφαιρέθηκαν οριστικά",
"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Δεν ήταν δυνατή η οριστική διαγραφή των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
+"Couldn't remove app." => "Αδυναμία αφαίρεσης εφαρμογής.",
"Email saved" => "Το email αποθηκεύτηκε ",
"Invalid email" => "Μη έγκυρο email",
"Unable to delete group" => "Αδυναμία διαγραφής ομάδας",
@@ -43,6 +44,7 @@ $TRANSLATIONS = array(
"User Documentation" => "Τεκμηρίωση Χρήστη",
"Admin Documentation" => "Τεκμηρίωση Διαχειριστή",
"Update to {appversion}" => "Ενημέρωση σε {appversion}",
+"Uninstall App" => "Απεγκατάσταση Εφαρμογής",
"Disable" => "Απενεργοποίηση",
"Enable" => "Ενεργοποίηση",
"Please wait...." => "Παρακαλώ περιμένετε...",
@@ -53,6 +55,8 @@ $TRANSLATIONS = array(
"Error" => "Σφάλμα",
"Update" => "Ενημέρωση",
"Updated" => "Ενημερώθηκε",
+"Uninstalling ...." => "Απεγκατάσταση ....",
+"Error while uninstalling app" => "Σφάλμα κατά την απεγκατάσταση της εφαρμογής",
"Uninstall" => "Απεγκατάσταση",
"Select a profile picture" => "Επιλογή εικόνας προφίλ",
"Very weak password" => "Πολύ αδύναμο συνθηματικό",
@@ -66,11 +70,13 @@ $TRANSLATIONS = array(
"Unable to delete {objName}" => "Αδυναμία διαγραφής του {objName}",
"Error creating group" => "Σφάλμα δημιουργίας ομάδας",
"A valid group name must be provided" => "Πρέπει να δοθεί ένα έγκυρο όνομα ομάδας",
+"deleted {groupName}" => "διαγραφή {groupName}",
"undo" => "αναίρεση",
"Groups" => "Ομάδες",
"Group Admin" => "Ομάδα Διαχειριστών",
"Delete" => "Διαγραφή",
"never" => "ποτέ",
+"deleted {userName}" => "διαγραφή {userName}",
"add group" => "προσθήκη ομάδας",
"A valid username must be provided" => "Πρέπει να δοθεί έγκυρο όνομα χρήστη",
"Error creating user" => "Σφάλμα δημιουργίας χρήστη",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 6f271bcbb43..56a5e89f4a2 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -30,14 +30,20 @@ $TRANSLATIONS = array(
"User Documentation" => "Dokumentaro por uzantoj",
"Admin Documentation" => "Administra dokumentaro",
"Update to {appversion}" => "Ĝisdatigi al {appversion}",
+"Uninstall App" => "Malinstali aplikaĵon",
"Disable" => "Malkapabligi",
"Enable" => "Kapabligi",
"Please wait...." => "Bonvolu atendi...",
+"Error while disabling app" => "Eraris malkapabligo de aplikaĵo",
+"Error while enabling app" => "Eraris kapabligo de aplikaĵo",
"Updating...." => "Ĝisdatigata...",
"Error while updating app" => "Eraris ĝisdatigo de la aplikaĵo",
"Error" => "Eraro",
"Update" => "Ĝisdatigi",
"Updated" => "Ĝisdatigita",
+"Uninstalling ...." => "Malinstalante...",
+"Error while uninstalling app" => "Eraris malinstalo de aplikaĵo",
+"Uninstall" => "Malinstali",
"Select a profile picture" => "Elekti profilan bildon",
"Very weak password" => "Tre malforta pasvorto",
"Weak password" => "Malforta pasvorto",
@@ -46,16 +52,24 @@ $TRANSLATIONS = array(
"Strong password" => "Forta pasvorto",
"Delete encryption keys permanently." => "Forigi ĉifroklavojn por ĉiam.",
"Restore encryption keys." => "Restaŭri ĉifroklavojn.",
+"deleted {groupName}" => "{groupName} foriĝis",
"undo" => "malfari",
"Groups" => "Grupoj",
"Group Admin" => "Grupadministranto",
"Delete" => "Forigi",
"never" => "neniam",
+"deleted {userName}" => "{userName} foriĝis",
"add group" => "aldoni grupon",
"A valid username must be provided" => "Valida uzantonomo devas proviziĝi",
"Error creating user" => "Eraris kreo de uzanto",
"A valid password must be provided" => "Valida pasvorto devas proviziĝi",
+"Warning: Home directory for user \"{user}\" already exists" => "Averto: hejmdosierujo por la uzanto “{user”} jam ekzistas",
"__language_name__" => "Esperanto",
+"Everything (fatal issues, errors, warnings, info, debug)" => "Ĉio (fatalaĵoj, eraroj, avertoj, informoj, sencimigaj mesaĝoj)",
+"Info, warnings, errors and fatal issues" => "Informoj, avertoj, eraroj kaj fatalaĵoj",
+"Warnings, errors and fatal issues" => "Avertoj, eraroj kaj fatalaĵoj",
+"Errors and fatal issues" => "Eraroj kaj fatalaĵoj",
+"Fatal issues only" => "Fatalaĵoj nur",
"None" => "Nenio",
"Login" => "Ensaluti",
"SSL" => "SSL",
@@ -64,15 +78,18 @@ $TRANSLATIONS = array(
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
"Module 'fileinfo' missing" => "La modulo «fileinfo» mankas",
"Locale not working" => "La lokaĵaro ne funkcias",
+"Internet connection not working" => "La Interreto-konekto ne funkcias",
"Cron" => "Cron",
"Sharing" => "Kunhavigo",
"Allow apps to use the Share API" => "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
"Allow public uploads" => "Permesi publikajn alŝutojn",
+"Expire after " => "Eksvalidigi post",
"days" => "tagoj",
"Allow resharing" => "Kapabligi rekunhavigon",
"Security" => "Sekuro",
"Email Server" => "Retpoŝtoservilo",
"From address" => "El adreso",
+"mail" => "retpoŝto",
"Authentication required" => "Aŭtentiĝo nepras",
"Server address" => "Servila adreso",
"Port" => "Pordo",
@@ -93,6 +110,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
"See application website" => "Vidi la TTT-ejon de la aplikaĵo",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
+"Enable only for specific groups" => "Kapabligi nur por specifajn grupojn",
"All" => "Ĉio",
"Administrator Documentation" => "Dokumentaro por administrantoj",
"Online Documentation" => "Reta dokumentaro",
@@ -114,6 +132,7 @@ $TRANSLATIONS = array(
"Upload new" => "Alŝuti novan",
"Select new from Files" => "Elekti novan el dosieroj",
"Remove image" => "Forigi bildon",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Aŭ PNG aŭ JPG. Prefere ĝi kvadratu, sed vi povos stuci ĝin.",
"Cancel" => "Nuligi",
"Choose as profile image" => "Elekti kiel profilan bildon",
"Language" => "Lingvo",
@@ -125,12 +144,17 @@ $TRANSLATIONS = array(
"Delete Encryption Keys" => "Forigi ĉifroklavojn",
"Login Name" => "Ensaluti",
"Create" => "Krei",
+"Search Users and Groups" => "Serĉi uzantojn kaj grupojn",
+"Add Group" => "Aldoni grupon",
"Group" => "Grupo",
+"Everyone" => "Ĉiuj",
+"Admins" => "Administrantoj",
"Default Quota" => "Defaŭlta kvoto",
"Unlimited" => "Senlima",
"Other" => "Alia",
"Username" => "Uzantonomo",
"Quota" => "Kvoto",
+"Last Login" => "Lasta ensaluto",
"change full name" => "ŝanĝi plenan nomon",
"set new password" => "agordi novan pasvorton",
"Default" => "Defaŭlta"
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 75dc7b15a77..5a7519c8eba 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -19,10 +19,15 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Failide krüpteerimine õnnestus",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Ei suutnud faile dekrüpteerida, palun kontrolli oma owncloud.log-i või küsi nõu administraatorilt",
"Couldn't decrypt your files, check your password and try again" => "Ei suutnud failde dekrüpteerida, kontrolli parooli ja proovi uuesti",
+"Encryption keys deleted permanently" => "Krüpteerimisvõtmed kustutatud lõplikult",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Ei suutnud lõplikult kustutada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või pöördu oma süsteemihalduri poole.",
+"Couldn't remove app." => "Ei suutnud rakendit eemaldada.",
"Email saved" => "Kiri on salvestatud",
"Invalid email" => "Vigane e-post",
"Unable to delete group" => "Grupi kustutamine ebaõnnestus",
"Unable to delete user" => "Kasutaja kustutamine ebaõnnestus",
+"Backups restored successfully" => "Varukoopiad taastatud edukalt.",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Ei suutnud taastada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või pöördu oma süsteemihalduri poole.",
"Language changed" => "Keel on muudetud",
"Invalid request" => "Vigane päring",
"Admins can't remove themself from the admin group" => "Administraatorid ei saa ise end admin grupist eemaldada",
@@ -39,6 +44,7 @@ $TRANSLATIONS = array(
"User Documentation" => "Kasutaja dokumentatsioon",
"Admin Documentation" => "Admin dokumentatsioon",
"Update to {appversion}" => "Uuenda versioonile {appversion}",
+"Uninstall App" => "Eemada rakend",
"Disable" => "Lülita välja",
"Enable" => "Lülita sisse",
"Please wait...." => "Palun oota...",
@@ -49,6 +55,9 @@ $TRANSLATIONS = array(
"Error" => "Viga",
"Update" => "Uuenda",
"Updated" => "Uuendatud",
+"Uninstalling ...." => "Eemaldan...",
+"Error while uninstalling app" => "Viga rakendi eemaldamisel",
+"Uninstall" => "Eemalda",
"Select a profile picture" => "Vali profiili pilt",
"Very weak password" => "Väga nõrk parool",
"Weak password" => "Nõrk parool",
@@ -56,11 +65,18 @@ $TRANSLATIONS = array(
"Good password" => "Hea parool",
"Strong password" => "Väga hea parool",
"Decrypting files... Please wait, this can take some time." => "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
+"Delete encryption keys permanently." => "Kustuta krüpteerimisvõtmed lõplikult",
+"Restore encryption keys." => "Taasta krüpteerimisvõtmed.",
+"Unable to delete {objName}" => "Ei suuda kustutada {objName}",
+"Error creating group" => "Viga grupi loomisel",
+"A valid group name must be provided" => "Sisesta nõuetele vastav grupi nimi",
+"deleted {groupName}" => "kustutatud {groupName}",
"undo" => "tagasi",
"Groups" => "Grupid",
"Group Admin" => "Grupi admin",
"Delete" => "Kustuta",
"never" => "mitte kunagi",
+"deleted {userName}" => "kustutatud {userName}",
"add group" => "lisa grupp",
"A valid username must be provided" => "Sisesta nõuetele vastav kasutajatunnus",
"Error creating user" => "Viga kasutaja loomisel",
@@ -84,6 +100,10 @@ $TRANSLATIONS = array(
"Setup Warning" => "Paigalduse hoiatus",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.",
"Please double check the <a href=\"%s\">installation guides</a>." => "Palun kontrolli uuesti <a href=\"%s\">paigaldusjuhendeid</a>.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP on seadistatud eemaldama \"inline\" dokumendi blokke. See muudab mõned rakendid kasutamatuteks.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "See on tõenäoliselt põhjustatud puhver/kiirendist nagu Zend OPcache või eAccelerator.",
+"Database Performance Info" => "Andmebaasi toimimise info",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta. Migreerimaks teisele andmebaasile kasuta seda käsurea vahendit: 'occ db:convert-type'",
"Module 'fileinfo' missing" => "Moodul 'fileinfo' puudub",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitüüpide tuvastamisel.",
"Your PHP version is outdated" => "PHP versioon on aegunud",
@@ -103,11 +123,18 @@ $TRANSLATIONS = array(
"Use systems cron service to call the cron.php file every 15 minutes." => "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti tagant.",
"Sharing" => "Jagamine",
"Allow apps to use the Share API" => "Luba rakendustel kasutada Share API-t",
+"Allow users to share via link" => "Luba kasutajatel lingiga jagamist ",
+"Enforce password protection" => "Sunni parooliga kaitsmist",
"Allow public uploads" => "Luba avalikud üleslaadimised",
+"Set default expiration date" => "Määra vaikimisi aegumise kuupäev",
"Expire after " => "Aegu pärast",
"days" => "päeva",
+"Enforce expiration date" => "Sunnitud aegumise kuupäev",
"Allow resharing" => "Luba edasijagamine",
+"Restrict users to only share with users in their groups" => "Luba kasutajatel jagada kasutajatega ainult oma grupi piires",
"Allow users to send mail notification for shared files" => "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta",
+"Exclude groups from sharing" => "Eemalda grupid jagamisest",
+"These groups will still be able to receive shares, but not to initiate them." => "Need grupid saavad vastu võtta jagamisi, kuid ise jagamisi algatada ei saa.",
"Security" => "Turvalisus",
"Enforce HTTPS" => "Sunni peale HTTPS-i kasutamine",
"Forces the clients to connect to %s via an encrypted connection." => "Sunnib kliente %s ühenduma krüpteeritult.",
@@ -115,6 +142,7 @@ $TRANSLATIONS = array(
"Email Server" => "Postiserver",
"This is used for sending out notifications." => "Seda kasutatakse teadete välja saatmiseks.",
"From address" => "Saatja aadress",
+"mail" => "e-mail",
"Authentication required" => "Autentimine on vajalik",
"Server address" => "Serveri aadress",
"Port" => "Port",
@@ -136,6 +164,7 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com",
"See application website" => "Vaata rakendi veebilehte",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>",
+"Enable only for specific groups" => "Luba ainult kindlad grupid",
"All" => "Kõik",
"Administrator Documentation" => "Administraatori dokumentatsioon",
"Online Documentation" => "Online dokumentatsioon",
@@ -168,17 +197,26 @@ $TRANSLATIONS = array(
"The encryption app is no longer enabled, please decrypt all your files" => "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid",
"Log-in password" => "Sisselogimise parool",
"Decrypt all Files" => "Dekrüpteeri kõik failid",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Sinu krüpteerimisvõtmed on tõstetud varukoopiasse. Kui midagi läheb valesti, siis saad võtmed taastada. Kustuta lõplikult ainult juhul kui oled kindel, et failid on dekrüteeritud korrektselt.",
+"Restore Encryption Keys" => "Taasta krüpteerimisvõtmed",
+"Delete Encryption Keys" => "Kustuta krüpteerimisvõtmed",
"Login Name" => "Kasutajanimi",
"Create" => "Lisa",
"Admin Recovery Password" => "Admini parooli taastamine",
"Enter the recovery password in order to recover the users files during password change" => "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
+"Search Users and Groups" => "Otsi kasutajaid ja gruppe",
+"Add Group" => "Lisa grupp",
"Group" => "Grupp",
+"Everyone" => "Igaüks",
+"Admins" => "Haldurid",
"Default Quota" => "Vaikimisi kvoot",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Palun sisesta mahupiir (nt: \"512 MB\" või \"12 GB\")",
"Unlimited" => "Piiramatult",
"Other" => "Muu",
"Username" => "Kasutajanimi",
"Quota" => "Mahupiir",
+"Storage Location" => "Mahu asukoht",
+"Last Login" => "Viimane sisselogimine",
"change full name" => "Muuda täispikka nime",
"set new password" => "määra uus parool",
"Default" => "Vaikeväärtus"
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 4d8eda5c869..83ac9f4ccd6 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
"Couldn't decrypt your files, check your password and try again" => "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau",
"Encryption keys deleted permanently" => "Clés de chiffrement définitivement supprimées.",
"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Impossible de supprimer définitivement vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
+"Couldn't remove app." => "Impossible de supprimer l'application.",
"Email saved" => "E-mail sauvegardé",
"Invalid email" => "E-mail invalide",
"Unable to delete group" => "Impossible de supprimer le groupe",
@@ -43,6 +44,7 @@ $TRANSLATIONS = array(
"User Documentation" => "Documentation utilisateur",
"Admin Documentation" => "Documentation administrateur",
"Update to {appversion}" => "Mettre à jour vers {appversion}",
+"Uninstall App" => "Désinstaller l'application",
"Disable" => "Désactiver",
"Enable" => "Activer",
"Please wait...." => "Veuillez patienter…",
@@ -53,6 +55,9 @@ $TRANSLATIONS = array(
"Error" => "Erreur",
"Update" => "Mettre à jour",
"Updated" => "Mise à jour effectuée avec succès",
+"Uninstalling ...." => "Désintallation...",
+"Error while uninstalling app" => "Erreur lors de la désinstallation de l'application",
+"Uninstall" => "Désinstaller",
"Select a profile picture" => "Selectionner une photo de profil ",
"Very weak password" => "Mot de passe de très faible sécurité",
"Weak password" => "Mot de passe de faible sécurité",
@@ -62,13 +67,16 @@ $TRANSLATIONS = array(
"Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.",
"Delete encryption keys permanently." => "Supprimer définitivement les clés de chiffrement",
"Restore encryption keys." => "Restaurer les clés de chiffrement",
+"Unable to delete {objName}" => "Impossible de supprimer {objName}",
"Error creating group" => "Erreur lors de la création du groupe",
"A valid group name must be provided" => "Vous devez spécifier un nom de groupe valide",
+"deleted {groupName}" => "{groupName} supprimé",
"undo" => "annuler",
"Groups" => "Groupes",
"Group Admin" => "Admin Groupe",
"Delete" => "Supprimer",
"never" => "jamais",
+"deleted {userName}" => "{userName} supprimé",
"add group" => "ajouter un groupe",
"A valid username must be provided" => "Un nom d'utilisateur valide doit être saisi",
"Error creating user" => "Erreur lors de la création de l'utilisateur",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 0edbbc20bf2..3a1ce9d418a 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -55,7 +55,7 @@ $TRANSLATIONS = array(
"Error" => "Errore",
"Update" => "Aggiorna",
"Updated" => "Aggiornato",
-"Uninstalling ...." => "Disinstallazione ...",
+"Uninstalling ...." => "Disinstallazione...",
"Error while uninstalling app" => "Errore durante la disinstallazione dell'applicazione",
"Uninstall" => "Disinstalla",
"Select a profile picture" => "Seleziona un'immagine del profilo",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index d9a8e0f56d5..6fa25a32cad 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
"Couldn't decrypt your files, check your password and try again" => "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。",
"Encryption keys deleted permanently" => "暗号化キーは完全に削除されます",
"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
+"Couldn't remove app." => "アプリが削除できませんでした。",
"Email saved" => "メールアドレスを保存しました",
"Invalid email" => "無効なメールアドレス",
"Unable to delete group" => "グループを削除できません",
@@ -43,6 +44,7 @@ $TRANSLATIONS = array(
"User Documentation" => "ユーザードキュメント",
"Admin Documentation" => "管理者ドキュメント",
"Update to {appversion}" => "{appversion} にアップデート",
+"Uninstall App" => "アプリをアンインストール",
"Disable" => "無効",
"Enable" => "有効にする",
"Please wait...." => "しばらくお待ちください。",
@@ -53,6 +55,9 @@ $TRANSLATIONS = array(
"Error" => "エラー",
"Update" => "アップデート",
"Updated" => "アップデート済み",
+"Uninstalling ...." => "アンインストール中 ....",
+"Error while uninstalling app" => "アプリをアンインストール中にエラーが発生",
+"Uninstall" => "アンインストール",
"Select a profile picture" => "プロファイル画像を選択",
"Very weak password" => "非常に弱いパスワード",
"Weak password" => "弱いパスワード",
@@ -202,15 +207,15 @@ $TRANSLATIONS = array(
"Search Users and Groups" => "ユーザーとグループを検索",
"Add Group" => "グループを追加",
"Group" => "グループ",
-"Everyone" => "全ての人",
+"Everyone" => "すべてのユーザー",
"Admins" => "管理者",
"Default Quota" => "デフォルトのクォータサイズ",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージの割り当てを入力してください (例: \"512MB\" や \"12 GB\")",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")",
"Unlimited" => "無制限",
"Other" => "その他",
-"Username" => "ユーザー名",
+"Username" => "ユーザーID",
"Quota" => "クオータ",
-"Storage Location" => "ストレージの場所",
+"Storage Location" => "データの保存場所",
"Last Login" => "最終ログイン",
"change full name" => "名前を変更",
"set new password" => "新しいパスワードを設定",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 6a222b6f505..2c2347fba4e 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -102,7 +102,7 @@ $TRANSLATIONS = array(
"Please double check the <a href=\"%s\">installation guides</a>." => "Vennligst dobbeltsjekk <a href=\"%s\">installasjonsveilederne</a>.",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.",
-"Database Performance Info" => "Info om databaseytelse",
+"Database Performance Info" => "Info om database-ytelse",
"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite brukes som database. For større installasjoner anbefaler vi å endre dette. For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type'",
"Module 'fileinfo' missing" => "Modulen 'fileinfo' mangler",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 506ddf4fac4..a5d3f4c45fb 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
"Couldn't decrypt your files, check your password and try again" => "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw",
"Encryption keys deleted permanently" => "Cryptosleutels permanent verwijderd",
"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder.",
+"Couldn't remove app." => "Kon app niet verwijderen.",
"Email saved" => "E-mail bewaard",
"Invalid email" => "Ongeldige e-mail",
"Unable to delete group" => "Niet in staat om groep te verwijderen",
@@ -43,6 +44,7 @@ $TRANSLATIONS = array(
"User Documentation" => "Gebruikersdocumentatie",
"Admin Documentation" => "Beheerdocumentatie",
"Update to {appversion}" => "Bijwerken naar {appversion}",
+"Uninstall App" => "De-installeren app",
"Disable" => "Uitschakelen",
"Enable" => "Activeer",
"Please wait...." => "Even geduld aub....",
@@ -53,6 +55,9 @@ $TRANSLATIONS = array(
"Error" => "Fout",
"Update" => "Bijwerken",
"Updated" => "Bijgewerkt",
+"Uninstalling ...." => "De-installeren ...",
+"Error while uninstalling app" => "Fout bij de-installeren app",
+"Uninstall" => "De-installeren",
"Select a profile picture" => "Kies een profielafbeelding",
"Very weak password" => "Zeer zwak wachtwoord",
"Weak password" => "Zwak wachtwoord",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 3d0dc63f854..31b0fa3bc9e 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
"Couldn't decrypt your files, check your password and try again" => "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie",
"Encryption keys deleted permanently" => "Klucze szyfrujące zostały trwale usunięte",
"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora",
+"Couldn't remove app." => "Nie można usunąć aplikacji.",
"Email saved" => "E-mail zapisany",
"Invalid email" => "Nieprawidłowy e-mail",
"Unable to delete group" => "Nie można usunąć grupy",
@@ -43,6 +44,7 @@ $TRANSLATIONS = array(
"User Documentation" => "Dokumentacja użytkownika",
"Admin Documentation" => "Dokumentacja Administratora",
"Update to {appversion}" => "Aktualizacja do {appversion}",
+"Uninstall App" => "Odinstaluj aplikację",
"Disable" => "Wyłącz",
"Enable" => "Włącz",
"Please wait...." => "Proszę czekać...",
@@ -53,6 +55,9 @@ $TRANSLATIONS = array(
"Error" => "Błąd",
"Update" => "Aktualizuj",
"Updated" => "Zaktualizowano",
+"Uninstalling ...." => "Odinstalowywanie....",
+"Error while uninstalling app" => "Błąd przy odinstalowywaniu aplikacji",
+"Uninstall" => "Odinstaluj",
"Select a profile picture" => "Wybierz zdjęcie profilu",
"Very weak password" => "Bardzo słabe hasło",
"Weak password" => "Słabe hasło",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 84796d250e2..c77d2a993fa 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -14,7 +14,7 @@ $TRANSLATIONS = array(
"Authentication error" => "Erro de autenticação",
"Your full name has been changed." => "Seu nome completo foi alterado.",
"Unable to change full name" => "Não é possível alterar o nome completo",
-"Group already exists" => "Grupo já existe",
+"Group already exists" => "O Grupo já existe",
"Unable to add group" => "Não foi possível adicionar grupo",
"Files decrypted successfully" => "Arquivos descriptografados com sucesso",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Não foi possível descriptografar os arquivos, verifique a sua owncloud.log ou pergunte ao seu administrador",
@@ -30,7 +30,7 @@ $TRANSLATIONS = array(
"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possível salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
"Language changed" => "Idioma alterado",
"Invalid request" => "Pedido inválido",
-"Admins can't remove themself from the admin group" => "Admins não podem ser removidos do grupo admin",
+"Admins can't remove themself from the admin group" => "Administradores não pode remover a si mesmos do grupo de administração",
"Unable to add user to group %s" => "Não foi possível adicionar usuário ao grupo %s",
"Unable to remove user from group %s" => "Não foi possível remover usuário do grupo %s",
"Couldn't update app." => "Não foi possível atualizar a app.",
@@ -61,7 +61,7 @@ $TRANSLATIONS = array(
"Select a profile picture" => "Selecione uma imagem para o perfil",
"Very weak password" => "Senha muito fraca",
"Weak password" => "Senha fraca",
-"So-so password" => "So-so senha",
+"So-so password" => "Senha mais ou menos",
"Good password" => "Boa senha",
"Strong password" => "Senha forte",
"Decrypting files... Please wait, this can take some time." => "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
@@ -82,7 +82,7 @@ $TRANSLATIONS = array(
"Error creating user" => "Erro ao criar usuário",
"A valid password must be provided" => "Forneça uma senha válida",
"Warning: Home directory for user \"{user}\" already exists" => "Aviso: O diretório home para o usuário \"{user}\" já existe",
-"__language_name__" => "Português (Brasil)",
+"__language_name__" => "__language_name__",
"Everything (fatal issues, errors, warnings, info, debug)" => "Tudo (questões fatais, erros, avisos, informações, depuração)",
"Info, warnings, errors and fatal issues" => "Informações, avisos, erros e problemas fatais",
"Warnings, errors and fatal issues" => "Avisos, erros e problemas fatais",
@@ -103,7 +103,7 @@ $TRANSLATIONS = array(
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.",
"Database Performance Info" => "Informações de Desempenho do Banco de Dados",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite é usada como base de dados. Para instalações grandes instalações recomendamos mudar isso. Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'occ db: converter-type'",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite é usada como base de dados. Para grandes instalações recomendamos mudar isso. Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'occ db: converter-type'",
"Module 'fileinfo' missing" => "Módulo 'fileinfo' faltando",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).",
"Your PHP version is outdated" => "Sua versão de PHP está desatualizada",
@@ -111,12 +111,12 @@ $TRANSLATIONS = array(
"Locale not working" => "Localização não funcionando",
"System locale can not be set to a one which supports UTF-8." => "Localidade do sistema não pode ser definido como um que suporta UTF-8.",
"This means that there might be problems with certain characters in file names." => "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Nós sugerimos para instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
"Internet connection not working" => "Sem conexão com a internet",
"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor não tem conexão com a internet. Isso significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de 3ºs terceiros não funcionam. Acessar arquivos remotamente e envio de e-mails de notificação também não podem funcionar. Sugerimos permitir conexão com a internet para esse servidor, se você deseja ter todas as funcionalidades.",
"Cron" => "Cron",
"Last cron was executed at %s." => "Último cron foi executado em %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Última cron foi executado em %s. Isso é, mais do que uma hora atrás, algo parece errado.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Última cron foi executado em %s. Isso é, mais de uma hora atrás, algo parece errado.",
"Cron was not executed yet!" => "Cron não foi executado ainda!",
"Execute one task with each page loaded" => "Execute uma tarefa com cada página carregada",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
@@ -171,8 +171,8 @@ $TRANSLATIONS = array(
"Forum" => "Fórum",
"Bugtracker" => "Rastreador de Bugs",
"Commercial Support" => "Suporte Comercial",
-"Get the apps to sync your files" => "Faça com que os apps sincronize seus arquivos",
-"Show First Run Wizard again" => "Mostrar este Assistente de novo",
+"Get the apps to sync your files" => "Faça com que os apps sincronizem seus arquivos",
+"Show First Run Wizard again" => "Mostrar Assistente de Primeira Execução novamente",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>",
"Password" => "Senha",
"Your password was changed" => "Sua senha foi alterada",
@@ -196,7 +196,7 @@ $TRANSLATIONS = array(
"Help translate" => "Ajude a traduzir",
"The encryption app is no longer enabled, please decrypt all your files" => "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos",
"Log-in password" => "Senha de login",
-"Decrypt all Files" => "Decripti todos os Arquivos",
+"Decrypt all Files" => "Descriptografar todos os Arquivos",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluí-las permanentemente se você tiver certeza de que todos os arquivos forão descriptografados corretamente.",
"Restore Encryption Keys" => "Restaurar Chaves de Criptografia",
"Delete Encryption Keys" => "Eliminar Chaves de Criptografia",
@@ -205,7 +205,7 @@ $TRANSLATIONS = array(
"Admin Recovery Password" => "Recuperação da Senha do Administrador",
"Enter the recovery password in order to recover the users files during password change" => "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
"Search Users and Groups" => "Pesquisar Usuários e Grupos",
-"Add Group" => "Adicionar grupo",
+"Add Group" => "Adicionar Grupo",
"Group" => "Grupo",
"Everyone" => "Para todos",
"Admins" => "Administradores",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 3be9462fd0b..eea1d455525 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -19,11 +19,15 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Дешифрование файлов прошло успешно",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Ошибка при дешифровании файлов. Обратитесь к вашему системному администратору. Доп информация в owncloud.log",
"Couldn't decrypt your files, check your password and try again" => "Ошибка при дешифровании файлов. Проверьте Ваш пароль и повторите попытку",
+"Encryption keys deleted permanently" => "Ключи шифрования перманентно удалены",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Не получается удалить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору",
+"Couldn't remove app." => "Невозможно удалить приложение.",
"Email saved" => "Email сохранен",
"Invalid email" => "Неправильный Email",
"Unable to delete group" => "Невозможно удалить группу",
"Unable to delete user" => "Невозможно удалить пользователя",
"Backups restored successfully" => "Резервная копия успешно восстановлена",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Не получается восстановить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору.",
"Language changed" => "Язык изменён",
"Invalid request" => "Неправильный запрос",
"Admins can't remove themself from the admin group" => "Администратор не может удалить сам себя из группы admin",
@@ -40,6 +44,7 @@ $TRANSLATIONS = array(
"User Documentation" => "Пользовательская документация",
"Admin Documentation" => "Документация администратора",
"Update to {appversion}" => "Обновить до {версия приложения}",
+"Uninstall App" => "Удалить приложение",
"Disable" => "Выключить",
"Enable" => "Включить",
"Please wait...." => "Подождите...",
@@ -50,20 +55,28 @@ $TRANSLATIONS = array(
"Error" => "Ошибка",
"Update" => "Обновить",
"Updated" => "Обновлено",
-"Select a profile picture" => "Выберите картинку профиля",
+"Uninstalling ...." => "Удаление ...",
+"Error while uninstalling app" => "Ошибка при удалении приложения.",
+"Uninstall" => "Удалить",
+"Select a profile picture" => "Выберите аватар",
"Very weak password" => "Очень слабый пароль",
"Weak password" => "Слабый пароль",
"So-so password" => "Так себе пароль",
"Good password" => "Хороший пароль",
"Strong password" => "Устойчивый к взлому пароль",
"Decrypting files... Please wait, this can take some time." => "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
+"Delete encryption keys permanently." => "Перманентно удалить ключи шифрования. ",
+"Restore encryption keys." => "Восстановить ключи шифрования.",
"Unable to delete {objName}" => "Невозможно удалить {objName}",
"Error creating group" => "Ошибка создания группы",
+"A valid group name must be provided" => "Введите правильное имя группы",
+"deleted {groupName}" => "удалено {groupName}",
"undo" => "отмена",
"Groups" => "Группы",
"Group Admin" => "Администратор группы",
"Delete" => "Удалить",
"never" => "никогда",
+"deleted {userName}" => "удалён {userName}",
"add group" => "добавить группу",
"A valid username must be provided" => "Укажите правильное имя пользователя",
"Error creating user" => "Ошибка создания пользователя",
@@ -85,6 +98,9 @@ $TRANSLATIONS = array(
"Setup Warning" => "Предупреждение установки",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Веб-сервер до сих пор не настроен для возможности синхронизации файлов. Похоже что проблема в неисправности интерфейса WebDAV.",
"Please double check the <a href=\"%s\">installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.",
+"Database Performance Info" => "Информация о производительности Базы Данных",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "В качестве Базы Данных используется SQLite. Для больших установок рекомендуется использовать другие типы Баз Данных. Чтобы переехать на другую Базу Данных используйте инструмент командной строки: 'ooc: db:conver-type'",
"Module 'fileinfo' missing" => "Модуль 'fileinfo' отсутствует",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-модуль 'fileinfo' отсутствует. Мы настоятельно рекомендуем включить этот модуль для улучшения определения типов (mime-type) файлов.",
"Your PHP version is outdated" => "Ваша версия PHP устарела",
@@ -96,14 +112,22 @@ $TRANSLATIONS = array(
"Internet connection not working" => "Интернет-соединение не работает",
"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Этот сервер не имеет подключения к сети интернет. Это значит, что некоторые возможности, такие как подключение внешних дисков, уведомления об обновлениях или установка сторонних приложений – не работают. Удалённый доступ к файлам и отправка уведомлений по электронной почте вероятнее всего тоже не будут работать. Предлагаем включить соединение с интернетом для этого сервера, если Вы хотите иметь все возможности.",
"Cron" => "Планировщик задач по расписанию",
+"Last cron was executed at %s." => "Последняя cron-задача была запущена: %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Последняя cron-задача была запущена: %s. Это было больше часа назад, кажется что-то не так.",
+"Cron was not executed yet!" => "Cron-задачи ещё не запускались!",
"Execute one task with each page loaded" => "Выполнять одно задание с каждой загруженной страницей",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php зарегестрирован в webcron и будет вызываться каждые 15 минут по http.",
"Use systems cron service to call the cron.php file every 15 minutes." => "Использовать системный cron для вызова cron.php каждые 15 минут.",
"Sharing" => "Общий доступ",
"Allow apps to use the Share API" => "Позволить приложениям использовать API общего доступа",
"Allow public uploads" => "Разрешить открытые загрузки",
+"Set default expiration date" => "Установите дату окончания по-умолчанию",
+"Expire after " => "Заканчивается после",
+"days" => "дней",
"Allow resharing" => "Разрешить переоткрытие общего доступа",
"Allow users to send mail notification for shared files" => "Разрешить пользователю оповещать почтой о расшаренных файлах",
+"Exclude groups from sharing" => "Исключить группы из общего доступа",
+"These groups will still be able to receive shares, but not to initiate them." => "Эти группы смогут получать общие файлы, но не смогут отправлять их.",
"Security" => "Безопасность",
"Enforce HTTPS" => "Принудить к HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Принудить клиентов подключаться к %s через шифрованное соединение.",
@@ -111,6 +135,7 @@ $TRANSLATIONS = array(
"Email Server" => "Сервер почты",
"This is used for sending out notifications." => "Используется для отправки уведомлений.",
"From address" => "Адрес отправителя",
+"mail" => "почта",
"Authentication required" => "Требуется аутентификация ",
"Server address" => "Адрес сервера",
"Port" => "Порт",
@@ -132,11 +157,12 @@ $TRANSLATIONS = array(
"See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
"See application website" => "См. сайт приложений",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>",
+"Enable only for specific groups" => "Включить только для этих групп",
"All" => "Все",
"Administrator Documentation" => "Документация администратора",
"Online Documentation" => "Online документация",
"Forum" => "Форум",
-"Bugtracker" => "Bugtracker",
+"Bugtracker" => "Багтрекер",
"Commercial Support" => "Коммерческая поддержка",
"Get the apps to sync your files" => "Получить приложения для синхронизации ваших файлов",
"Show First Run Wizard again" => "Показать помощник настройки",
@@ -150,23 +176,28 @@ $TRANSLATIONS = array(
"Full Name" => "Полное имя",
"Email" => "E-mail",
"Your email address" => "Ваш адрес электронной почты",
-"Profile picture" => "Фото профиля",
-"Upload new" => "Загрузить новую",
+"Fill in an email address to enable password recovery and receive notifications" => "Введите свой email-адрес для того, чтобы включить возможность восстановления пароля и получения уведомлений",
+"Profile picture" => "Аватар",
+"Upload new" => "Загрузить новый",
"Select new from Files" => "Выберите новый из файлов",
-"Remove image" => "Удалить изображение",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Либо png, либо jpg. Изображение должно быть квадратным, но вы сможете обрезать его позже.",
+"Remove image" => "Удалить аватар",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Допустимые форматы: png и jpg. Если изображение не квадратное, то вам будет предложено обрезать его.",
"Your avatar is provided by your original account." => "Будет использован аватар вашей оригинальной учетной записи.",
"Cancel" => "Отменить",
-"Choose as profile image" => "Выберите изображение профиля",
+"Choose as profile image" => "Установить как аватар",
"Language" => "Язык",
"Help translate" => "Помочь с переводом",
"The encryption app is no longer enabled, please decrypt all your files" => "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы",
"Log-in password" => "Пароль входа",
"Decrypt all Files" => "Снять шифрование со всех файлов",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Ваши ключи шифрования были архивированы. Если что-то пойдёт не так, вы сможете восстановить ключи. Удаляйте ключи из архива только тогда, когда вы будете уверены, что все файлы были успешно расшифрованы.",
+"Restore Encryption Keys" => "Восстановить Ключи Шифрования",
+"Delete Encryption Keys" => "Удалить Ключи Шифрования",
"Login Name" => "Имя пользователя",
"Create" => "Создать",
"Admin Recovery Password" => "Восстановление пароля администратора",
"Enter the recovery password in order to recover the users files during password change" => "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
+"Search Users and Groups" => "Искать пользователей и групп",
"Add Group" => "Добавить группу",
"Group" => "Группа",
"Everyone" => "Все",
@@ -177,6 +208,7 @@ $TRANSLATIONS = array(
"Other" => "Другое",
"Username" => "Имя пользователя",
"Quota" => "Квота",
+"Last Login" => "Последний вход",
"change full name" => "изменить полное имя",
"set new password" => "установить новый пароль",
"Default" => "По умолчанию"
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index f0e8ffcdea6..db2bf87690c 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
"Couldn't decrypt your files, check your password and try again" => "Nemožno dešifrovať vaše súbory, skontrolujte svoje heslo a skúste to znova",
"Encryption keys deleted permanently" => "Šifrovacie kľúče sú trvale vymazané",
"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nebolo možné natrvalo vymazať vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
+"Couldn't remove app." => "Nemožno odstrániť aplikáciu.",
"Email saved" => "Email uložený",
"Invalid email" => "Neplatný email",
"Unable to delete group" => "Nie je možné odstrániť skupinu",
@@ -43,6 +44,7 @@ $TRANSLATIONS = array(
"User Documentation" => "Príručka používateľa",
"Admin Documentation" => "Príručka administrátora",
"Update to {appversion}" => "Aktualizovať na {appversion}",
+"Uninstall App" => "Odinštalovanie aplikácie",
"Disable" => "Zakázať",
"Enable" => "Zapnúť",
"Please wait...." => "Čakajte prosím...",
@@ -53,6 +55,9 @@ $TRANSLATIONS = array(
"Error" => "Chyba",
"Update" => "Aktualizovať",
"Updated" => "Aktualizované",
+"Uninstalling ...." => "Prebieha odinštalovanie...",
+"Error while uninstalling app" => "Chyba pri odinštalovaní aplikácie",
+"Uninstall" => "Odinštalácia",
"Select a profile picture" => "Vybrať avatara",
"Very weak password" => "Veľmi slabé heslo",
"Weak password" => "Slabé heslo",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index f0ac6eea30b..9383e565fd6 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -48,6 +48,7 @@ $TRANSLATIONS = array(
"Error" => "Napaka",
"Update" => "Posodobi",
"Updated" => "Posodobljeno",
+"Uninstall" => "Odstrani namestitev",
"Select a profile picture" => "Izbor slike profila",
"Very weak password" => "Zelo šibko geslo",
"Weak password" => "Šibko geslo",
@@ -166,7 +167,10 @@ $TRANSLATIONS = array(
"Create" => "Ustvari",
"Admin Recovery Password" => "Obnovitev skrbniškega gesla",
"Enter the recovery password in order to recover the users files during password change" => "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
+"Add Group" => "Dodaj skupino",
"Group" => "Skupina",
+"Everyone" => "Vsi",
+"Admins" => "Skrbniki",
"Default Quota" => "Privzeta količinska omejitev",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Vnesite količinsko omejitev prostora (na primer: \"512 MB\" ali \"12 GB\")",
"Unlimited" => "Neomejeno",
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 593c202f2c9..28f2236b1d7 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -19,7 +19,9 @@
</span>
</a>
<span class="utils">
- <span class="usercount"></span>
+ <span class="usercount">
+ <?php p($_["usercount"]); ?>
+ </span>
</span>
</li>
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
index c74fdcc9efa..25b17275858 100644
--- a/settings/templates/users/part.userlist.php
+++ b/settings/templates/users/part.userlist.php
@@ -96,13 +96,13 @@
<?php
if($user["lastLogin"] === 0) {
$lastLogin = $l->t('never');
- $lastLoginDate = '';
+ $lastLoginDate = $lastLogin;
} else {
$lastLogin = relative_modified_date($user["lastLogin"]);
$lastLoginDate = \OC_Util::formatDate($user["lastLogin"]);
}
?>
- <td class="lastLogin" title="<?php p('<span style="white-space: nowrap;">'.$lastLoginDate.'</span>'); ?>"><?php p($lastLogin); ?></td>
+ <td class="lastLogin" title="<?php p('<span class="usersLastLoginTooltip">'.$lastLoginDate.'</span>'); ?>"><?php p($lastLogin); ?></td>
<td class="remove">
<?php if($user['name']!=OC_User::getUser()):?>
<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
diff --git a/settings/users.php b/settings/users.php
index 8f72fc9d5c8..29a63a4496a 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -81,6 +81,7 @@ $tmpl->assign( 'groups', $groups );
$tmpl->assign( 'adminGroup', $adminGroup );
$tmpl->assign( 'isAdmin', (int) $isAdmin);
$tmpl->assign( 'subadmins', $subadmins);
+$tmpl->assign('usercount', count($users));
$tmpl->assign( 'numofgroups', count($groups) + count($adminGroup));
$tmpl->assign( 'quota_preset', $quotaPreset);
$tmpl->assign( 'default_quota', $defaultQuota);
diff --git a/tests/enable_all.php b/tests/enable_all.php
index 386ae2070e4..2368a194944 100644
--- a/tests/enable_all.php
+++ b/tests/enable_all.php
@@ -17,6 +17,7 @@ function enableApp($app) {
}
enableApp('files_sharing');
+enableApp('files_trashbin');
enableApp('files_encryption');
enableApp('files_external');
enableApp('user_ldap');
diff --git a/tests/karma.config.js b/tests/karma.config.js
index 1f903f58210..14a0d7e8464 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -56,6 +56,16 @@ module.exports = function(config) {
'apps/files_sharing/js/share.js'
],
testFiles: ['apps/files_sharing/tests/js/*.js']
+ },
+ {
+ name: 'files_external',
+ srcFiles: [
+ // only test these files, others are not ready and mess
+ // up with the global namespace/classes/state
+ 'apps/files_external/js/app.js',
+ 'apps/files_external/js/mountsfilelist.js'
+ ],
+ testFiles: ['apps/files_external/tests/js/*.js']
}];
}
@@ -100,15 +110,16 @@ module.exports = function(config) {
// core mocks
files.push(corePath + 'tests/specHelper.js');
+ var srcFile, i;
// add core library files
- for ( var i = 0; i < coreModule.libraries.length; i++ ) {
- var srcFile = corePath + coreModule.libraries[i];
+ for ( i = 0; i < coreModule.libraries.length; i++ ) {
+ srcFile = corePath + coreModule.libraries[i];
files.push(srcFile);
}
// add core modules files
- for ( var i = 0; i < coreModule.modules.length; i++ ) {
- var srcFile = corePath + coreModule.modules[i];
+ for ( i = 0; i < coreModule.modules.length; i++ ) {
+ srcFile = corePath + coreModule.modules[i];
files.push(srcFile);
if (enableCoverage) {
preprocessors[srcFile] = 'coverage';
@@ -145,12 +156,15 @@ module.exports = function(config) {
}
// add source files for apps to test
- for ( var i = 0; i < appsToTest.length; i++ ) {
+ for ( i = 0; i < appsToTest.length; i++ ) {
addApp(appsToTest[i]);
}
// serve images to avoid warnings
files.push({pattern: 'core/img/**/*', watched: false, included: false, served: true});
+
+ // include core CSS
+ files.push({pattern: 'core/css/*.css', watched: true, included: true, served: true});
config.set({
@@ -170,7 +184,9 @@ module.exports = function(config) {
proxies: {
// prevent warnings for images
- '/context.html//core/img/': 'http://localhost:9876/base/core/img/'
+ '/context.html//core/img/': 'http://localhost:9876/base/core/img/',
+ '/context.html//core/css/': 'http://localhost:9876/base/core/css/',
+ '/context.html//core/fonts/': 'http://localhost:9876/base/core/fonts/'
},
// test results reporter to use
diff --git a/tests/lib/connector/sabre/objecttree.php b/tests/lib/connector/sabre/objecttree.php
index a88e23bbe2f..fc9f802066f 100644
--- a/tests/lib/connector/sabre/objecttree.php
+++ b/tests/lib/connector/sabre/objecttree.php
@@ -25,6 +25,10 @@ class TestDoubleFileView extends \OC\Files\View{
return $this->updatables[$path];
}
+ public function isCreatable($path) {
+ return $this->updatables[$path];
+ }
+
public function isDeletable($path) {
return $this->deletables[$path];
}
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index cfd66e99704..20b8571b91d 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -454,4 +454,28 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
$this->assertEquals('http://localhost/owncloud/public.php?service=files', $result);
}
+ /**
+ * Tests recursive folder deletion with rmdirr()
+ */
+ public function testRecursiveFolderDeletion() {
+ $baseDir = \OC_Helper::tmpFolder() . '/';
+ mkdir($baseDir . 'a/b/c/d/e', 0777, true);
+ mkdir($baseDir . 'a/b/c1/d/e', 0777, true);
+ mkdir($baseDir . 'a/b/c2/d/e', 0777, true);
+ mkdir($baseDir . 'a/b1/c1/d/e', 0777, true);
+ mkdir($baseDir . 'a/b2/c1/d/e', 0777, true);
+ mkdir($baseDir . 'a/b3/c1/d/e', 0777, true);
+ mkdir($baseDir . 'a1/b', 0777, true);
+ mkdir($baseDir . 'a1/c', 0777, true);
+ file_put_contents($baseDir . 'a/test.txt', 'Hello file!');
+ file_put_contents($baseDir . 'a/b1/c1/test one.txt', 'Hello file one!');
+ file_put_contents($baseDir . 'a1/b/test two.txt', 'Hello file two!');
+ \OC_Helper::rmdirr($baseDir . 'a');
+
+ $this->assertFalse(file_exists($baseDir . 'a'));
+ $this->assertTrue(file_exists($baseDir . 'a1'));
+
+ \OC_Helper::rmdirr($baseDir);
+ $this->assertFalse(file_exists($baseDir));
+ }
}
diff --git a/tests/lib/repair/repairmimetypes.php b/tests/lib/repair/repairmimetypes.php
new file mode 100644
index 00000000000..3ed19bd55bb
--- /dev/null
+++ b/tests/lib/repair/repairmimetypes.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * Tests for the converting of legacy storages to home storages.
+ *
+ * @see \OC\Repair\RepairMimeTypes
+ */
+class TestRepairMimeTypes extends PHPUnit_Framework_TestCase {
+
+ /** @var \OC\RepairStep */
+ private $repair;
+
+ private $storage;
+
+ public function setUp() {
+ $this->storage = new \OC\Files\Storage\Temporary(array());
+
+ $this->repair = new \OC\Repair\RepairMimeTypes();
+ }
+
+ public function tearDown() {
+ $this->storage->getCache()->clear();
+ $sql = 'DELETE FROM `*PREFIX*storages` WHERE `id` = ?';
+ \OC_DB::executeAudited($sql, array($this->storage->getId()));
+ $this->clearMimeTypes();
+
+ DummyFileCache::clearCachedMimeTypes();
+ }
+
+ private function clearMimeTypes() {
+ $sql = 'DELETE FROM `*PREFIX*mimetypes`';
+ \OC_DB::executeAudited($sql);
+ }
+
+ private function addEntries($entries) {
+ // create files for the different extensions, this
+ // will also automatically create the corresponding mime types
+ foreach ($entries as $entry) {
+ $this->storage->getCache()->put(
+ $entry[0],
+ array(
+ 'size' => 0,
+ 'mtime' => 0,
+ 'mimetype' => $entry[1]
+ )
+ );
+ }
+
+ }
+
+ private function checkEntries($entries) {
+ foreach ($entries as $entry) {
+ $data = $this->storage->getCache()->get($entry[0]);
+ $this->assertEquals($entry[1], $data['mimetype']);
+ }
+ }
+
+ /**
+ * Returns the id of a given mime type or null
+ * if it does not exist.
+ */
+ private function getMimeTypeIdFromDB($mimeType) {
+ $sql = 'SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?';
+ $results = \OC_DB::executeAudited($sql, array($mimeType));
+ $result = $results->fetchOne();
+ if ($result) {
+ return $result['id'];
+ }
+ return null;
+ }
+
+ /**
+ * Test renaming and splitting old office mime types
+ */
+ public function testRenameOfficeMimeTypes() {
+ $this->addEntries(
+ array(
+ array('test.doc', 'application/msword'),
+ array('test.docx', 'application/msword'),
+ array('test.xls', 'application/msexcel'),
+ array('test.xlsx', 'application/msexcel'),
+ array('test.ppt', 'application/mspowerpoint'),
+ array('test.pptx', 'application/mspowerpoint'),
+ )
+ );
+
+ $this->repair->run();
+
+ // force mimetype reload
+ DummyFileCache::clearCachedMimeTypes();
+ $this->storage->getCache()->loadMimeTypes();
+
+ $this->checkEntries(
+ array(
+ array('test.doc', 'application/msword'),
+ array('test.docx', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'),
+ array('test.xls', 'application/vnd.ms-excel'),
+ array('test.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'),
+ array('test.ppt', 'application/vnd.ms-powerpoint'),
+ array('test.pptx', 'application/vnd.openxmlformats-officedocument.presentationml.presentation'),
+ )
+ );
+ }
+
+ /**
+ * Test renaming and splitting old office mime types when
+ * new ones already exist
+ */
+ public function testRenameOfficeMimeTypesWhenExist() {
+ $this->addEntries(
+ array(
+ array('test.doc', 'application/msword'),
+ array('test.docx', 'application/msword'),
+ array('test.xls', 'application/msexcel'),
+ array('test.xlsx', 'application/msexcel'),
+ array('test.ppt', 'application/mspowerpoint'),
+ array('test.pptx', 'application/mspowerpoint'),
+ // make it so that the new mimetypes already exist
+ array('bogus.docx', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'),
+ array('bogus.xlsx', 'application/vnd.ms-excel'),
+ array('bogus.pptx', 'application/vnd.ms-powerpoint'),
+ array('bogus2.docx', 'application/wrong'),
+ array('bogus2.xlsx', 'application/wrong'),
+ array('bogus2.pptx', 'application/wrong'),
+ )
+ );
+
+ $this->repair->run();
+
+ // force mimetype reload
+ DummyFileCache::clearCachedMimeTypes();
+ $this->storage->getCache()->loadMimeTypes();
+
+ $this->checkEntries(
+ array(
+ array('test.doc', 'application/msword'),
+ array('test.docx', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'),
+ array('test.xls', 'application/vnd.ms-excel'),
+ array('test.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'),
+ array('test.ppt', 'application/vnd.ms-powerpoint'),
+ array('test.pptx', 'application/vnd.openxmlformats-officedocument.presentationml.presentation'),
+ array('bogus.docx', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'),
+ array('bogus.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'),
+ array('bogus.pptx', 'application/vnd.openxmlformats-officedocument.presentationml.presentation'),
+ array('bogus2.docx', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'),
+ array('bogus2.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'),
+ array('bogus2.pptx', 'application/vnd.openxmlformats-officedocument.presentationml.presentation'),
+ )
+ );
+
+ // wrong mimetypes are gone
+ $this->assertNull($this->getMimeTypeIdFromDB('application/msexcel'));
+ $this->assertNull($this->getMimeTypeIdFromDB('application/mspowerpoint'));
+ }
+
+ /**
+ * Test that nothing happens and no error happens when all mimetypes are
+ * already correct and no old ones exist..
+ */
+ public function testDoNothingWhenOnlyNewFiles() {
+ $this->addEntries(
+ array(
+ array('test.doc', 'application/msword'),
+ array('test.docx', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'),
+ array('test.xls', 'application/vnd.ms-excel'),
+ array('test.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'),
+ array('test.ppt', 'application/vnd.ms-powerpoint'),
+ array('test.pptx', 'application/vnd.openxmlformats-officedocument.presentationml.presentation'),
+ )
+ );
+
+ $this->repair->run();
+
+ // force mimetype reload
+ DummyFileCache::clearCachedMimeTypes();
+ $this->storage->getCache()->loadMimeTypes();
+
+ $this->checkEntries(
+ array(
+ array('test.doc', 'application/msword'),
+ array('test.docx', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'),
+ array('test.xls', 'application/vnd.ms-excel'),
+ array('test.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'),
+ array('test.ppt', 'application/vnd.ms-powerpoint'),
+ array('test.pptx', 'application/vnd.openxmlformats-officedocument.presentationml.presentation'),
+ )
+ );
+ }
+}
+
+/**
+ * Dummy class to access protected members
+ */
+class DummyFileCache extends \OC\Files\Cache\Cache {
+
+ public static function clearCachedMimeTypes() {
+ self::$mimetypeIds = array();
+ self::$mimetypes = array();
+ }
+}
+
diff --git a/version.php b/version.php
index 0d84986b4a8..9df9a76f2eb 100644
--- a/version.php
+++ b/version.php
@@ -3,10 +3,10 @@
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
-$OC_Version=array(7, 0, 0, 0);
+$OC_Version=array(7, 0, 0, 2);
// The human readable string
-$OC_VersionString='7.0 alpha 1';
+$OC_VersionString='7.0 beta 1';
// The ownCloud edition
$OC_Edition='';